设备地区修改

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

@@ -19,7 +19,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备ID">
-                  {{ form.deviceCode }}
+                  <el-input v-model.trim="form.deviceCode" class="inputWidth" disabled placeholder="-" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -50,17 +50,17 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="负责人">
-                  <el-input v-model="form.head" placeholder="暂无数据" disabled class="inputWidth" />
+                  <el-input v-model="form.head" placeholder="-" disabled class="inputWidth" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="手机号">
-                  <el-input v-model="form.phone" placeholder="暂无数据" disabled class="inputWidth" />
+                  <el-input v-model="form.phone" placeholder="-" disabled class="inputWidth" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备类型">
-                  <el-select v-model="form.deviceType" disabled class="inputWidth" placeholder="暂无数据">
+                  <el-select v-model="form.deviceType" disabled class="inputWidth" placeholder="-">
                     <el-option
                       v-for="(item,index) in dict.type.device_type"
                       :key="index"
@@ -83,7 +83,7 @@
                     disabled
                     size="large"
                     :options="areaOptions"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     expand-trigger="hover"
                     clearable
                     class="inputWidth"
@@ -93,7 +93,7 @@
                 <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     maxlength="40"
                     clearable
                     class="address"
@@ -109,7 +109,7 @@
                     :min="0"
                     :max="20"
                     disabled
-                    placeholder="暂无数据"
+                    placeholder="-"
                     controls-position="right"
                     class="inputNumber_Width"
                   />
@@ -138,7 +138,7 @@
                     is-range
                     disabled
                     class="inputWidth"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -156,7 +156,7 @@
                     is-range
                     disabled
                     class="inputWidth"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -179,7 +179,7 @@
                     is-range
                     disabled
                     class="inputWidth"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -191,13 +191,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="下午开始时间">
+                <el-form-item label="下午结束时间">
                   <el-time-select
                     v-model="form.useTime.pme"
                     is-range
                     disabled
                     class="inputWidth"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     format="HH:mm"
                     value-format="HH:mm"
                     :picker-options="{
@@ -213,7 +213,7 @@
             <!--            6-->
             <el-row>
               <el-col :span="8">
-                <el-form-item label="权重" prop="sort">
+                <el-form-item label="权重" >
                   <el-input-number
                     v-model.trim="form.sort"
                     disabled
@@ -226,7 +226,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="创建日期">
-                  <span>{{ replace(form.createTime) || '-' }}</span>
+                  <el-input v-model.trim="form.createTime"  class="inputWidth"  disabled  placeholder="-"/>
                 </el-form-item>
 
               </el-col>
@@ -252,7 +252,7 @@
                       v-model.trim="form.remark"
                       disabled
                       type="textarea"
-                      placeholder="暂无数据"
+                      placeholder="-"
                       maxlength="200"
                       class="remark_with"
                       :rows="4"
@@ -285,7 +285,7 @@
                     class="remark_with"
                     pacehpl
                     :row="4"
-                    placeholder="暂无数据"
+                    placeholder="-"
                     disabled
                   />
                 </el-form-item>
@@ -330,8 +330,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="设备ID" prop="deviceID">
-                  {{ form.deviceCode }}
+                <el-form-item label="设备ID">
+                  <el-input v-model.trim="form.deviceCode" class="inputWidth" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -535,7 +535,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="创建日期">
-                  <span>{{ replace(form.createTime) || '-' }}</span>
+                    <el-input v-model.trim="form.createTime"  class="inputWidth"  disabled  placeholder="-"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -1043,7 +1043,7 @@ export default {
             if (foundLabel) {
               labelList.push(currentLabel.join(''))
             } else {
-              labelList.push('暂无数据')
+              labelList.push('-')
             }
           }
           this.form.serviceAreaText = labelList

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

@@ -239,7 +239,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total>20"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -532,9 +532,14 @@ export default {
     /** 查询设备列表 */
     getList() {
       this.loading = true
-      if (this.daterangeCreateTime !== '') {
+      console.log('this.daterangeCreateTime', this.daterangeCreateTime)
+      if (this.daterangeCreateTime !== '' && this.daterangeCreateTime !== null) {
+        console.log('通过')
         this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
         this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'
+      } else {
+        this.queryParams.beginCheckTime = ''
+        this.queryParams.endCheckTime = ''
       }
       // this.queryParams.isPrivate = this.isPrivate
       listDevice(this.queryParams).then(response => {