zhangdan 4 سال پیش
والد
کامیت
cf98783adf

+ 72 - 0
src/api/cleanManage.js

@@ -68,3 +68,75 @@ export const getCleanDetails = (params) => {
     method: 'post'
   })
 }
+
+// 待清运列表
+export const netWorkCleanRecordList = (params) => {
+  const url = `clean/waitToClean/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 司机管理
+// 重置密码
+export const resetPSD = params => {
+  return axios({
+    url: `/zxyj/driver/resetPwd`,
+    data: params,
+    method: 'POST'
+  })
+}
+
+// 获取列表数据
+export const getDriverList = params => {
+  const url = `/driver/queryLike/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST'
+  })
+}
+
+// // 改变权限状态接口
+// export const updateEnableStatus = params => {
+//   return axios({
+//     url: `/driver/enable/${params.id}/${params.flag}`,
+//     data: {},
+//     method: 'get'
+//   })
+// }
+
+// 删除用户接口
+export const delectDriver = params => {
+  return axios({
+    url: `/driver/delete/${params.id}`,
+    data: {},
+    method: 'get'
+  })
+}
+
+// 新增/编辑保存接口
+export const saveDriver = params => {
+  return axios({
+    url: '/driver/save',
+    data: params,
+    method: 'POST'
+  })
+}
+
+// 编辑查详情
+export const driverDetails = (params) => {
+  const url = `driver/findById/${params.id}`
+  return axios({
+    url: url,
+    data: params,
+    method: 'get'
+  })
+}
+

+ 0 - 1
src/api/electronicScale.js

