zhangdan преди 4 години
родител
ревизия
a8cf7a83d5

+ 2 - 2
src/views/equipmentManage/collector/collector.vue

@@ -17,7 +17,7 @@
           <a-col :xs="24" :sm="12" :md="8" :lg="6">
             <a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-select
-                id="cleanDetail-stationNo"
+                id="collector-stationNo"
                 placeholder="请选择网点名称"
                 allowClear
                 v-model="queryParam.stationNo"
@@ -62,7 +62,7 @@
       </span>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
+        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" id="collector-edit"/>
         <a-icon
           id="collector-resetPassword"
           type="unlock"

+ 11 - 5
src/views/reportForm/unRecyclableRubbishDetails.vue

@@ -12,7 +12,7 @@
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="查询时间区间" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
               <a-range-picker
-                id="notCleanNetwork-time"
+                id="unRecyclableRubbishDetails-time"
                 v-model="time"
                 style="width: 100%;"
                 :format="dateFormat"
@@ -23,14 +23,20 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="采集员" :label-col="{ span:8}" :wrapper-col="{ span:16}">
-              <a-input id="network-queryWord" allowClear :maxLength="30" v-model="queryParam.queryWord" placeholder="请输入姓名/手机号码" />
+              <a-input
+                id="unRecyclableRubbishDetails-queryWord"
+                allowClear
+                :maxLength="30"
+                v-model="queryParam.queryWord"
+                placeholder="请输入姓名/手机号码"
+                autocomplete="off"/>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="网点名称" :label-col="{ span:8}" :wrapper-col="{ span:16}">
               <a-select
                 style="max-height: 50px;overflow: auto;margin-top: 3px;"
-                id="notCleanNetwork-stationNo"
+                id="unRecyclableRubbishDetails-stationNo"
                 placeholder="请选择网点名称"
                 allowClear
                 v-model="queryParam.stationNo"
@@ -42,8 +48,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
-            <a-button type="primary" @click="$refs.table.refresh(true)" id="notCleanNetwork-refresh" style="margin-top: 4px">查询</a-button>
-            <a-button type="" @click="reset" id="notCleanNetwork-reset" style="margin: 4px 0 0 10px">重置</a-button>
+            <a-button type="primary" @click="$refs.table.refresh(true)" id="unRecyclableRubbishDetails-refresh" style="margin-top: 4px">查询</a-button>
+            <a-button type="" @click="reset" id="unRecyclableRubbishDetails-reset" style="margin: 4px 0 0 10px">重置</a-button>
           </a-col>
         </a-row>
 

+ 20 - 20
src/views/reportForm/unRecyclableRubbishTotal.vue

@@ -12,7 +12,7 @@
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="采集时间区间" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
               <a-range-picker
-                id="notCleanNetwork-time"
+                id="unRecyclableRubbishTotal-time"
                 v-model="time"
                 style="width: 100%;"
                 :format="dateFormat"
@@ -24,7 +24,7 @@
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item prop="provinceCode" label="所属区域:" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
               <a-select
-                id="notCleanNetwork-provinceCode"
+                id="unRecyclableRubbishTotal-provinceCode"
                 allowClear
                 v-model="queryParam.provinceCode"
                 @change="getCityList"
@@ -37,7 +37,7 @@
             <a-form-model-item prop="cityCode" label=" " :colon="false" :label-col="{ span:4 }" :wrapper-col="{ span:16}">
               <a-select
                 allowClear
-                id="notCleanNetwork-cityCode"
+                id="unRecyclableRubbishTotal-cityCode"
                 v-model="queryParam.cityCode"
                 @change="getAreaList"
                 placeholder="请选择市">
@@ -47,14 +47,14 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item prop="districtCode" label=" " :colon="false" :label-col="{ span:0}" :wrapper-col="{ span:16}">
-              <a-select allowClear id="notCleanNetwork-districtCode" v-model="queryParam.districtCode" placeholder="请选择区/县">
+              <a-select allowClear id="unRecyclableRubbishTotal-districtCode" v-model="queryParam.districtCode" placeholder="请选择区/县">
                 <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="4">
-            <a-button type="primary" @click="$refs.table.refresh(true)" id="notCleanNetwork-refresh" style="margin: 4px 10px 0 0">查询</a-button>
-            <a-button type="" @click="reset" id="notCleanNetwork-reset" style="margin-top: 4px">重置</a-button>
+            <a-button type="primary" @click="$refs.table.refresh(true)" id="unRecyclableRubbishTotal-refresh" style="margin: 4px 10px 0 0">查询</a-button>
+            <a-button type="" @click="reset" id="unRecyclableRubbishTotal-reset" style="margin-top: 4px">重置</a-button>
           </a-col>
         </a-row>
         <a-row :gutter="24">
