Browse Source

公告查看;设备号统一名称

gzb
wangzhonglu 9 months ago
parent
commit
b7531a0160

+ 11
- 0
src/assets/less/common.less View File

447
     font-size: 16px;
447
     font-size: 16px;
448
   }
448
   }
449
 }
449
 }
450
+// 查看通知内容
451
+.notice_content {
452
+  font-size: 16px;
453
+  word-break: break-all;
454
+  img {
455
+    max-width: 100%;
456
+    &.cke_reset.cke_widget_drag_handler {
457
+      display: none;
458
+    }
459
+  }
460
+}

+ 5
- 5
src/views/platformSection/deviceImport/detail.vue View File

26
         </Select>
26
         </Select>
27
         <Input
27
         <Input
28
           v-model="searchForm.sn"
28
           v-model="searchForm.sn"
29
-          placeholder="请输入序列号模糊搜索"
29
+          placeholder="请输入设备号模糊搜索"
30
           search
30
           search
31
           @on-search="searchList()"
31
           @on-search="searchList()"
32
           style="width: 200px"
32
           style="width: 200px"
102
             >
102
             >
103
           </Select>
103
           </Select>
104
         </FormItem>
104
         </FormItem>
105
-        <FormItem label="SN序列号" prop="sn">
106
-          <Input v-model="addInfo.sn" placeholder="请输入SN序列号"></Input>
105
+        <FormItem label="设备号" prop="sn">
106
+          <Input v-model="addInfo.sn" placeholder="请输入设备号"></Input>
107
         </FormItem>
107
         </FormItem>
108
         <FormItem v-if="addInfo.daid" label="所属状态" prop="snState">
108
         <FormItem v-if="addInfo.daid" label="所属状态" prop="snState">
109
           <RadioGroup v-model="addInfo.snState">
109
           <RadioGroup v-model="addInfo.snState">
146
         sn: [
146
         sn: [
147
           {
147
           {
148
             required: true,
148
             required: true,
149
-            message: "请输入SN序列号",
149
+            message: "请输入设备号",
150
             trigger: "change"
150
             trigger: "change"
151
           }
151
           }
152
         ],
152
         ],
204
           align: "center"
204
           align: "center"
205
         },
205
         },
206
         {
206
         {
207
-          title: "SN",
207
+          title: "设备号",
208
           key: "sn",
208
           key: "sn",
209
           align: "center"
209
           align: "center"
210
         },
210
         },

+ 9
- 5
src/views/platformSection/notice/notice.vue View File

118
         <div>{{ viewInfo.createname }}</div>
118
         <div>{{ viewInfo.createname }}</div>
119
         <div>{{ viewInfo.updatetime }}</div>
119
         <div>{{ viewInfo.updatetime }}</div>
120
       </div>
120
       </div>
121
-      <div class="notice_content" v-html="viewInfo.noticeContent"></div>
122
-      <div v-if="viewInfo.noticeType === 2" class="notice_regions">
121
+      <div
122
+        class="notice_content"
123
+        v-if="viewInfo.show"
124
+        v-html="viewInfo.noticeContent"
125
+      ></div>
126
+      <div
127
+        v-if="viewInfo.show && viewInfo.noticeType === 2"
128
+        class="notice_regions"
129
+      >
123
         <div v-for="regionItem in viewInfo.regions" :key="regionItem.regionid">
130
         <div v-for="regionItem in viewInfo.regions" :key="regionItem.regionid">
124
           {{ regionItem.regionName }}
131
           {{ regionItem.regionName }}
125
         </div>
132
         </div>
487
     margin: 0 10px;
494
     margin: 0 10px;
488
   }
495
   }
489
 }
496
 }
