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

src/assets/less/common.less

@@ -447,3 +447,14 @@ fieldset[disabled] .ivu-input,
     font-size: 16px;
   }
 }
+// 查看通知内容
+.notice_content {
+  font-size: 16px;
+  word-break: break-all;
+  img {
+    max-width: 100%;
+    &.cke_reset.cke_widget_drag_handler {
+      display: none;
+    }
+  }
+}

src/views/platformSection/deviceImport/detail.vue

@@ -26,7 +26,7 @@
         </Select>
         <Input
           v-model="searchForm.sn"
-          placeholder="请输入序列号模糊搜索"
+          placeholder="请输入设备号模糊搜索"
           search
           @on-search="searchList()"
           style="width: 200px"
@@ -102,8 +102,8 @@
             >
           </Select>
         </FormItem>
-        <FormItem label="SN序列号" prop="sn">
-          <Input v-model="addInfo.sn" placeholder="请输入SN序列号"></Input>
+        <FormItem label="设备号" prop="sn">
+          <Input v-model="addInfo.sn" placeholder="请输入设备号"></Input>
         </FormItem>
         <FormItem v-if="addInfo.daid" label="所属状态" prop="snState">
           <RadioGroup v-model="addInfo.snState">
@@ -146,7 +146,7 @@ export default {
         sn: [
           {
             required: true,
-            message: "请输入SN序列号",
+            message: "请输入设备号",
             trigger: "change"
           }
         ],
@@ -204,7 +204,7 @@ export default {
           align: "center"
         },
         {
-          title: "SN",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/platformSection/notice/notice.vue

@@ -118,8 +118,15 @@
         <div>{{ viewInfo.createname }}</div>
         <div>{{ viewInfo.updatetime }}</div>
       </div>
-      <div class="notice_content" v-html="viewInfo.noticeContent"></div>
-      <div v-if="viewInfo.noticeType === 2" class="notice_regions">
+      <div
+        class="notice_content"
+        v-if="viewInfo.show"
+        v-html="viewInfo.noticeContent"
+      ></div>
+      <div
+        v-if="viewInfo.show && viewInfo.noticeType === 2"
+        class="notice_regions"
+      >
         <div v-for="regionItem in viewInfo.regions" :key="regionItem.regionid">
           {{ regionItem.regionName }}
         </div>
@@ -487,9 +494,6 @@ export default {
     margin: 0 10px;
   }
 }
-.notice_content {
-  font-size: 16px;
-}
 .notice_regions {
   display: flex;
   justify-content: flex-start;

src/views/schoolSection/applicationManage/applicationList.vue

@@ -972,7 +972,7 @@ export default {
         objectid: this.powerParams.objectid,
         appid: row.appid
       }).then((res) => {
-        this.showLoading = true;
+        this.showLoading = false;
         if (res.code === 0) {
           this.viewInfo = {
             show: true,
@@ -1033,7 +1033,7 @@ export default {
         appid: row.appid,
         rversion: row.rversion
       }).then((data) => {
-        this.showLoading = true;
+        this.showLoading = false;
         this.searchList();
         if (data.code === 0) {
           this.$Message.success(data.msg);

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -225,7 +225,7 @@ export default {
           align: "center"
         },
         {
-          title: "SN",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -404,7 +404,7 @@
         <div class="detail_left">
           <table class="my_table">
             <tr>
-              <th style="width: 110px">SN/IMEI</th>
+              <th style="width: 110px">设备号</th>
               <td>{{ deviceDetailInfo.detail.sn }}</td>
             </tr>
             <tr>
@@ -666,7 +666,7 @@ export default {
           align: "center"
         },
         {
-          title: "SN",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -1067,7 +1067,7 @@ export default {
                         ? "离线"
                         : "",
                     设备型号: item.deviceModel,
-                    SN: item.sn,
+                    设备号: item.sn,
                     Rom版本: item.romVersion,
                     更新时间: item.updatetime
                   };

src/views/schoolSection/deviceManage/inLineDevice.vue

@@ -114,7 +114,7 @@ export default {
           align: "center"
         },
         {
-          title: "SN",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/outControlDevice.vue

@@ -116,7 +116,7 @@ export default {
           align: "center"
         },
         {
-          title: "SN",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -91,7 +91,7 @@ export default {
           align: "center"
         },
         {
-          title: "SN",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceLocation.vue

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

src/views/schoolSection/notice/notice.vue

@@ -56,7 +56,11 @@
         <div>{{ viewInfo.createname }}</div>
         <div>{{ viewInfo.updatetime }}</div>
       </div>
-      <div class="notice_content" v-html="viewInfo.noticeContent"></div>
+      <div
+        v-if="viewInfo.show"
+        class="notice_content"
+        v-html="viewInfo.noticeContent"
+      ></div>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
@@ -231,9 +235,6 @@ export default {
     margin: 0 10px;
   }
 }
-.notice_content {
-  font-size: 16px;
-}
 .notice_regions {
   display: flex;
   justify-content: flex-start;