chenrui 4 lat temu
rodzic
commit
5789b58be0

+ 17 - 1
src/api/cleanManage.js

@@ -69,6 +69,16 @@ export const getCleanDetails = (params) => {
   })
 }
 
+// 操作人
+export const cleanUserList = (params) => {
+  const url = `zxyj/user/queryCleanUserList`
+  return axios.request({
+    url: url,
+    data: {},
+    method: 'post'
+  })
+}
+
 // 待清运列表
 export const netWorkCleanRecordList = (params) => {
   const url = `clean/waitToClean/${params.pageNo}/${params.pageSize}`
@@ -85,7 +95,7 @@ export const netWorkCleanRecordList = (params) => {
 // 重置密码
 export const resetPSD = params => {
   return axios({
-    url: `driver/resetPwd`,
+    url: `zxyj/user/resetPwd`,
     data: params,
     method: 'POST'
   })
@@ -103,6 +113,7 @@ export const getDriverList = params => {
   })
 }
 
+<<<<<<< HEAD
 // 清运司机  全部
 export const driverQueryList = (params) => {
   const url = `driver/queryDriverList`
@@ -122,6 +133,8 @@ export const driverQueryList = (params) => {
 //   })
 // }
 
+=======
+>>>>>>> 3530323c4cd6d2012c04f80f2506b9d37d9c4790
 // 删除用户接口
 export const delectDriver = params => {
   return axios({
@@ -149,6 +162,7 @@ export const driverDetails = (params) => {
     method: 'get'
   })
 }
+<<<<<<< HEAD
 // 清运管理  统计报表
 export const getCleanReport = (params) => {
   const url = `cleanReport/getReport`
@@ -158,3 +172,5 @@ export const getCleanReport = (params) => {
     method: 'post'
   })
 }
+=======
+>>>>>>> 3530323c4cd6d2012c04f80f2506b9d37d9c4790

+ 1 - 1
src/api/power-user.js

@@ -3,7 +3,7 @@ import { axios } from '@/utils/request'
 // 重置密码
 export const resetPSD = params => {
   return axios({
-    url: `user/resetPwd`,
+    url: `zxyj/user/resetPwd`,
     data: params,
     method: 'POST'
   })

+ 10 - 10
src/config/router.config.js

@@ -404,16 +404,16 @@ export const asyncRouterMap = [{
         permission: 'M_lottery_list'
       }
     },
-    {
-      path: '/market/luckDrawRecord',
-      name: 'luckDrawRecord',
-      component: () => import(/* webpackChunkName: "market" */ '@/views/market/luckDrawRecord.vue'),
-      meta: {
-        title: '抽奖记录',
-        icon: 'profile'
-        // permission: 'M_lottery_list'
-      }
-    },
+    // {
+    //   path: '/market/luckDrawRecord',
+    //   name: 'luckDrawRecord',
+    //   component: () => import(/* webpackChunkName: "market" */ '@/views/market/luckDrawRecord.vue'),
+    //   meta: {
+    //     title: '抽奖记录',
+    //     icon: 'profile'
+    //     // permission: 'M_lottery_list'
+    //   }
+    // },
     {
       path: '/market/giftCard',
       name: 'giftCardManage',

+ 8 - 44
src/views/cleanManage/addDiverModal.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <a-modal
-      class="modalBox"
+      :footer="null"
       :title="titleText"
       v-model="isshow"
       @cancle="cancel"
@@ -35,7 +35,7 @@ import {
   STable,
   VSelect
 } from '@/components'
-import {saveDriver,driverDetails} from '@/api/cleanManage.js'
+import { saveDriver, driverDetails } from '@/api/cleanManage.js'
 export default {
   name: 'AddDiverModal',
   components: {
@@ -59,9 +59,9 @@ export default {
       formLayout: 'horizontal',
       optionData: [],
       formData: {
-        name: '',
-        loginFlag: '', // 活动状态
-        phone: ''
+        name: '',	// 姓名
+        loginFlag: '', // 状态
+        phone: '' // 手机号码
       },
       rules: {
         phone: [{ required: true, pattern: /^\d{11}$/, message: '请输入手机号', trigger: 'blur' }],
@@ -74,52 +74,23 @@ export default {
       this.clear()
       this.$emit('close')
     },
-    handleChange (value) {
-      console.log(`selected ${value}`)
-    },
-    handleBlur () {
-      console.log('blur')
-    },
-    handleFocus () {
-      console.log('focus')
-    },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
     // 编辑查详情
     getPageInfo () {
       driverDetails({
         id: this.itemId
       }).then(res => {
         if (res.status == 200) {
-          console.log(res, '-------------返回数据')
-		  this.formData = Object.assign({}, this.formData, res.data)
-		  this.formData.loginFlag = Number(this.formData.loginFlag)
-		  // this.formData.loginFlag
-		  // console.log(this.formData, '-----------数据')
-          // this.form.setFieldsValue({
-          //   'formData': res.data
-          // })
-          // this.formData.setFieldsValue({ 'formData.loginFlag': Number(res.data.loginFlag) })
-          // this.formData.setFieldsValue({ 'formData.name': res.data.name })
-          // this.formData.setFieldsValue({ 'formData.phone': res.data.phone })
-          // this.form.setFieldsValue({ 'formData.sex': res.data.sex })
-          // this.form.setFieldsValue({ 'formData.org.name': res.data.org.name })
-          // this.form.setFieldsValue({ 'formData.remarks': res.data.remarks })
+          this.formData = Object.assign({}, this.formData, res.data)
+          this.formData.loginFlag = Number(this.formData.loginFlag)
         }
       })
     },
     // 保存提交
     onSubmit () {
       this.$refs.ruleForm.validate(valid => {
-		  const _this = this
-		  console.log(valid, '--------------提交')
+        const _this = this
         if (valid) {
-          console.log(valid, '--------------提交', this.formData)
           const params = JSON.parse(JSON.stringify(this.formData))
-				 console.log(params)
           saveDriver(params).then(res => {
             console.log(res, 'rrrrrrrrr')
             if (res.status == 200) {
@@ -150,7 +121,6 @@ export default {
       this.isshow = newValue
     },
     isshow (val) {
-      console.log(val, '------------弹窗')
       if (!val) {
         this.$emit('close')
       } else {
@@ -160,7 +130,6 @@ export default {
       }
     },
     itemId (newValue, oldValue) {
-      console.log(newValue, '----------id')
       if (newValue && this.isshow) {
         this.titleText = '编辑'
         this.getPageInfo(newValue)
@@ -173,9 +142,4 @@ export default {
 </script>
 
 <style>
-	.modalBox {}
-
-	.ant-modal-footer {
-		display: none;
-	}
 </style>

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

@@ -40,7 +40,16 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="操作人" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择操作人" id="cleanDetail-queryOrderDate"></v-select>
+              <a-select
+                id="cleanDetail-operatorUserId"
+                placeholder="请选择操作人"
+                allowClear
+                v-model="queryParam.operatorUserId"
+                showSearch
+                option-filter-prop="children"
+                :filter-option="filterOption">
+                <a-select-option v-for="item in cleanUserData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="4">
@@ -75,7 +84,7 @@
 import { STable, VSelect } from '@/components'
 import { stationList } from '@/api/releaseRecord.js'
 import cleanDetailModal from './cleanDetailModal.vue'
-import { cleanDetailsList, getCleanDetailsTotal } from '@/api/cleanManage.js'
+import { cleanDetailsList, getCleanDetailsTotal, cleanUserList } from '@/api/cleanManage.js'
 import moment from 'moment'
 export default {
   components: { STable, VSelect, cleanDetailModal },
@@ -94,18 +103,19 @@ export default {
       itemCleanTime: '', // 每行清运时间
       // 查询参数
       queryParam: {
-        stationNo: undefined, // 网点编号
+        operatorUserId: undefined, // 网点编号
         deviceNo: null, // 设备编号
         loginFlag: '',
         beginDate: null, // 开始时间
         endDate: null // 结束时间
       },
       optionData: [], // 网点名称数据
+      cleanUserData: [], // 操作人数据
       // 将默认当天时间日期回显在时间选择框中
       time: [],
       dateFormat: 'YYYY-MM-DD', // 日期格式
-      totalNum: '', // 总条数
-      cleanWeightTotal: '', // 可回收物清运量总计
+      totalNum: 0, // 总条数
+      cleanWeightTotal: 0, // 可回收物清运量总计
       columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '清运时间', dataIndex: 'cleanTime', width: 100, align: 'center' },
         { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
@@ -147,6 +157,7 @@ export default {
   mounted () {
     this.getStationList()
     this.getTotal()
+    this.getCleanUserList()
   },
   methods: {
     // 不可选日期
@@ -165,14 +176,23 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
-    // 获取合作商数据
-    getStationList () {
-      stationList().then(res => {
+    // 获取操作人数据
+    getCleanUserList () {
+      cleanUserList().then(res => {
         if (res.status == 200) {
-          this.optionData = res.data || []
+          this.cleanUserData = res.data || []
+		  console.log(this.cleanUserData)
         }
       })
     },
+    // 获取合作商数据
+    getStationList () {
+	  stationList().then(res => {
+	    if (res.status == 200) {
+	      this.optionData = res.data || []
+	    }
+	  })
+    },
     // 合计
     getTotal () {
       const params = this.queryParam
@@ -201,7 +221,7 @@ export default {
     // 重置
     reset () {
       this.queryParam = {
-        stationNo: undefined, // 网点编号
+        operatorUserId: undefined, // 网点编号
         deviceNo: null, // 设备编号
         loginFlag: '',
         beginDate: null, // 开始时间

+ 5 - 36
src/views/cleanManage/driverManage.vue

@@ -79,41 +79,11 @@ export default {
       showModal: false,
       itemId: null, // 编辑行id
       // 表头
-      columns: [{
-        title: '序号',
-        dataIndex: 'no',
-        width: 60,
-        align: 'center'
-      },
-      {
-        title: '司机姓名',
-        dataIndex: 'name',
-        width: 150,
-        align: 'center'
-      },
-      {
-        title: '手机号码',
-        dataIndex: 'phone',
-        width: 100,
-        align: 'center'
-      },
-      {
-        title: '状态',
-        dataIndex: 'loginFlag',
-        width: 100,
-        align: 'center',
-        scopedSlots: {
-          customRender: 'loginFlag'
-        }
-      },
-      {
-        title: '操作',
-        width: 100,
-        align: 'center',
-        scopedSlots: {
-          customRender: 'action'
-        }
-      }
+      columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
+        { title: '司机姓名', dataIndex: 'name', width: 150, align: 'center' },
+        { title: '手机号码', dataIndex: 'phone', width: 100, align: 'center' },
+        { title: '状态', dataIndex: 'loginFlag', width: 100, align: 'center', scopedSlots: { customRender: 'loginFlag' } },
+        { title: '操作', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -188,7 +158,6 @@ export default {
     },
     // 编辑
     handleEdit (row) {
-      console.log(row, 'row')
       this.itemId = row.id
       this.showModal = true
     }

+ 5 - 5
src/views/equipmentManage/electronicScale/electronicScale.vue

@@ -2,7 +2,7 @@
   <a-card class="electronicScale-container" :bordered="false">
     <!-- 搜索框 -->
     <div class="electronicScale-container-searchForm">
-      <a-form-model :model="searchForm" layout="inline" ref="searchForm">
+      <a-form-model :model="searchForm" layout="inline" ref="searchForm" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="24">
           <a-col :xs="24" :sm="12" :md="8" :lg="6">
             <a-form-model-item label="设备MAC码" :label-col="{span:7}" :wrapper-col="{span:17}">
@@ -55,10 +55,10 @@ export default {
       columns: [{ 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' },
-        { title: '设备编号', dataIndex: 'deviceCode', width: 100, align: 'center' },
-        { title: '设备型号', dataIndex: 'deviceModel', width: 100, align: 'center' },
-        { title: '生产厂家', dataIndex: 'manufacturer', 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: 'action', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }
       ],
 	  // 加载数据方法 必须为 Promise 对象

+ 3 - 4
src/views/equipmentManage/network/equipmentModal.vue

@@ -50,9 +50,8 @@
         :data-source="equipmentData"
         :pagination="false">
         <!-- 设备状态 -->
-        <template slot="onlineFlag" slot-scope="text, record">
-			<span :style="{'color':(record.onlineFlag==0 ? 'red' : record.onlineFlag==1 ? 'green' : '')}">{{ record.onlineFlag == 0 ? '离线' : record.onlineFlag == 1 ? '在线' : '--' }}</span>
-          <!-- <span :class="record.onlineFlag==0 ? 'red' : record.onlineFlag==1 ? 'green' : ''">{{ record.onlineFlag == 0 ? '离线' : record.onlineFlag == 1 ? '在线' : '--' }}</span> -->
+        <template slot="onlineFlag" slot-scope="record">
+			<span :style="{'color':(record.onlineFlag==0 ? 'red' : record.onlineFlag==1 ? 'green' : '')}">{{ record.onlineFlag == 0 ? '离线' : record.onlineFlag == 1 ? '在线' :'--'  }}</span>
         </template>
         <!-- 箱体类型 -->
         <template slot="type" slot-scope="record">
@@ -74,7 +73,7 @@
             checkedChildren="启用"
             unCheckedChildren="禁用"
             id="equipment-changeFlagHandle"
-			v-if="record.state"
+			v-if="record.state && record.deviceType!='STEELYARD'"
             v-model="record.state == 1 ? true : false"
             @change="changeFlagHandle(record)"
           />

+ 5 - 5
src/views/releaseRecord/releaseRecordList.vue

@@ -34,7 +34,7 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="8" :lg="4">
             <a-form-item label="设备类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <v-select code="RUBBISH_TYPE" v-model="queryParam.rubbishType" allowClear placeholder="请选择设备类型" id="releaseRecordList-rubbishType"></v-select>
+              <v-select code="DEVICE_TYPE_CODE" v-model="queryParam.deviceType" allowClear placeholder="请选择设备类型" id="releaseRecordList-deviceType"></v-select>
             </a-form-item>
           </a-col>
         </a-row>
@@ -157,7 +157,7 @@ export default {
         customerMobile: '', //  用户手机
         srcDeviceCode: '', //  设备编号
         stationNo: undefined, // 网点名称
-        rubbishType: '', // 投放类型
+        deviceType: '', // 投放类型
         deliveryWay: '', // 投放方式
         goldNumStart: null, // 兑换最小值
         goldNumEnd: null, // 兑换最大值
@@ -173,7 +173,7 @@ export default {
         { title: '投放时间', dataIndex: 'deliveryTime', width: 200, align: 'center' },
         { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
-        { title: '设备类型', dataIndex: '', width: 200, align: 'center' },
+        { title: '设备类型', dataIndex: 'deviceType', width: 200, align: 'center' },
         { title: '用户账号', dataIndex: 'customerMobile', width: 200, align: 'center' },
         { title: '投放方式', dataIndex: 'deliveryWayDictValue', width: 200, align: 'center' },
         { title: '本次兑换乐豆(个)', dataIndex: 'goldNum', width: 100, align: 'center' },
@@ -217,8 +217,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.queryOrderDate = [
-        moment(getDate.getRecentday().starttime, this.dateFormat),
-        moment(getDate.getRecentday().endtime, this.dateFormat)
+        moment(getDate.getRecentday().starttime, vm.dateFormat),
+        moment(getDate.getRecentday().endtime, vm.dateFormat)
       ],
       // 查询参数
       vm.queryParam = {

+ 5 - 3
src/views/userInfo/allLdDetail.vue

@@ -122,9 +122,11 @@ export default {
               const _item = res.data.list[i]
               _item.no = no + i + 1
             }
-            return res.data
             // 总条数
             this.total = res.data.count
+            return res.data
+          } else {
+            this.total = 0
           }
         })
       }
@@ -188,8 +190,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.time = [
-        moment(getDate.getRecentday().starttime, this.dateFormat),
-        moment(getDate.getRecentday().endtime, this.dateFormat)
+        moment(getDate.getRecentday().starttime, vm.dateFormat),
+        moment(getDate.getRecentday().endtime, vm.dateFormat)
       ]
       vm.queryParam = {
         beginDate: null, // 开始时间