@@ -62,7 +62,7 @@
             <a-form-model-item label="网点名称" :label-col="{ span:8}" :wrapper-col="{ span:16}">
               <a-select
                 style="max-height: 50px;overflow: auto;"
-                id="notCleanNetwork-stationNo"
+                id="unRecyclableRubbishTotal-stationNo"
                 placeholder="请选择网点名称"
                 allowClear
                 v-model="queryParam.stationNo"
@@ -79,7 +79,7 @@
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,<span> {{ total }} </span>kg。
-        其中,其他垃圾总计<span> {{otherTotal }} </span>kg,厨余垃圾总计<span>{{chuyuTotal }} </span>kg,建筑垃圾总计<span> {{ jianzhuTotal}} </span>kg
+        其中,其他垃圾总计<span> {{ otherTotal }} </span>kg,厨余垃圾总计<span>{{ chuyuTotal }} </span>kg,建筑垃圾总计<span> {{ jianzhuTotal }} </span>kg
       </div>
     </a-alert>
     <!-- 列表 -->
@@ -108,10 +108,10 @@ export default {
   data () {
     return {
       orderTotal: 0, //  总计条数
-     total: 0, //  可回收垃圾总计
-     otherTotal: 0, //  其他垃圾总计
-     jianzhuTotal: 0, //  建筑垃圾总计
-     chuyuTotal: 0, //  厨余垃圾总计
+      total: 0, //  可回收垃圾总计
+      otherTotal: 0, //  其他垃圾总计
+      jianzhuTotal: 0, //  建筑垃圾总计
+      chuyuTotal: 0, //  厨余垃圾总计
       queryParam: {
         stationNo: undefined, // 网点名称
         findRubbishDataBeginDate: null, // 开始时间
@@ -133,10 +133,10 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '其他垃圾(kg)',  dataIndex: 'GATHER_OTHER', width: 100, align: 'center',customRender: (text) => { return text ? (text / 1000).toFixed(3)/1 : '0' } },
-        { title: '厨余垃圾(kg)',  dataIndex: 'GATHER_KITCHEN', width: 100, align: 'center',customRender: (text) => { return text ? (text / 1000).toFixed(3)/1 : '0' } },
-        { title: '建筑垃圾(kg)',  dataIndex: 'GATHER_BUILDING', width: 100, align: 'center',customRender: (text) => { return text ? (text / 1000).toFixed(3)/1 : '0' } },
-        { title: '总计(kg)', dataIndex: 'GATHER_TOTAL', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3)/1 : '0' } }
+        { title: '其他垃圾(kg)', dataIndex: 'GATHER_OTHER', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) / 1 : '0' } },
+        { title: '厨余垃圾(kg)', dataIndex: 'GATHER_KITCHEN', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) / 1 : '0' } },
+        { title: '建筑垃圾(kg)', dataIndex: 'GATHER_BUILDING', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) / 1 : '0' } },
+        { title: '总计(kg)', dataIndex: 'GATHER_TOTAL', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) / 1 : '0' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -255,10 +255,10 @@ export default {
       getRubbishTotal(params).then(res => {
         if (res.status == 200) {
           if (res.data) {
-            this.otherTotal = res.data.GATHER_OTHER ? (res.data.GATHER_OTHER / 1000).toFixed(3)/1 : '0'
-            this.jianzhuTotal = res.data.GATHER_BUILDING ? (res.data.GATHER_BUILDING / 1000).toFixed(3)/1 : '0'
-            this.chuyuTotal = res.data.GATHER_KITCHEN ? (res.data.GATHER_KITCHEN / 1000).toFixed(3)/1 : '0'
-            this.total = res.data.GATHER_TOTAL ? (res.data.GATHER_TOTAL / 1000).toFixed(3)/1 : '0'
+            this.otherTotal = res.data.GATHER_OTHER ? (res.data.GATHER_OTHER / 1000).toFixed(3) / 1 : '0'
+            this.jianzhuTotal = res.data.GATHER_BUILDING ? (res.data.GATHER_BUILDING / 1000).toFixed(3) / 1 : '0'
+            this.chuyuTotal = res.data.GATHER_KITCHEN ? (res.data.GATHER_KITCHEN / 1000).toFixed(3) / 1 : '0'
+            this.total = res.data.GATHER_TOTAL ? (res.data.GATHER_TOTAL / 1000).toFixed(3) / 1 : '0'
           }
         }
       })