Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-11-25 f3b8ee4f39640bf2799d81ad0107a6a1e1e1421d

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

# Conflicts:
#	src/views/systemSetting/device/bayonet/create/index.vue
#	src/views/systemSetting/device/bayonet/index.vue

 src/components/myUpload/index.vue

@@ -93,15 +93,6 @@
        }
    },
    props: {
        // 返回上传成功图片地址
        setPictureUrl:{
            type:Function,
            default:()=>{}
        },
        delPictureUrl:{
            type:Function,
            default:()=>{}
        },
      pictureList: {
        type: Array,
        default: () => []

 src/views/operate/disposal/casepool/dispatch/index.vue

@@ -72,7 +72,7 @@
                        <template slot-scope="scope">
                            <div class="operation">
                                <div class="btn">
                                    <span @click="opernDialog(scope.row)">上传处置结果</span>
                                    <span @click="openDialog(scope.row)">上传处置结果</span>
                                </div>
                            </div>
                        </template>
@@ -319,11 +319,11 @@
                    this.dialogView = true;
                })
        },
        async opernDialog(data) {
        async openDialog(data) {
            await casequery.getBaseCaseDetail(data.code)
                .then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
                  this.vioData = currentSitVo;
                  this.imageResourceId = filesPictureVo.imageResources[0].id;
                  this.imageResourceId = filesPictureVo.imageResources[0]?.id;
                })
                .catch(err => this.$message.error(err))
          this.dialogUpload = true;

 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue

@@ -104,8 +104,8 @@
        }
    },
  created() {
      this.arrive = deepClone(this.arriveData);
      if (this.arriveData) {
        this.arrive = deepClone(this.arriveData);
        this.arrive.situationPic = this.arriveData.situationPic.split(',');
      }
  },

 src/views/operate/images/index.vue

@@ -40,7 +40,7 @@
                    @selection-change="tableChange">
                    <el-table-column type="selection" min-width="5">
                    </el-table-column>
                    <el-table-column prop="baseId" label="所属事件编号" min-width="18">
                    <el-table-column prop="code" label="所属事件编号" min-width="18">
                    </el-table-column>
                    <el-table-column prop="category" label="问题类别" min-width="8">
                      <template v-if="scope.row.category" slot-scope="scope">

 src/views/operate/message/myIndex/index.vue

@@ -56,10 +56,10 @@
                    </el-table-column>
                    <el-table-column prop="createUser" label="发布人员" min-width="15">
                    </el-table-column>
                    <el-table-column prop="messageTypeName" label="消息分类" min-width="10">
                    <el-table-column prop="messageTypeName" label="消息栏目" min-width="10">
                    </el-table-column>
                    <el-table-column prop="status" label="发布状态" min-width="5">
                        <template slot-scope="scope">
                        <template v-if="scope.row.status" slot-scope="scope">
                            {{scope.row.status === 0 ? '未发布' :'已发布'}}
                        </template>
                    </el-table-column>
@@ -254,6 +254,7 @@
            startTime: this.datetime ? this.datetime[0] : null,
            endTime: this.datetime ? this.datetime[1] : null
          }
          debugger
          getMessageList(messageParam)
              .then(({ records, total }) => {
                this.tableData = records;

 src/views/systemSetting/platform/cockpitManage/index.vue

@@ -12,7 +12,9 @@
                    <div class="search-item">
                        <span>状态:</span>
                        <div class="option">
                            <el-input v-model="searchStatus" placeholder="选择状态"></el-input>
                          <el-select v-model="searchStatus" placeholder="选择状态">
                            <el-option v-for="{ label, value } in statusOptions" :key="value" :label="label" :value="value"></el-option>
                          </el-select>
                        </div>
                    </div>
                    <div class="findBtn">
@@ -134,7 +136,7 @@
import updateUser from "./updateUser";
import detailUser from "./detailUser";
import { deleteTeam, exportTeamInfo, importTeamInfo, searchTeamInfo } from "@/api/system/portal/teamConstruction";
import {SUCCESS_CODE} from "@/utils";
import { SUCCESS_CODE } from "@/utils";
import {downloadFile} from "@/utils/helper";

export default {
@@ -162,6 +164,20 @@
            myIdx: 0,
            preMyIdx: 0,
            file: null,
            statusOptions: [
              {
                value: 2,
                label: '全部'
              },
              {
                value: 1,
                label: '启用'
              },
              {
                value: 0,
                label: '禁用'
              }
            ],
            options: [
                {
                    value: 0,
@@ -221,11 +237,6 @@
            this.updateDepartmentData = data;
        },

        // 查看
        showViewDialog() {
            this.dialogcheck = true;
        },

        // 添加界面
        showAddDialog() {
          this.dialogAdd = true;
@@ -234,7 +245,8 @@

        // 导出
        exportTable() {
          exportTeamInfo({ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status: this.searchStatus })
          const status = this.searchStatus === 2 ? null : this.searchStatus;
          exportTeamInfo({ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status })
              .then(res => {
                downloadFile(res);
                this.$message({ type: 'success', message: '操作成功' });
@@ -345,8 +357,9 @@

        // 获取用户列表
        getDepartmentList() {
          const status = this.searchStatus === 2 ? null : this.searchStatus;
          const searchInfo = {
            current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status: this.searchStatus
            current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status
          };
          searchTeamInfo(searchInfo)
              .then(({ records, total }) => {

 src/views/systemSetting/platform/portalSetting/index.vue

@@ -119,7 +119,7 @@
                        url: 'sccg/system/portal/logo/add',
                        data: icon
                    }).then(res => {
                        if (res.code == 200) {
                        if (res.code === 200) {
                            this.$axios({
                                method: 'get',
                                url: 'sccg/system/portal/logo/search',