Browse Source

Merge branch 'deploy_0106' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy_0106

lilei 4 years ago
parent
commit
2c933f6f4b

+ 1 - 1
src/views/cleanManage/cleanDetail.vue

@@ -230,7 +230,7 @@ export default {
         endDate: null // 结束时间
       }
       this.time = []
-      this.$refs.table.refresh(true)
+      this.refresh()
     },
     // 查看清运详情
     handleDetail (record) {

+ 1 - 1
src/views/cleanManage/cleanDetailModal.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal title="清运详情" :footer="null" v-model="isShow" @cancel="cancel" centered>
     <div class="detail-item" v-for="item in itemData" :key="item.index"><span>{{ item.rubbishType }}:</span>{{ (item.cleanWeight/1000).toFixed(2) }} kg</div>
-    <div><a-empty v-if="itemData.length == 0" style="text-align: center;" /></div>
+    <a-empty v-if="itemData.length == 0" style="text-align: center;" />
   </a-modal>
 </template>
 

+ 1 - 1
src/views/cleanManage/cleanModal.vue

@@ -25,7 +25,7 @@
           <a-button type="primary" @click="handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '15px' }" @click="isShow=false" >
+          <a-button :style="{ marginLeft: '15px' }" @click="cancel" >
             取消
           </a-button>
         </a-form-model-item>

+ 0 - 1
src/views/cleanManage/netWorkCleanModal.vue

@@ -61,7 +61,6 @@ export default {
           searchDateModal.endDate = null
         }
         const searchData = Object.assign(parameter, { stationNo: this.stationNo }, { beginDate: searchDateModal.beginDate }, { endDate: searchDateModal.endDate })
-        console.log(searchData, '----------详情参数')
         return networkDetail(searchData).then(res => {
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize

+ 11 - 3
src/views/cleanManage/netWorkCleanRecord.vue

@@ -36,7 +36,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
-            <a-button type="primary" @click="refresh" id="netWorkCleanRecord-refresh" style="margin: 4px 10px 0 20px">查询</a-button>
+            <a-button type="primary" @click="refreshSearch" id="netWorkCleanRecord-refresh" style="margin: 4px 10px 0 20px">查询</a-button>
             <a-button type="" @click="reset" id="netWorkCleanRecord-reset" style="margin-top: 4px">重置</a-button>
           </a-col>
         </a-row>
@@ -186,10 +186,18 @@ export default {
       })
     },
     // 查询
-    refresh () {
+    refreshSearch () {
       this.$refs.table.refresh(true)
       this.getTotal()
     },
+    // 刷新列表
+    // refreshTable () {
+    //   if (this.itemStationNo && this.time) {
+    //     this.$refs.table.refresh()
+    //   } else {
+    //     this.$refs.table.refresh(true)
+    //   }
+    // },
     // 重置
     reset () {
       this.queryParam = {
@@ -201,7 +209,7 @@ export default {
         moment(getDate.getRecentday().starttime, 'YYYY-MM-DD 00:00:00'),
         moment(getDate.getRecentday().endtime, 'YYYY-MM-DD 23:59:59')
       ]
-      this.$refs.table.refresh(true)
+      this.refreshSearch()
     },
     // 查看清运详情
     handleDetail (record) {

+ 10 - 10
src/views/cleanManage/notCleanNetwork.vue

@@ -197,7 +197,7 @@ export default {
       recyclable: '', //  可回收物总计
       queryParam: {
         srcDeviceCode: undefined, // 设备编号
-        stationName: '', // 网点名称
+        stationNo: undefined, // 网点名称
         orderType: 'max', // 排序规则
         beginDate: null, // 开始时间
         endDate: null, // 结束时间
@@ -212,7 +212,8 @@ export default {
       // 将默认当天时间日期回显在时间选择框中
       time: [],
       dateFormat: 'YYYY-MM-DD', // 日期格式
-      columns: [{ title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center' },
+      columns: [
+        { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { slots: { title: 'customTitle' },
           children: [{ title: '废旧衣物',
@@ -316,14 +317,12 @@ export default {
               const _item = res.data.list[i]
               //  找出可回收垃圾库存量最大的值
               const arr = [_item.clothes, _item.paper, _item.plastic, _item.metal, _item.metPla, _item.glass, _item.recycling]
-              if (arr) {
-              	arr.some(item => {
-              		const isTrue = item != 0
-                  console.log(isTrue)
-              	})
-              }
               const maxVal = Math.max(...arr)
-              _item.maxVal = maxVal
+              if (maxVal == 0) {
+                _item.maxVal = null
+              } else {
+                _item.maxVal = maxVal
+              }
             }
             this.orderTotal = res.data.count || 0
             this.getTotal()
@@ -462,7 +461,7 @@ export default {
     // 重置
     reset () {
       this.queryParam.srcDeviceCode = undefined
-      this.queryParam.stationName = ''
+      this.queryParam.stationNo = undefined
       this.queryParam.orderType = ''
       this.queryParam.beginDate = null
       this.queryParam.endDate = null
@@ -470,6 +469,7 @@ export default {
       this.queryParam.cityCode = undefined
       this.queryParam.districtCode = undefined
       this.time = []
+	  this.$refs.table.refresh(true)
     },
     // 查看清运详情
     handleDetail (record) {

+ 2 - 2
src/views/equipmentManage/electronicScale/addElectronicScale.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-modal :footer="null" centered :title="titleText" v-model="isShow" @cancle="isShow=false">
+  <a-modal :footer="null" centered :title="titleText" v-model="isShow" @cancle="cancel">
     <a-form-model :model="formData" ref="ruleForm" :rules="rules">
       <a-form-model-item label="设备MAC地址" :label-col="{span:6}" :wrapper-col="{span:16}" prop="macAddress">
         <a-input
@@ -26,7 +26,7 @@
         <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '15px' }">
           保存
         </a-button>
-        <a-button :style="{ marginLeft: '15px' }" @click="isShow=false">
+        <a-button :style="{ marginLeft: '15px' }" @click="cancel">
           取消
         </a-button>
       </a-form-model-item>