1、呼叫中心、DMA、隐患、虚拟总表绑定

src/api/hotline.js

@@ -341,7 +341,7 @@ export function postProblem(data) {
 // 问题审批
 export function putProblem(data) {
   return request({
-    url: '/gis/gsrx/problem',
+    url: '/gis/gsrx/problem?pid='+data.pid,
     method: 'put',
     data
   })

src/api/waterMeterDataMatchApi.js

@@ -40,11 +40,11 @@ export function moveUserTable(data) {
 }
 
 // 移除用户表
-export function removeUser(params) {
+export function removeUser(data) {
   return request({
     url: '/gis/onlineCheck/removeUser',
-    method: 'delete',
-    params
+    method: 'post',
+    data
   })
 }
 
@@ -152,3 +152,11 @@ export function getTableUserBindList(params) {
     params
   })
 }
+// 虚拟总表删除
+export function delTableUser(params) {
+  return request({
+    url: '/gis/onlineCheck/deleteTableById',
+    method: 'get',
+    params
+  })
+}

src/api/xjHiddenDangerManageApi.js

@@ -81,11 +81,16 @@ export function getToubleRange(params) {
 
 //隐患上报页面审核人获取
 export function getHiddenDangerCheckMan(params) {
-    return request({
-        url: '/base/user/getDepartmentUser',
-        method: 'get',
-        params
-    })
+      // return request({
+  //   url: '/base/user/getDepartmentUser',
+  //   method: 'get',
+  //   params
+  // })
+  return request({
+    url: '/base/user/pageNew',
+    method: 'get',
+    params
+  })
 }
 
 //隐患详情页面 => 隐患详情信息

src/views/currentSystem/regionalMetering/DMAHomePage/components/dmadata/dmachart.vue

@@ -691,10 +691,10 @@ export default {
           }
         ],
         legend: {
-          x: 'center'
-          // textStyle: {
-          //   color: '#F4AF47'
-          // }
+          x: 'center',
+          type: 'scroll',  //图例过多设置翻页滚动
+          orient: 'horizontal',  //图例朝向垂直
+          align: 'auto',
         },
         series: seriesAry
       }

src/views/zhpt/hiddendangermanage/hiddendangerReport/widget.vue

@@ -769,10 +769,15 @@ export default {
 
     //获取当前登录用户所在部门的审核人
     getCheckMan() {
-      getHiddenDangerCheckMan().then(res => {
+      getHiddenDangerCheckMan({size:100000}).then(res => {
         // console.log("登录用户对应的审核人："+JSON.stringify(res))
-        this.checkMen = res.result;
-      });
+        // this.checkMen = res.result
+        this.checkMen = res.result.records
+      })
+      // getHiddenDangerCheckMan().then(res => {
+      //   console.log("登录用户对应的审核人："+JSON.stringify(res))
+      //   this.checkMen = res.result
+      // })
     },
 
     /**

src/views/zhpt/zonghezhanshi/waterMeterDataMatch/components/userTable.vue

@@ -1,9 +1,10 @@
 <template>
   <div>
     <el-row style="padding:10px 0px ;">
+      <el-button size="small" type="primary" @click="batchRemoveAll">全部移除</el-button>
       <el-button size="small" type="primary" :disabled="multipleSelection.length==0" @click="batchRemove">批量移除</el-button>
       <el-button size="small" type="primary" :disabled="multipleSelection.length==0" @click="batchMove">批量移动</el-button>
-      <el-button size="small" type="primary" :disabled="multipleSelection.length==0" @click="batchConfirmPipe">批量确认</el-button>
+      <el-button size="small" type="primary" :disabled="multipleSelection.length==0" @click="batchConfirmCustomer">批量确认</el-button>
       <el-button size="small" type="primary" :disabled="multipleSelection.length==0" @click="batchSetVillageName">小区设置</el-button>
     </el-row>
     <div class="tableheight">
@@ -167,11 +168,14 @@ export default {
     batchRemove() {
       this.$emit('batchRemove', this.multipleSelection)
     },
+    batchRemoveAll() {
+      this.$emit('batchRemoveAll')
+    },
     batchMove() {
       this.$emit('batchMove', this.multipleSelection)
     },
-    batchConfirmPipe() {
-      this.$emit('batchConfirmPipe', this.multipleSelection)
+    batchConfirmCustomer() {
+      this.$emit('batchConfirmCustomer', this.multipleSelection)
     },
     batchSetVillageName() {
       this.$emit('batchSetVillageName', this.multipleSelection)
@@ -199,6 +203,6 @@ export default {
 <style scoped>
   .tableheight {
     margin-top: 4px;
-    height: calc(100% - 44px);
+    height: 400px;
   }
 </style>