Переглянути джерело

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

1004749546@qq.com 4 роки тому
батько
коміт
743a0bf951

+ 10 - 11
src/views/cleanManage/cleanDetail.vue

@@ -104,9 +104,9 @@ export default {
       itemCleanTime: '', // 每行清运时间
       // 查询参数
       queryParam: {
-        operatorUserId: undefined, // 网点编号
+        operatorUserId: undefined, // 操作人id
+        stationNo: undefined, // 网点编号
         deviceNo: null, // 设备编号
-        loginFlag: '',
         beginDate: null, // 开始时间
         endDate: null // 结束时间
       },
@@ -124,7 +124,7 @@ export default {
         { title: '可回收物清运量(kg)', dataIndex: 'cleanWeight', width: 100, align: 'center', sorter: true, customRender: (text) => { return text || 0 } },
         { title: '清运司机', dataIndex: 'driverName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '操作人', dataIndex: 'operatorName', width: 100, align: 'center' },
-        { title: '备注', dataIndex: 'remarks', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '备注', dataIndex: 'remarks', width: 100, align: 'center', ellipsis: true, customRender: (text) => { return text || '--' } },
         { title: '操作', dataIndex: 'action', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -182,17 +182,16 @@ export default {
       cleanUserList().then(res => {
         if (res.status == 200) {
           this.cleanUserData = res.data || []
-		  console.log(this.cleanUserData)
         }
       })
     },
     // 获取合作商数据
     getStationList () {
-	  stationList().then(res => {
-	    if (res.status == 200) {
-	      this.optionData = res.data || []
-	    }
-	  })
+      stationList().then(res => {
+        if (res.status == 200) {
+          this.optionData = res.data || []
+        }
+      })
     },
     // 合计
     getTotal () {
@@ -222,9 +221,9 @@ export default {
     // 重置
     reset () {
       this.queryParam = {
-        operatorUserId: undefined, // 网点编号
+        operatorUserId: undefined, // 操作人id
+        stationNo: undefined, // 网点编号
         deviceNo: null, // 设备编号
-        loginFlag: '',
         beginDate: null, // 开始时间
         endDate: null // 结束时间
       }

+ 2 - 2
src/views/cleanManage/netWorkCleanRecord.vue

@@ -101,8 +101,8 @@ export default {
       ],
       dateFormat: 'YYYY-MM-DD',
       columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
-        { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '清运次数', dataIndex: 'cleanTimes', width: 100, align: 'center', sorter: true },
+        { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '清运次数', dataIndex: 'cleanTimes', width: 50, align: 'center', sorter: true },
         { title: '清运重量(kg)', dataIndex: 'cleanWeight', width: 100, align: 'center', sorter: true, customRender: (text) => { return text || 0 } },
         { title: '最后清运时间', dataIndex: 'cleanTime', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '操作', dataIndex: 'action', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }],

+ 13 - 40
src/views/equipmentManage/electronicScale/electronicScale.vue

@@ -64,12 +64,12 @@ export default {
   data () {
     return {
       searchForm: {
-        macAddress: ''
+        macAddress: '' // 设备MAC地址
       },
       isOpenModal: false, // 默认弹窗关闭
       itemDeviceCode: '', // 编辑行设备编号
-      itemId: '',
-      totalNum: '',
+      itemId: '', // 编辑行id
+      totalNum: '', // 总计条数
       isQrCodeModal: false,
       shName: '',
       qrCode: '',
@@ -78,42 +78,10 @@ export default {
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 100, align: 'center' },
         { title: '设备MAC地址', dataIndex: 'macAddress', width: 100, align: 'center' },
-        {
-          title: '设备名称',
-          dataIndex: 'deviceName',
-          width: 100,
-          align: 'center',
-          customRender: text => {
-            return text || '--'
-          }
-        },
-        {
-          title: '设备编号',
-          dataIndex: 'deviceCode',
-          width: 100,
-          align: 'center',
-          customRender: text => {
-            return text || '--'
-          }
-        },
-        {
-          title: '设备型号',
-          dataIndex: 'deviceModel',
-          width: 100,
-          align: 'center',
-          customRender: text => {
-            return text || '--'
-          }
-        },
-        {
-          title: '生产厂家',
-          dataIndex: 'manufacturer',
-          width: 100,
-          align: 'center',
-          customRender: text => {
-            return text || '--'
-          }
-        },
+        { title: '设备名称', dataIndex: 'deviceName', width: 100, align: 'center', ellipsis: true, customRender: text => { return text || '--' } },
+        { title: '设备编号', dataIndex: 'deviceCode', width: 100, align: 'center', ellipsis: true, customRender: text => { return text || '--' } },
+        { title: '设备型号', dataIndex: 'deviceModel', width: 100, align: 'center', ellipsis: true, customRender: text => { return text || '--' } },
+        { title: '生产厂家', dataIndex: 'manufacturer', width: 100, align: 'center', ellipsis: true, customRender: text => { return text || '--' } },
         { title: '操作', dataIndex: 'action', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -139,7 +107,12 @@ export default {
     downloadCode (item) {
       const link = document.createElement('a')
       link.href = this.qrCode
-      link.download = this.shName + '.png'
+      if (this.shName) {
+        link.download = this.shName + '.png'
+      } else {
+        link.download = 'MAC地址二维码' + '.png'
+      }
+
       link.click()
     },
     // 查看二维码

+ 8 - 5
src/views/equipmentManage/exchangeSetting/ExchangeSetting.vue

@@ -107,7 +107,10 @@ export default {
         title: '兑换规则说明',
         dataIndex: 'remarks',
         width: 200,
-        align: 'center'
+        align: 'center',
+        customRender: (text) => {
+          return text || '--'
+        }
       },
       {
         title: '兑换规则(投放重量(g)/可兑换乐豆数(个))',
@@ -165,7 +168,7 @@ export default {
             return record ? (record.rubbishWeight ? (record.rubbishWeight + 'g/' + record.goleNum + '个') : '不兑换') : '不兑换'
           }
         },
-		{
+        {
 		  title: '废旧玻璃',
 		  dataIndex: 'glass',
 		  width: 100,
@@ -173,8 +176,8 @@ export default {
 		  customRender: (record, text) => {
 		    return record ? (record.rubbishWeight ? (record.rubbishWeight + 'g/' + record.goleNum + '个') : '不兑换') : '不兑换'
 		  }
-		},
-		{
+        },
+        {
 		  title: '可回收物',
 		  dataIndex: 'recycling',
 		  width: 100,
@@ -182,7 +185,7 @@ export default {
 		  customRender: (record, text) => {
 		    return record ? (record.rubbishWeight ? (record.rubbishWeight + 'g/' + record.goleNum + '个') : '不兑换') : '不兑换'
 		  }
-		}
+        }
         ]
       },
       {