fix:修改测试问题

src/components/TableAuto/index.vue

@@ -4,6 +4,7 @@
     <div class="datatable" :class="pagination?'inpage':'nopage'">
       <el-table
         ref="multipleTable"
+        id="features"
         :v-loading="loading"
         :data="tableData"
         tooltip-effect="dark"

src/utils/request.js

@@ -22,7 +22,7 @@ export const IP = tempIP;
 // export const IP=tempIP
 // export const NewIp = 'http://58.17.241.6:1212'
 const service = axios.create({
-  // baseURL: tempIP,
+  baseURL: tempIP,
   // baseURL:"",
   withCredentials: true, // 跨域请求时发送cookiesokies
   timeout: 60000 // 请求超时

src/views/currentSystem/regionalMetering/DMAManageUser/index.vue

@@ -36,13 +36,14 @@
                   <el-button type="success" size="small" icon="el-icon-document-add" @click="add">绑定</el-button>
                   <el-button type="warning" size="small" icon="el-icon-document-remove" :disabled="disabledBtn"
                     @click="unbind">解绑</el-button>
-                  <el-button type="danger" size="small" icon="el-icon-document" @click="exportTable">导出</el-button>
+                  <!-- <el-button type="danger" size="small" icon="el-icon-document" @click="exportTable">导出</el-button> -->
+                  <ExportBtn :componentTable="componentTable" />
                 </el-row>
               </el-col>
             </el-row>
           </div>
           <div v-loading="tableLoading" class="tableheight">
-            <table-item :table-data="list" :column="column" :pagination="true" :is-select="false"
+            <table-item ref='comTable' :table-data="list" :column="column" :pagination="true" :is-select="false"
               :pagesize="pagination.size" :currentpage="pagination.current" :border="true" :multiple="true" :total="total"
               :fixed="true" :isdelete="false" @handleCurrentChange="handleCurrentChange"
               @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange" />
@@ -64,6 +65,7 @@
 
 <script>
 import TableItem from "@/components/TableAuto";
+import ExportBtn from '@/views/zhpt/wxreportforms/components/ExportBtn'
 import { client } from "@/utils/index";
 import DMAManageUserDialog from "../components/DMAManageUserDialog";
 import { removeUser } from "@/api/waterMeterDataMatchApi";
@@ -81,9 +83,10 @@ import { lcInfo } from "staticPub/config";
 import axios from "axios";
 const XLSX = require('xlsx'); // 导入 xlsx 库
 export default {
-  components: { TableItem, DMAManageUserDialog },
+  components: { TableItem, DMAManageUserDialog ,ExportBtn},
   data() {
     return {
+      componentTable:null,
       postBingUser: postBingUser,
       postBingAllUser: postBingAllUser,
       postBingUserBD: postBingUserBD,
@@ -157,6 +160,9 @@ export default {
     this.getDMAData();
     // this.getCbblist()
   },
+  mounted(){
+    this.componentTable = this.$refs.comTable.$children[0].$el
+  },
   methods: {
     // 获取当前页
     handleCurrentChange(currentPage) {
@@ -355,9 +361,29 @@ export default {
         withCredentials: true, // 跨域请求时发送cookiesokies
         timeout: 60000, // 请求超时
       });
+      // newaxios({
+      //   method: "get",
+      //   url: lcInfo.otherUrlUserdetail,
+      //   headers: {
+      //     "Content-Type": "application/x-www-form-urlencoded",
+      //     Appkey: "oievemzt7bowa9v9sf2iczmg",
+      //     AppSecret: "9rbbnwcs3idyyzfpvs2xv9aqr2g28hd7",
+      //     // Appkey: "sz8ihx4tyyf56h2jn1zunhj7",
+      //     // AppSecret: "ihzzm4cgog275557bw84jqfwwn2dggxt",
+      //   },
+      //   params: {
+      //     start: data.current,
+      //     limit: data.size,
+      //     // inputcontent:data.inputcontent
+      //     // userid: "",
+
+      //   },
+      // })
       newaxios({
         method: "get",
-        url: lcInfo.otherUrlUserdetail,
+        // url: lcInfo.otherUrlUserdetail,
+        url: lcInfo.otherUrlUserdetail3,
+
         headers: {
           "Content-Type": "application/x-www-form-urlencoded",
           Appkey: "oievemzt7bowa9v9sf2iczmg",
@@ -366,17 +392,21 @@ export default {
           // AppSecret: "ihzzm4cgog275557bw84jqfwwn2dggxt",
         },
         params: {
-          start: data.current,
-          limit: data.size,
-          // inputcontent:data.inputcontent
-          // userid: "",
-
+          pageNum: this.pagination.current,
+          pageSize: this.pagination.size,
+          // areaName: this.form.cbqyBm,
+          // areaName: '',
+          // keyWord: this.form.cxnr,
+          keyWord:this.pagination.inputcontent
+          // userid: "0101012064",
         },
-      }).then((res) => {
+      })
+      .then((res) => {
         this.tableLoading = false;
         console.log("浪潮接口获取用户详情", res);
-        let tableList = res.data.result.data;
-        tableList.forEach((item) => {
+        let tableList =JSON.parse(JSON.parse(JSON.stringify(res.data.result)));
+        console.log(tableList.data.user,'tableList')
+        tableList.data.user.forEach((item) => {
           item.userCode = item.userid;
           item.userName = item.username;
           item.contactNumber = item.tel1;
@@ -388,8 +418,10 @@ export default {
           item.waterMeterNature = item.watertype1;
           item.waterMeterCaliber = item.caliber;
         });
-        this.list = res.data.result.data;
-        this.total = Number(res.data.result.total);
+        // this.list = res.data.result.data;
+        this.list = tableList.data.user;
+        // this.total = Number(res.data.result.total);
+        this.total = tableList.data.total
         this.tableLoading = false;
       });
 

src/views/currentSystem/regionalMetering/components/simpleQueryTool/widget.vue

@@ -270,7 +270,8 @@ export default {
             url: appconfig.gisResource.business_map.config[0].url + '/' + layerId + '/query',
             type: 'POST',
             data: {
-              where: 'UPPER("' + fields + '")' +
+              // where: 'UPPER("' + fields + '")' +
+              where:  fields +
                 (config.isLike
                   ? " like '%" + Istr.replace(/_/g, '$_').replace(/\?/g, '$?').replace(/%/g, '$%') + "%' ESCAPE '$'"
                   : (" = '" + Istr + "'")),

src/views/currentSystem/regionalMetering/selfIndexList/index.vue

@@ -56,14 +56,14 @@
           <div>
             <span>修正人员：</span>
             <el-input
-              v-model="form.name"
+              v-model="form.updateUserName"
               style="width: 150px"
               size="small"
             />
             &nbsp;&nbsp;
             <span>修正分区：</span>
             <el-input
-              v-model="form.area"
+              v-model="form.dmaName"
               style="width: 150px"
               size="small"
             />
@@ -170,7 +170,7 @@ export default {
   components: { TableItem, SelfIndexListDialog },
   data() {
     return {
-      form: { year: '', name: '', area: '', dmaId: null },
+      form: { year: '', updateUserName: '', dmaName: '', dmaId: null },
       pageInfo: { current: 1, size: 10, tableTotal: 0 }, // 分页数据
       currId: { id: undefined, dmaName: undefined },
       treeLoading: false,
@@ -309,7 +309,15 @@ export default {
   },
   methods: {
     getData() {
-      const data = Object.assign(this.form, this.pageInfo)
+      const params = {
+        updateUser:this.form.updateUserName,
+        dmaName:this.form.dmaName,
+        selStartTime:this.form.year[0],
+        selEndTime:this.form.year[1]
+      }
+      // const data = Object.assign(this.form, this.pageInfo)
+      const data = Object.assign(params, this.pageInfo)
+      console.log(data,'daata')
       querySelfIndex(data).then(res => {
         if (res.code === 1) {
           this.tableData = res.result.records

src/views/currentSystem/regionalMetering/zone/zoneSplitManage.vue

@@ -3,11 +3,18 @@
   <div id="zoneSplitManage" class="zoneSplitManage">
     <div class="filteroption">
       <div style="display: flex; align-items: center">
-        <span>关键字：</span>
+        <span>用户编号：</span>
         <el-input
-          v-model="querySearch.likeStr"
+          v-model="querySearch.userid"
           size="small"
-          placeholder="输入用户编号、用户姓名、地址、水表类型查询"
+          placeholder="输入用户编号"
+          style="width: 280px"
+        /> 
+        <span>用户姓名：</span>
+        <el-input
+          v-model="querySearch.username"
+          size="small"
+          placeholder="输入用户姓名"
           style="width: 280px"
         />
         <el-button
@@ -19,13 +26,15 @@
         >
       </div>
       <div>
-        <el-button size="small" type="primary" @click="exportReport()"
+        <!-- <el-button size="small" type="primary" @click="exportReport()"
           >导出</el-button
-        >
+        > -->
+        <ExportBtn :componentTable="componentTable" />
       </div>
     </div>
     <div class="tableheight">
       <table-item
+      ref="comTable"
         v-loading="loading"
         :table-data="reportTable"
         :column="column"
@@ -105,6 +114,7 @@
 </template>
 <script>
 import TableItem from "@/components/TableAuto";
+import ExportBtn from '@/views/zhpt/wxreportforms/components/ExportBtn'
 import {
   getUserWaterMeterInfo,
   getUserWaterMeterAnalyze,
@@ -113,14 +123,14 @@ import {
 import dateMixins from "@/views/currentSystem/regionalMetering/statisticalReport/mixins/dateMixins";
 import { lcInfo } from "staticPub/config";
 import axios from "axios";
-
 export default {
   name: "ZoneSplitManage",
-  components: { TableItem },
+  components: { TableItem,ExportBtn },
   mixins: [dateMixins],
   props: ["data"],
   data() {
     return {
+      componentTable:null,
       multipleSelection: [], // 表格选中数据
       pageInfo: { current: 1, size: 30, tableTotal: 1, export: "0" }, // 分页数据
       column: [
@@ -208,7 +218,8 @@ export default {
         },
       },
       querySearch: {
-        likeStr: undefined,
+        userid: undefined,
+        username:undefined
       },
       loading: true, // 加载
       reportTable: [], // table表格数据
@@ -248,6 +259,8 @@ export default {
   watch: {},
   created() {},
   mounted() {
+    this.componentTable = this.$refs.comTable.$children[0].$el
+    console.log(this.$refs.comTable.$children[0].$el,'el')
     this.getData();
   },
   destroyed() {
@@ -301,7 +314,8 @@ export default {
       this.pageInfo.export = "1";
       const query = this.pageInfo;
       const params = {
-        likeStr: this.querySearch.likeStr,
+        username: this.querySearch.username,
+        userid:this.querySearch.userid
       };
 
       Object.assign(query, params);
@@ -334,7 +348,8 @@ export default {
       this.pageInfo.export = "0";
       const query = that.pageInfo;
       const params = {
-        likeStr: that.querySearch.likeStr,
+        userid: that.querySearch.userid,
+        username: that.querySearch.username,
       };
 
       Object.assign(query, params);
@@ -358,8 +373,11 @@ export default {
         params: {
           start: query.current,
           limit: query.size,
+          userid:params.userid,
+          username:params.username,
           // userid: "0101012064",
         },
+        
       }).then((res) => {
         this.tableLoading = false;
         console.log("浪潮接口获取用户详情", res);

src/views/currentSystem/waterHotline/workbench/index.vue

@@ -2468,7 +2468,8 @@ export default {
     // this.loadEchart()
     // this.StartRing(
     //   {
-    //     _Caller:18990330343
+    //     _Caller:18119511965
+    //     // _Caller:18990330343
     //   }
     // )
     this.getdeptdata();

src/views/currentSystem/waterHotline/workbench/register.vue

@@ -9,7 +9,6 @@
       </div>
       <el-tab-pane label="工单登记" style="height: 100%">
         <RegisterMerges
-          v-if='pageInfoShow'
           ref="RegisterMerges"
           :data="editData"
           :arrearsFlag='arrearsFlag'
@@ -448,7 +447,7 @@ export default {
       this.subdivide2 = this.subdivide1[this.indexNumT].gdglproblemdetails;
     },
     async fetchData(data) {
-      this.pageInfoShow=false;
+      // this.pageInfoShow=false;
       try {
         const newaxios = axios.create({
           withCredentials: true, // 跨域请求时发送cookiesokies
@@ -525,24 +524,39 @@ export default {
         }).then(res=>{
           let tempData = JSON.parse(res.data.result);
           console.log(tempData,'tempdata')
+          // let lastChange = tempData.data[0].LastChange
+          // let nowChange = tempData.data[0].NowChange
+          // if(nowChange ==0){
+          //   if(lastChange==0){
+          //     this.registerForm.yue = 0
+          //     this.arrearsFlag = false
+          //   }else{
+          //     this.registerForm.yue = lastChange
+          //     this.arrearsFlag = true  
+          //   }
+          // }else{
+          //   this.registerForm.yue = nowChange
+          //   this.arrearsFlag = false
+          // }
+          // this.pageInfoShow=true;
+          // this.number=number;
           let lastChange = tempData.data[0].LastChange
-          let nowChange = tempData.data[0].NowChange
-          if(nowChange ==0){
-            if(lastChange==0){
-              this.registerForm.yue = 0
-              this.arrearsFlag = false
-            }else{
-              this.registerForm.yue = lastChange
-              this.arrearsFlag = true  
-            }
+          let totalMoney = tempData.data[0].TotMoneyDX
+          let payMoney = tempData.data[0].PayMoney
+          let yue = (lastChange + payMoney - totalMoney).toFixed(2)
+          if(yue>=0){
+            this.registerForm.yue = yue
+            this.number=number;
           }else{
-            this.registerForm.yue = nowChange
-            this.arrearsFlag = false
+            this.registerForm.yue = yue
+            this.arrearsFlag = true  
+            this.number=number;
           }
-          this.pageInfoShow=true;
-          this.number=number;
-        }).catch(e=>{
-          this.pageInfoShow=true;
+          // this.pageInfoShow=true;
+          // this.number=number;
+        }
+        ).catch(e=>{
+          // this.pageInfoShow=true;
           this.number=number;
         })
         this.registerForm.khbh = data.userid;

src/views/currentSystem/work/order/register/components/customerQuery.vue

@@ -293,11 +293,13 @@ export default {
         },
       }).then(res => {
         let tempData = JSON.parse(res.data.result);
-        console.log(tempData,'tempdata')
+        console.log(tempData,'tempdata计算余额')
           // data[0].lastChange = tempData.data.data[tempData.data.data.length - 1].LastChange
           // data[0].nowChange = tempData.data.data[tempData.data.data.length - 1].NowChange
           data[0].lastChange = tempData.data[0].LastChange
           data[0].nowChange = tempData.data[0].NowChange
+          data[0].totalMoney = tempData.data[0].TotMoneyDX
+          data[0].payMoney = tempData.data[0].PayMoney
         this.$emit("userList", data);
       })
 

src/views/currentSystem/work/order/register/register_merge.vue

@@ -3138,6 +3138,7 @@ timestampToDateString(timestamp) {
   return dateString;
 },
     userList(val) {
+      console.log(val,'计算余额')
       // debugger
       // this.registerForm = {
       //   ...this.registerForm,
@@ -3168,20 +3169,27 @@ timestampToDateString(timestamp) {
       this.registerForm.sbkj = val[0].waterMeterCaliber;
       this.registerForm.kaihutime = this.timestampToDateString(val[0].kaihutime);
       this.registerForm.metertype = val[0].metertype;
-      if(val[0].nowChange ==0){
-        if(val[0].lastChange==0){
-          this.registerForm.yue = 0
-          this.arrearsFlag = false
-        }else{
-          this.registerForm.yue = val[0].lastChange
-          this.arrearsFlag = true  
-        }
-      }else{
-          this.registerForm.yue = val[0].nowChange
-          this.arrearsFlag = false
-        }
+      // if(val[0].nowChange ==0){
+      //   if(val[0].lastChange==0){
+      //     this.registerForm.yue = 0
+      //     this.arrearsFlag = false
+      //   }else{
+      //     this.registerForm.yue = val[0].lastChange
+      //     this.arrearsFlag = true  
+      //   }
+      // }else{
+      //     this.registerForm.yue = val[0].nowChange
+      //     this.arrearsFlag = false
+      //   }
       // this.registerForm.yue = val[0].lastChange
       // }
+      let yue = (val[0].lastChange + val[0].payMoney - val[0].totalMoney).toFixed(2)
+      if(yue>=0){
+        this.registerForm.yue = yue
+      }else{
+        this.registerForm.yue = yue
+        this.arrearsFlag = true  
+      }
       this.indexMessage++;
       this.$emit("getKhbh", val[0].userCode);
 

src/views/dataBoard/cockpit/index.vue

@@ -19,10 +19,10 @@
             <div class="labelfont">
               <div class="ledfont" ref="countupRef">{{data.name}}</div>
               <div class='sjDiv'>
-                <label class='sjDivtitle'>设计供水量：</label><label>{{(data.designProcessingCapacity||'-')}}</label><label class='sjDivtitle'>{{data.unit1}}</label>
+                <label class='sjDivtitle'>设计供水量：</label><label>{{((data.designProcessingCapacity/10000)||'-')}}</label><label class='sjDivtitle'>{{data.unit1}}</label>
               </div>
               <div class='gsDiv'>
-                <label class='sjDivtitle'>今日供水量：</label><label>{{(data.currentInfo.value||'-')}}</label><label class='sjDivtitle'>{{data.unit1}}</label>
+                <label class='sjDivtitle'>今日供水量：</label><label>{{((data.currentInfo.value/10000)||'-')}}</label><label class='sjDivtitle'>{{data.unit1}}</label>
               </div>
             </div>
             <!-- <div class="note">{{data.typename}}</div> -->
@@ -88,7 +88,7 @@ export default {
             filed:"",//供水量涉及的指标
             value:"-",//合计值
           },
-          unit1:'吨',
+          unit1:'万吨',
         },
         {
           name:'眉山市第二水厂',
@@ -97,7 +97,7 @@ export default {
             filed:"2sc_1gsbf.今日低区供水量D84,2sc_gqgs.今日高区供水量D75",//供水量涉及的指标
             value:"-",//合计值
           },
-          unit1:'吨',
+          unit1:'万吨',
         },
         {
           name:'眉山市第三水厂',
@@ -106,7 +106,7 @@ export default {
             filed:"",//供水量涉及的指标
             value:"-",//合计值
           },
-          unit1:'吨',
+          unit1:'万吨',
         }
       ],
       leftdata:[

src/views/zhpt/wxreportforms/components/ExportBtn.vue

@@ -9,7 +9,7 @@ import FileSaver from 'file-saver'
 import XLSX2 from 'xlsx'
 import XLSX from 'xlsx-style'
 export default {
-  props: ['tableId', 'file'],
+  props: ['tableId', 'file','componentTable'],
   data() {
     return {
       todayTimeString: new Date().getTime()
@@ -18,8 +18,13 @@ export default {
   methods: {
     // 导出表格成excel
     setExport2Excel() {
+      if(this.componentTable){ // 如果使用表格组件table-item则传入componentTable
+        var wb = XLSX2.utils.table_to_sheet(this.componentTable)
+      }else{
+        var wb = XLSX2.utils.table_to_sheet(document.querySelector(`#${this.tableId}`)) // mytable为表格的id名
+      }
       /* generate workbook object from table */
-      var wb = XLSX2.utils.table_to_sheet(document.querySelector(`#${this.tableId}`)) // mytable为表格的id名
+      
       // if (!wb['!merges']) {
       //   this.$message.warning('无法导出：报表无数据')
       //   return
@@ -56,7 +61,7 @@ export default {
       var cacheCells = {}
       for (const key in wb) {
         if(key.indexOf('!') > -1 ) continue
-        if(['', '操作', '详情', '编辑详情'].indexOf(wb[key].v) > -1) {
+        if(['', '操作', '详情', '编辑详情','查看用水量'].indexOf(wb[key].v) > -1) {
           delete wb[key]
           continue
         } else {