luobisheng
2022-11-25 528c4590c60e18fc480b191cd284013ee8310723
上传处置结果
8个文件已修改
81 ■■■■■ 已修改文件
src/components/myUpload/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/message/myIndex/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/device/bayonet/create/index.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/device/bayonet/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/platform/cockpitManage/index.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/platform/portalSetting/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/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>
src/views/systemSetting/device/bayonet/create/index.vue
@@ -4,8 +4,8 @@
            <!-- 卡口名称 -->
            <div class="device-item">
                <div class="item-left">
                    <el-form-item label="卡口名称:" prop="name">
                        <el-input v-model="bayonet.name" placeholder="请填写卡口名称"></el-input>
                    <el-form-item label="卡口名称:" prop="bayonetName">
                        <el-input v-model="bayonet.bayonetName" placeholder="请填写卡口名称"></el-input>
                    </el-form-item>
                </div>
                <div class="item-right"></div>
@@ -25,8 +25,8 @@
            <!-- 所属区域 -->
            <div class="device-item">
                <div class="item-left">
                    <el-form-item label="所属区域:" prop="belong_area">
                        <el-input v-model="bayonet.belong_area" placeholder="请填写区域名称"></el-input>
                    <el-form-item label="所属区域:" prop="belongArea">
                        <el-input v-model="bayonet.belongArea" placeholder="请填写区域名称"></el-input>
                    </el-form-item>
                </div>
                <div class="item-right"></div>
@@ -103,10 +103,10 @@
  data() {
      return {
          bayonet: {
              name: '',
              bayonetName: '',
              latitude: '',
              longitude: '',
              belong_area: '',
              belongArea: '',
              ipAddress: '',
              port: '',
              frontEndType: '',
@@ -114,10 +114,10 @@
              description: ''
          },
          rules: {
            name: [{ required: true, trigger: 'blur', message: '请填写卡口名称' }],
            bayonetName: [{ required: true, trigger: 'blur', message: '请填写卡口名称' }],
            latitude: [{ required: true, trigger: ['blur', 'change'], message: '请填写纬度位置' }],
            longitude: [{ required: true, trigger: ['blur', 'change'], message: '请填写经度位置' }],
            belong_area: [{ required: true, trigger: ['blur', 'change'], message: '请填写区域名称' }],
            belongArea: [{ required: true, trigger: ['blur', 'change'], message: '请填写区域名称' }],
            ipAddress: [{ required: true, trigger: ['blur', 'change'], message: '请填写域名或者IP' }],
            port: [{ required: true, trigger: ['blur', 'change'], message: '请输入端口号' }],
            frontEndType: [{ required: true, trigger: ['blur', 'change'], message: '请输入前端类型' }],
@@ -127,11 +127,19 @@
      }
  },
  created() {
    this.bayonet = deepClone(this.originalBayonet);
  },
  methods: {
      onSubmit() {
        this.$refs.device.validate(valid => {
          if (valid) {
            const copyBayonet = deepClone(this.bayonet);
            delete copyBayonet.id;
            copyBayonet.longitude = Number(copyBayonet.longitude);
            copyBayonet.latitude = Number(copyBayonet.latitude);
            copyBayonet.inOutCityType = Number(copyBayonet.inOutCityType);
            if (!this.isEdit) {
              bayonet.addBayonet(this.bayonet)
                  .then(() => {
src/views/systemSetting/device/bayonet/index.vue
@@ -135,6 +135,7 @@
      closeDialog() {
        this.isShowDialog = false;
        this.getBayonetListData();
      },
      handleExport() {
@@ -150,7 +151,7 @@
      showDialog(isEdit, data) {
        this.isShowDialog = true;
        this.isEdit = isEdit;
        this.originalBayonet = data;
        this.originalBayonet = data.info.row;
      }
    }
}
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',