Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -93,7 +93,7 @@
                 <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="请输入详细地址地址(街道、楼牌号等)"
+                    placeholder="暂无数据"
                     maxlength="40"
                     clearable
                     style="width: 263%"
@@ -101,20 +101,7 @@
                   />
                 </el-form-item>
               </el-col>
-<!--              <el-col :span="8">-->
-<!--                <el-form-item >-->
-<!--                  <el-input-->
-<!--                    v-model.trim="form.address"-->
-<!--                    placeholder="暂无数据"-->
-<!--                    maxlength="40"-->
-<!--                    clearable-->
-<!--                    disabled-->
-<!--                    style="width: 263%"-->
-<!--                  >-->
-<!--                    <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>-->
-<!--                  </el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
+
               <el-col :span="8">
                 <el-form-item label="单位时段服务数">
                   <el-input-number
@@ -278,6 +265,14 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区">
+<!--                  <el-input-->
+<!--                    disabled-->
+<!--                    type="textarea"-->
+<!--                    placeholder="暂无数据"-->
+<!--                    maxlength="200"-->
+<!--                    style="width:705%;"-->
+<!--                    :rows="4"-->
+<!--                  />-->
                   <el-select v-model="form.serviceArea" multiple placeholder="请选择支持服务地区" disabled style="width: 300px">
                     <el-option
                       v-for="dict in dict.type.service_area"
@@ -628,7 +623,7 @@ import { getDevice, updateDevice } from '@/api/business/device'
 import { CodeToText, regionData } from 'element-china-area-data'
 import { getInfo } from '@/api/login'
 import { listCheckManage } from '@/api/business/manage'
-import { isEmpty, parseTime } from '@/utils/ruoyi'
+import { isEmpty, parseTime, selectDictLabels } from '@/utils/ruoyi'
 import { deepClone } from '@/utils'
 export default {
   name: 'EquipmentDetail',
@@ -645,7 +640,7 @@ export default {
   },
   data() {
     return {
-
+      // 日期格式
       replace(time) {
         return parseTime(time, '{y}/{m}/{d}')
       },
@@ -689,6 +684,8 @@ export default {
         deviceName: '',
         // appointmentMethod: '',
         serviceArea: '',
+        serviceAreaList: [],
+        checkTypeList: [],
         head: '',
         phone: '',
         deviceType: '',
@@ -914,7 +911,7 @@ export default {
     },
     validaddress(rule, value, callback) {
       console.log('validaddress', this.form.selectedOptions)
-      if (this.form.selectedOptions.length>0) {
+      if (this.form.selectedOptions.length > 0) {
         callback()
       } else {
         callback(new Error('请选择服务地点'))
@@ -1070,7 +1067,18 @@ export default {
         //
         // }
         // if (this.form.serviceArea != null && this.form.serviceArea !== '') {
+        console.log('this.form.serviceArea', this.form.serviceArea)
+        this.form.serviceAreaList = selectDictLabels(this.dict.type.service_area, this.form.serviceArea)
+        console.log(' this.form.serviceAreaList', this.form.serviceAreaList)
         this.form.serviceArea = response.data.serviceArea.split(',')
+
+        // this.getDicts('service_area').then(response => {
+        //   this.form.serviceAreaList = response.data
+        //   this.form.checkTypeList = this.form.serviceArea.map(dictValue => this.form.serviceAreaList)
+        // console.log('  this.form.serviceAreaList.', this.form.serviceAreaList)
+        // console.log("this.form.idlist.", this.form.checkTypeList)
+
+        // })
         // }
         if (this.form.checkType != null && this.form.checkType !== '') {
           this.form.checkType = response.data.checkType.split(',')
@@ -1080,9 +1088,9 @@ export default {
           this.form.useTime = JSON.parse(response.data.useTime)
         }
         // this.checkType = response.data.checkType.split(',')
-        console.log(':fsdfsddddddddd???????', response.data.addressCode)
-        console.log('详细个bbbbb', this.selectedOptions)
-        console.log('详细个ccccccccccc', this.form.selectedOptions)
+        // console.log(':fsdfsddddddddd???????', response.data.addressCode)
+        // console.log('详细个bbbbb', this.selectedOptions)
+        // console.log('详细个ccccccccccc', this.form.selectedOptions)
         console.log('详情数据---', this.form)
         // this.serviceAreaS = this.form.serviceArea.split(';')
         // this.serviceArea = []

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -282,13 +282,13 @@ export default {
         {
           id: 1,
           collation: 'desc',
-          sortedColumn: '按创建时间倒序',
+          sortedColumn: '按创建日期倒序',
           nameColumn: 'e.create_time'
         },
         {
           id: 2,
           collation: 'asc',
-          sortedColumn: '按创建时间正序',
+          sortedColumn: '按创建日期正序',
           nameColumn: 'e.create_time'
         },
         {