490
-.notice_content {
491
-  font-size: 16px;
492
-}
493
 .notice_regions {
497
 .notice_regions {
494
   display: flex;
498
   display: flex;
495
   justify-content: flex-start;
499
   justify-content: flex-start;

+ 2
- 2
src/views/schoolSection/applicationManage/applicationList.vue View File

972
         objectid: this.powerParams.objectid,
972
         objectid: this.powerParams.objectid,
973
         appid: row.appid
973
         appid: row.appid
974
       }).then((res) => {
974
       }).then((res) => {
975
-        this.showLoading = true;
975
+        this.showLoading = false;
976
         if (res.code === 0) {
976
         if (res.code === 0) {
977
           this.viewInfo = {
977
           this.viewInfo = {
978
             show: true,
978
             show: true,
1033
         appid: row.appid,
1033
         appid: row.appid,
1034
         rversion: row.rversion
1034
         rversion: row.rversion
1035
       }).then((data) => {
1035
       }).then((data) => {
1036
-        this.showLoading = true;
1036
+        this.showLoading = false;
1037
         this.searchList();
1037
         this.searchList();
1038
         if (data.code === 0) {
1038
         if (data.code === 0) {
1039
           this.$Message.success(data.msg);
1039
           this.$Message.success(data.msg);

+ 1
- 1
src/views/schoolSection/deviceManage/breakRuleDevice.vue View File

225
           align: "center"
225
           align: "center"
226
         },
226
         },
227
         {
227
         {
228
-          title: "SN",
228
+          title: "设备号",
229
           key: "sn",
229
           key: "sn",
230
           align: "center"
230
           align: "center"
231
         },
231
         },

+ 3
- 3
src/views/schoolSection/deviceManage/deviceManage.vue View File

404
         <div class="detail_left">
404
         <div class="detail_left">
405
           <table class="my_table">
405
           <table class="my_table">
406
             <tr>
406
             <tr>
407
-              <th style="width: 110px">SN/IMEI</th>
407
+              <th style="width: 110px">设备号</th>
408
               <td>{{ deviceDetailInfo.detail.sn }}</td>
408
               <td>{{ deviceDetailInfo.detail.sn }}</td>
409
             </tr>
409
             </tr>
410
             <tr>
410
             <tr>
666
           align: "center"
666
           align: "center"
667
         },
667
         },
668
         {
668
         {
669
-          title: "SN",
669
+          title: "设备号",
670
           key: "sn",
670
           key: "sn",
671
           align: "center"
671
           align: "center"
672
         },
672
         },
1067
                         ? "离线"
1067
                         ? "离线"
1068
                         : "",
1068
                         : "",
1069
                     设备型号: item.deviceModel,
1069
                     设备型号: item.deviceModel,
1070
-                    SN: item.sn,
1070
+                    设备号: item.sn,
1071
                     Rom版本: item.romVersion,
1071
                     Rom版本: item.romVersion,
1072
                     更新时间: item.updatetime
1072
                     更新时间: item.updatetime
1073
                   };
1073
                   };

+ 1
- 1
src/views/schoolSection/deviceManage/inLineDevice.vue View File

114
           align: "center"
114
           align: "center"
115
         },
115
         },
116
         {
116
         {
117
-          title: "SN",
117
+          title: "设备号",
118
           key: "sn",
118
           key: "sn",
119
           align: "center"
119
           align: "center"
120
         },
120
         },

+ 1
- 1
src/views/schoolSection/deviceManage/outControlDevice.vue View File

116
           align: "center"
116
           align: "center"
117
         },
117
         },
118
         {
118
         {
119
-          title: "SN",
119
+          title: "设备号",
120
           key: "sn",
120
           key: "sn",
121
           align: "center"
121
           align: "center"
122
         },
122
         },

+ 1
- 1
src/views/schoolSection/deviceManage/removeControlDevice.vue View File

91
           align: "center"
91
           align: "center"
92
         },
92
         },
93
         {
93
         {
94
-          title: "SN",
94
+          title: "设备号",
95
           key: "sn",
95
           key: "sn",
96
           align: "center"
96
           align: "center"
97
         },
97
         },

+ 1
- 1
src/views/schoolSection/log/deviceLocation.vue View File

47
 <script>
47
 <script>
48
 import { dateFormat } from "@/utils";
48
 import { dateFormat } from "@/utils";
49
 import { exportToExcel } from "@/utils/exportToExcel";
49
 import { exportToExcel } from "@/utils/exportToExcel";
50
-import {logDeviceLogin_list, logDeviceLogin_list_all} from "@/api/log";
50
+import { logDeviceLogin_list, logDeviceLogin_list_all } from "@/api/log";
51
 export default {
51
 export default {
52
   data() {
52
   data() {
53
     return {
53
     return {

+ 5
- 4
src/views/schoolSection/notice/notice.vue View File

56
         <div>{{ viewInfo.createname }}</div>
56
         <div>{{ viewInfo.createname }}</div>
57
         <div>{{ viewInfo.updatetime }}</div>
57
         <div>{{ viewInfo.updatetime }}</div>
58
       </div>
58
       </div>
59
-      <div class="notice_content" v-html="viewInfo.noticeContent"></div>
59
+      <div
60
+        v-if="viewInfo.show"
61
+        class="notice_content"
62
+        v-html="viewInfo.noticeContent"
63
+      ></div>
60
       <div slot="footer" style="text-align: center">
64
       <div slot="footer" style="text-align: center">
61
         <Button @click="viewInfo.show = false">关闭</Button>
65
         <Button @click="viewInfo.show = false">关闭</Button>
62
       </div>
66
       </div>
231
     margin: 0 10px;
235
     margin: 0 10px;
232
   }
236
   }
233
 }
237
 }
234
-.notice_content {
235
-  font-size: 16px;
236
-}
237
 .notice_regions {
238
 .notice_regions {
238
   display: flex;
239
   display: flex;
239
   justify-content: flex-start;
240
   justify-content: flex-start;

Loading…
Cancel
Save