修复区域删除的问题. 修正底图显示的区域框

zhangzengfei

2022-08-31 b582d3dfe4e46a3b978d2663fe54df240a80a710

修复区域删除的问题. 修正底图显示的区域框

 src/components/canvas/index.vue

@@ -93,7 +93,7 @@
    },
    showProportion: {
      type: Number,
      default: 1.666
      default: 1.834
    }
  },
  computed: {
@@ -241,10 +241,10 @@
        })
        return
      }
      this.$notify({
        type: "success",
        message: "已保存绘制！"
      })
      // this.$notify({
      //   type: "success",
      //   message: "已保存绘制！"
      // })
      // 每次保存关闭模态窗时都要把模态窗的数据写到父组件里来
      this.canvasData = this.$refs.bigCanvas.canvasData
      // 顺便甩到更外层去

 src/views/hashrate/CameraManage/CameraRules/index.vue

@@ -64,6 +64,7 @@
            :loading="Camera.loading"
            :canvasWidth="canvasWidth"
            :canvasHeight="canvasHeight"
            :showProportion="1042 / canvasWidth"
            @fromCanvas="getCanvasData"
            @changeLoading="changeLoading"
            @refresh="refresh"
@@ -487,6 +488,13 @@
      let polyon = { ...data }
      polyon.camera_id = this.Camera.cameraId
      savePolygon(polyon).then((rsp) => {
        if (rsp && rsp.success) {
          if (rsp.data.indexOf("失败") >= 0) {
            this.$message({ type: "error", duration: 5000, message: rsp.data + " 区域已关联场景, 无法删除" })
          } else {
            this.$message.success(rsp.data)
          }
        }
        this.Camera.getPolygon()
        //this.Camera.getCameraTask();
      })

 src/views/manageCenter/index.vue

@@ -198,7 +198,7 @@

                <el-table-column prop="count" align="center" label="整改数量" show-overflow-tooltip></el-table-column>
              </el-table>
              <el-pagination
              <!-- <el-pagination
                @current-change="refrash"
                @size-change="handleSizeChange"
                :current-page="page"
@@ -207,7 +207,7 @@
                :page-sizes="[5, 10, 15, 20, 25]"
                :total="solvedTotal"
                background
              ></el-pagination>
              ></el-pagination> -->
            </div>
          </div>
        </div>
@@ -611,7 +611,7 @@
        if (decodeString != "") {
          let decodeResult = JSON.parse(decodeString)
          if (decodeResult) {
            console.log("warningStatics", decodeResult)
            // console.log("warningStatics", decodeResult)
            decodeResult.forEach((element) => {
              this.solvedTotal = this.solvedTotal + element.doc_count
              this.tableDataList.push({

 src/views/personalCenter/components/SubAccount.vue

@@ -45,10 +45,10 @@
        <el-table-column label="序号" width="55" class-name="index">
          <template slot-scope="scope">{{ scope.$index + 1 + (page - 1) * size }}</template>
        </el-table-column>
        <el-table-column prop="username" label="用户名" show-overflow-tooltip ></el-table-column>
        <el-table-column prop="trueName" label="姓名" show-overflow-tooltip ></el-table-column>
        <el-table-column prop="phoneNum" label="手机号" show-overflow-tooltip ></el-table-column>
        <el-table-column prop="userType" label="用户类型" >
        <el-table-column prop="username" label="用户名" show-overflow-tooltip></el-table-column>
        <el-table-column prop="trueName" label="姓名" show-overflow-tooltip></el-table-column>
        <el-table-column prop="phoneNum" label="手机号" show-overflow-tooltip></el-table-column>
        <el-table-column prop="userType" label="用户类型">
          <template slot-scope="scope">
            <span>{{ scope.row.userType == 1 ? "本地" : "OA账户" }}</span>
          </template>
@@ -324,8 +324,8 @@
        username: [{ required: true, message: "请输入用户名", trigger: "blur" }],
        // password: [{ required: true, message: "请输入密码", trigger: "blur" }],
        userType: [{ required: true, message: "请选择用户类型", trigger: "blur" }],
        trueName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
        menuIds: [{ validator: validateTree, trigger: "blur" }]
        trueName: [{ required: true, message: "请输入姓名", trigger: "blur" }]
        // menuIds: [{ validator: validateTree, trigger: "blur" }]
      },
      sysMenus: [],
      DataTree: [],
@@ -416,21 +416,21 @@
      }
    },
    delUser(row) {
      this.$confirm('确认要删除该用户吗, 是否继续?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(async () => {
          let rsp = await deleteUser({id:row.id})
          if (rsp && rsp.success) {
            this.$message({
              type: 'success',
              message: '删除成功!'
            });
          }
      this.$confirm("确认要删除该用户吗, 是否继续?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      }).then(async () => {
        let rsp = await deleteUser({ id: row.id })
        if (rsp && rsp.success) {
          this.$message({
            type: "success",
            message: "删除成功!"
          })
        }

          this.findUserList()          
        })
        this.findUserList()
      })
    },
    resetUser() {
      this.ruleForm = {