@@ -35,7 +35,6 @@ export const saveDevice = params => {
 export const deviceDetails = params => {
   return axios({
     url: `device/findBySrcDeviceNo/${params.srcDeviceCode}`,
-    data: {},
     method: 'get'
   })
 }

+ 2 - 2
src/api/userInfo.js

@@ -83,7 +83,7 @@ export const updateRole = (params) => {
 
 // 乐豆明细--所有用户
 export const offPartnerGoldLog = (params) => {
-  const url = `offPartnerGoldLog/query/${params.pageNo}/${params.pageSize}`
+  const url = `customerGoldLog/query/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -95,7 +95,7 @@ export const offPartnerGoldLog = (params) => {
 
 //  乐豆明细--总计(所有用户)
 export const getStatistic = (params) => {
-  const url = `offPartnerGoldLog/getGoldChangeNumTotal`
+  const url = `customerGoldLog/getGoldChangeNumTotal`
   return axios.request({
     url: url,
     data: params,

+ 4 - 2
src/config/router.config.js

@@ -286,7 +286,8 @@ export const asyncRouterMap = [{
 	  component: PageView,
 	  meta: {
 	    title: '清运管理',
-	    icon: 'car'
+	    icon: 'car',
+      permission: 'M_driverManage'
 	  },
 	  children: [{
 	    path: '/cleanManage/statisticalReport',
@@ -305,7 +306,8 @@ export const asyncRouterMap = [{
 	      '@/views/cleanManage/driverManage.vue'),
 	    meta: {
 	      title: '司机管理',
-	      icon: 'contacts'
+	      icon: 'contacts',
+        permission: 'M_driverManage_list'
 	    }
 	  },
 	  {

+ 3 - 5
src/views/cleanManage/addDiverModal.vue

@@ -35,9 +35,7 @@ import {
   STable,
   VSelect
 } from '@/components'
-import {
-  slelerDetails, saveUserPower
-} from '@/api/userManage.js'
+import {saveDriver,driverDetails} from '@/api/cleanManage.js'
 export default {
   name: 'AddDiverModal',
   components: {
@@ -92,7 +90,7 @@ export default {
     },
     // 编辑查详情
     getPageInfo () {
-      slelerDetails({
+      driverDetails({
         id: this.itemId
       }).then(res => {
         if (res.status == 200) {
@@ -122,7 +120,7 @@ export default {
           console.log(valid, '--------------提交', this.formData)
           const params = JSON.parse(JSON.stringify(this.formData))
 				 console.log(params)
-          saveUserPower(params).then(res => {
+          saveDriver(params).then(res => {
             console.log(res, 'rrrrrrrrr')
             if (res.status == 200) {
               _this.$message.success(res.message)

+ 3 - 3
src/views/cleanManage/driverManage.vue

@@ -56,7 +56,7 @@
 <script>
 import { STable, VSelect } from '@/components'
 import addDiverModal from './addDiverModal.vue'
-import { resetPSD, getPowerUserList, delectUserPower } from '@/api/userManage.js'
+import { resetPSD, getDriverList, delectDriver } from '@/api/cleanManage.js'
 export default {
   name: 'DriverManage',
   components: { STable, VSelect, addDiverModal },
@@ -117,7 +117,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return getPowerUserList(Object.assign(parameter, this.queryParam)).then(res => {
+        return getDriverList(Object.assign(parameter, this.queryParam)).then(res => {
           const no = (res.data.pageNo - 1) * res.data.pageSize
           for (let i = 0; i < res.data.list.length; i++) {
             const _item = res.data.list[i]
@@ -175,7 +175,7 @@ export default {
         okText: '确定',
         cancelText: '取消',
         onOk () {
-          delectUserPower({
+          delectDriver({
             id: row.id
           }).then(res => {
             if (res.status == 200) {

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

@@ -37,14 +37,14 @@
           </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">
-              <a-input allowClear placeholder="请输入设备编号" v-model.trim="queryParam.phone" id="netWorkCleanRecord-stationNo"/>
+              <a-input allowClear placeholder="请输入设备编号" v-model.trim="queryParam.srcDeviceCode" id="netWorkCleanRecord-stationNo"/>
             </a-form-model-item>
           </a-col>
-          <a-col :xs="24" :sm="12" :md="6" :lg="5">
+          <!-- <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="netWorkCleanRecord-stationNo" ></v-select>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :xs="24" :sm="12" :md="6" :lg="4">
             <a-button type="primary" @click="$refs.table.refresh(true)" 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>
@@ -52,22 +52,22 @@
         </a-row>
         <a-row :gutter="24">
           <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="rubbishTotal-provinceCode" allowClear v-model="queryParam.provinceCode" @change="getCityList" placeholder="请选择省">
+            <a-form-model-item prop="provinceName" label="所属区域:" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
+              <a-select id="rubbishTotal-provinceName" allowClear v-model="queryParam.provinceName" @change="getCityList" placeholder="请选择省">
                 <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
-            <a-form-model-item prop="cityCode" label=" " :colon="false" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
-              <a-select allowClear id="rubbishTotal-cityCode" v-model="queryParam.cityCode" @change="getAreaList" placeholder="请选择市">
+            <a-form-model-item prop="cityName" label=" " :colon="false" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
+              <a-select allowClear id="rubbishTotal-cityName" v-model="queryParam.cityName" @change="getAreaList" placeholder="请选择市">
                 <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
-            <a-form-model-item prop="districtCode" label=" " :colon="false" :label-col="{ span:8}" :wrapper-col="{ span:16}">
-              <a-select allowClear id="rubbishTotal-districtCode" v-model="queryParam.districtCode" placeholder="请选择区/县">
+            <a-form-model-item prop="districtName" label=" " :colon="false" :label-col="{ span:8}" :wrapper-col="{ span:16}">
+              <a-select allowClear id="rubbishTotal-districtName" v-model="queryParam.districtName" 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>
@@ -109,7 +109,7 @@
 <script>
 import { STable, VSelect } from '@/components'
 import { stationList } from '@/api/releaseRecord.js'
-import { cleanDetailsList } from '@/api/cleanManage.js'
+import { netWorkCleanRecordList } from '@/api/cleanManage.js'
 import { getProvince, getCityByPro, getDistrictByCity } from '@/api/station'
 import cleanModal from './cleanModal.vue'
 import moment from 'moment'
@@ -133,13 +133,13 @@ export default {
       itemId: '', // 行id
       // 查询参数
       queryParam: {
-        stationNo: undefined, // 设备编号
-        phone: '', // 手机号码
-        loginFlag: '', // 状态
+        srcDeviceCode: undefined, // 设备编号
+        stationName: '', // 网点名称
+        // login: '', // 状态
         beginDate: null, // 开始时间
         endDate: null, // 结束时间
-        provinceCode: undefined, //  省
-        cityCode: undefined, // 市
+        provinceName: undefined, //  省
+        districtName: undefined, // 市
         districtCode: undefined // 区
       },
       // 网点名称数据
@@ -168,7 +168,7 @@ export default {
         { title: '操作', dataIndex: 'action', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        const searchData = Object.assign(parameter, this.queryParam)
+        const searchData = Object.assign(parameter, this.queryParam, { orderType: 'max' })
         if (this.time && this.time.length) {
           searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD')
           searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD')
@@ -176,22 +176,22 @@ export default {
           searchData.beginDate = null
           searchData.endDate = null
         }
-        // return cleanDetailsList(searchData).then(res => {
-        //   if (res.status == 200) {
-        //     const no = (res.data.pageNo - 1) * res.data.pageSize
-        //     for (let i = 0; i < res.data.list.length; i++) {
-        //       const _item = res.data.list[i]
-        //       _item.no = no + i + 1
-        //       if (_item.cleanWeight != null || 0) {
-        //         _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(2)
-        //       }
-        //     }
-        //     this.totalNum = res.data.count
-        //     return res.data
-        //   } else {
-        //     this.totalNum = 0
-        //   }
-        // })
+        return netWorkCleanRecordList(searchData).then(res => {
+          if (res.status == 200) {
+            const no = (res.data.pageNo - 1) * res.data.pageSize
+            for (let i = 0; i < res.data.list.length; i++) {
+              const _item = res.data.list[i]
+              _item.no = no + i + 1
+              if (_item.cleanWeight != null || 0) {
+                _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(2)
+              }
+            }
+            this.totalNum = res.data.count
+            return res.data
+          } else {
+            this.totalNum = 0
+          }
+        })
       }
     }
   },

+ 46 - 66
src/views/equipmentManage/electronicScale/addElectronicScale.vue

@@ -1,10 +1,10 @@
 <template>
-  <a-modal :footer="null" centered :title="modalTit" v-model="isShow" @cancle="isShow=false">
+  <a-modal :footer="null" centered :title="titleText" v-model="isShow" @cancle="isShow=false">
     <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
           placeholder="请输入设备MAC地址"
-          :disabled="this.deviceCode ? true : false"
+          :disabled="id?true:false"
           v-model="formData.macAddress"
           allowClea
           oninput="value=value.toLowerCase()"
@@ -46,40 +46,33 @@ export default {
     deviceCode: {
       type: [Number, String],
       default: ''
+    },
+    id: {
+      type: [Number, String],
+      default: ''
     }
   },
   data () {
     return {
       formData: { macAddress: '', deviceCode: '', deviceName: '', deviceModel: '', manufacturer: '' },
       isShow: this.visible, // 弹框状态
+      titleText: '新增',
       rules: {
         macAddress: [{ required: true, message: '请输入设备MAC地址(数字与英文字母组合)', trigger: 'blur', pattern: /^[A-Za-z0-9]+$/ }]
       }
     }
   },
   methods: {
-	  cancel (e) {
-	    this.clear()
-	    this.$emit('close')
-	  },
-	  clear () {
-	    this.$refs.ruleForm.resetFields()
-	    delete this.formData.id
-	    this.formData.macAddress = ''
-	    this.formData.deviceCode = ''
-	    this.formData.deviceName = ''
-      this.formData.deviceModel = ''
-      this.formData.manufacturer = ''
-	  },
 	  // 数据详情
 	  getPageInfo () {
+		 const _this = this
 	    deviceDetails({
-	      deviceCode: this.deviceCode
+	      srcDeviceCode: _this.deviceCode
 	    }).then(res => {
 	      if (res.status == 200) {
-	        console.log(res, '-------------返回数据')
-	  	  this.formData = Object.assign({}, this.formData, res.data)
-	  	  this.formData.loginFlag = Number(this.formData.loginFlag)
+	      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({
@@ -95,38 +88,13 @@ export default {
 	    })
 	  },
     handleSubmit () {
-      // this.$refs.ruleForm.validate(valid => {
-      //   console.log(valid, this.form, ' formData.type222222222')
-      //   if (valid) {
-      //     const params = JSON.parse(JSON.stringify(this.form))
-      //     // 编辑
-      //     // if (this.id) {
-      //     //   params.deviceTypeBoxList.map(item => {
-      //     //     delete item.id
-      //     //   })
-      //     // }
-      //     console.log(params)
-      //     // saveBoxSetting(params).then(res => {
-      //     //   console.log(res, 'res--save')
-      //     //   if (res.status == '200') {
-      //     //     this.$message.success(res.message)
-      //     //     this.$emit('refresh')
-      //     //     setTimeout(function () {
-      //     //       _this.cancel()
-      //     //     }, 300)
-      //     //   } else {
-      //     //     // this.$message.error(res.message)
-      //     //   }
-      //     // })
-      //   }
-      // })
-	  this.$refs.ruleForm.validate(valid => {
-	  		  const _this = this
-	  		  console.log(valid, '--------------提交')
-	    if (valid) {
+      this.$refs.ruleForm.validate(valid => {
+        const _this = this
+        console.log(valid, '--------------提交')
+        if (valid) {
 	      console.log(valid, '--------------提交', this.formData)
 	      const params = JSON.parse(JSON.stringify(this.formData))
-	  				 console.log(params)
+	  	console.log(params)
 	      saveDevice(params).then(res => {
 	        console.log(res, 'rrrrrrrrr')
 	        if (res.status == 200) {
@@ -139,12 +107,19 @@ export default {
 	      })
 	    }
 	  })
-    }
-  },
-  computed: {
-    // 弹窗标题
-    modalTit () {
-      return this.id ? '编辑设备信息' : '新增设备信息'
+    },
+    cancel (e) {
+	  this.clear()
+	  this.$emit('close')
+    },
+    clear () {
+	  this.$refs.ruleForm.resetFields()
+	  delete this.formData.id
+	  this.formData.macAddress = ''
+	  this.formData.deviceCode = ''
+	  this.formData.deviceName = ''
+      this.formData.deviceModel = ''
+      this.formData.manufacturer = ''
     }
   },
   // 监听弹窗
@@ -154,19 +129,24 @@ export default {
       this.isShow = newValue
     },
     isShow (newValue, oldValue) {
-      if (!newValue) {
-        this.$emit('close')
-      } else {
-        this.$nextTick(() => {
-          this.$refs.ruleForm.resetFields()
-        })
-      }
-    },
-    deviceCode () {
-      if (newValue && this.isshow) {
-		  this.getPageInfo(newValue)
+      if (newValue) {
+		  if (this.id) { // 编辑
+		    this.titleText = '编辑'
+          console.log(this.deviceCode, '---------shebei 编号')
+		    this.getPageInfo()
+		  } else {
+		    this.titleText = '新增'
+		  }
       } else {
+		  this.cancel()
       }
+      // if (!newValue) {
+      //   this.$emit('close')
+      // } else {
+      //   this.$nextTick(() => {
+      //     this.$refs.ruleForm.resetFields()
+      //   })
+      // }
     }
   }
 }

+ 25 - 17
src/views/equipmentManage/electronicScale/electronicScale.vue

@@ -6,7 +6,7 @@
         <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}">
-              <a-input v-model="searchForm.macAddress" placeholder="请输入设备MAC码" oninput="value=value.toUpperCase()" :maxLength="30"/>
+              <a-input v-model="searchForm.macAddress" placeholder="请输入设备MAC码" :maxLength="12" allowClear/>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="8" :lg="6">
@@ -22,7 +22,7 @@
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">总计<span> {{ }} </span>条,乐豆变动量总计<span> {{ }} </span>个</div>
+      <div class="ftext" slot="message">总计<span> {{ totalNum }} 个</span></div>
     </a-alert>
     <!-- 列表 -->
     <s-table ref="table" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
@@ -32,7 +32,7 @@
       </span>
     </s-table>
     <!-- 新增/编辑弹窗 -->
-    <addElectronicScale :visible="isOpenModal" :deviceCode="itemDeviceCode" @refresh="refreshTable" @close="isOpenModal=false"></addElectronicScale>
+    <addElectronicScale :visible="isOpenModal" :id="itemId" :deviceCode="itemDeviceCode" @refresh="refreshTable" @close="isOpenModal=false"></addElectronicScale>
   </a-card>
 </template>
 
@@ -45,10 +45,12 @@ export default {
   data () {
     return {
       searchForm: {
-        MAC: ''
+        macAddress: ''
       },
-	  isOpenModal: false, // 默认弹窗关闭
-	  itemDeviceCode: '', // 编辑行设备编号
+      isOpenModal: false, // 默认弹窗关闭
+      itemDeviceCode: '', // 编辑行设备编号
+      itemId: '',
+	  totalNum: '',
       // 列表表头
       columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 100, align: 'center' },
@@ -61,15 +63,18 @@ export default {
       ],
 	  // 加载数据方法 必须为 Promise 对象
 	  loadData: parameter => {
-	    return getDeviceList(Object.assign(parameter, this.queryParam)).then(res => {
+	    return getDeviceList(Object.assign(parameter, this.searchForm, { deviceType: 'STEELYARD' })).then(res => {
 	      if (res.status == 200) {
 	        const no = (res.data.pageNo - 1) * res.data.pageSize
 	        for (let i = 0; i < res.data.list.length; i++) {
 	          const _item = res.data.list[i]
 	          _item.no = no + i + 1
 	        }
+            this.totalNum = res.data.count
 	        return res.data
-	      }
+	      } else {
+            this.totalNum = 0
+		  }
 	    })
 	  }
     }
@@ -80,21 +85,24 @@ export default {
       this.searchForm = {
         macAddress: ''
       }
+	  this.$refs.table.refresh(true)
     },
     // 新增
     openModal () {
+      this.itemId = ''
+      this.itemDeviceCode = ''
       this.isOpenModal = true
-      console.log('新增')
     },
     // 编辑
     handleEdit (record) {
-      this.itemDeviceCode = record.deviceCode
+      this.itemId = record.id
+      this.itemDeviceCode = record.srcDeviceCode
       this.isOpenModal = true
-      console.log('编辑')
     },
     // 删除
     delect (record) {
-      this.$confirm({
+      const _this = this
+      _this.$confirm({
         title: '警告',
         centered: true,
         content: '删除后无法恢复,确认删除?',
@@ -102,12 +110,12 @@ export default {
         cancelText: '取消',
         onOk () {
           delectDevice({
-			  id: row.id
+            id: record.id
           }).then(res => {
-			  if (res.status == 200) {
-			    this.$message.success(res.message)
-			    this.$refs.table.refresh()
-			  }
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
           })
         }
       })

+ 1 - 1
src/views/equipmentManage/equipment/equipment.vue

@@ -136,7 +136,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return deviceList(Object.assign(parameter, this.queryParam)).then(res => {
+        return deviceList(Object.assign(parameter, this.queryParam,{ deviceType:"BOX"})).then(res => {
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize
             this.orderTotal = res.data.count

+ 20 - 11
src/views/equipmentManage/network/equipmentModal.vue

@@ -51,7 +51,8 @@
         :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 :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>
         <!-- 箱体类型 -->
         <template slot="type" slot-scope="record">
@@ -67,21 +68,17 @@
             </a-select-option>
           </a-select>
         </template>
-        <!-- 设备类型 -->
-        <template slot="deviceType" slot-scope="text, record">
-          {{ text == 'BOX' ? '回收箱体' : '电子秤' }}
-        </template>
         <!-- 工作状态 -->
         <template slot="workStatus" slot-scope="record">
           <a-switch
             checkedChildren="启用"
             unCheckedChildren="禁用"
             id="equipment-changeFlagHandle"
-            v-if="record.state"
+			v-if="record.state"
             v-model="record.state == 1 ? true : false"
             @change="changeFlagHandle(record)"
           />
-          <span v-else>--</span>
+		  <span v-else>--</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="record">
@@ -129,7 +126,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center' },
         { title: '设备状态', scopedSlots: { customRender: 'onlineFlag' }, width: 150, align: 'center' },
-        { title: '设备类型', dataIndex: 'deviceType', scopedSlots: { customRender: 'deviceType' }, width: 150, align: 'center' },
+		{ title: '设备类型', dataIndex:'deviceType', width: 150, align: 'center' },
         { title: '箱体类型', scopedSlots: { customRender: 'type' }, width: 150, align: 'center' },
         { title: '工作状态', scopedSlots: { customRender: 'workStatus' }, width: 150, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center' }
@@ -144,11 +141,12 @@ export default {
     getDevice () {
       deviceListQuery({ stationNo: this.networkNo }).then(res => {
         if (res.status == 200) {
+          res.data.map((item, index) => {
+            item.no = index + 1
+          })
           this.equipmentData = res.data
           this.equipmentData.map((item, index) => {
-            item.no = index + 1
-            //  处理每个设备所对应的箱体类型
-            item.deviceTypeList = this.typeList.filter(tk => !item.boxNum || tk.boxNum == item.boxNum)
+            item.deviceTypeList = this.setDeviceType(item.boxNum)
           })
         } else {
           this.equipmentData = []
@@ -167,6 +165,17 @@ export default {
         this.getDevice()
       })
     },
+    //  处理每个设备所对应的箱体类型
+    setDeviceType (boxNum) {
+      const arr = []
+      let j = 0
+      for (const i in this.typeList) {
+        if (this.typeList[i].boxNum == boxNum) {
+          arr[j++] = this.typeList[i]
+        }
+      }
+      return arr
+    },
     //  搜索设备
     onSearch (value) {
       if (value) {