Merge remote-tracking branch 'origin/gzb' into wzl

src/views/dope/dope.vue

@@ -63,7 +63,7 @@
           时间：{{ viewInfo.createtime }}
         </div>
         <div class="comm">{{ viewInfo.comm }}</div>
-        <div class="comm">设备号：{{ viewInfo.sn }}</div>
+        <div class="comm sn">设备号：{{ viewInfo.sn }}</div>
       </div>
       <div slot="footer" style="text-align: center">
         <div>
@@ -107,27 +107,29 @@ export default {
   },
   methods: {
     headleView(item) {
-      logdoperatemsg_edit_read({ ldomid: item.ldomid }).then((res) => {
-        if (res.code === 0) {
-          this.searchForm.list.forEach((v) => {
-            if (item.ldomid === v.ldomid) {
-              //改状态为已读
-              v.hasread = 1;
-            }
-          });
-          this.viewInfo = {
-            show: true,
-            classname: item.classname,
-            username: item.username,
-            schoolName: item.schoolName,
-            createtime: item.createtime,
-            comm: item.comm,
-            sn: item.sn
-          };
-        } else {
-          this.$Message.error(res.msg);
-        }
-      });
+      this.viewInfo = {
+        show: true,
+        classname: item.classname,
+        username: item.username,
+        schoolName: item.schoolName,
+        createtime: item.createtime,
+        comm: item.comm,
+        sn: item.sn
+      };
+      if (item.hasread != 1) {
+        logdoperatemsg_edit_read({ ldomid: item.ldomid }).then((res) => {
+          if (res.code === 0) {
+            this.searchForm.list.forEach((v) => {
+              if (item.ldomid === v.ldomid) {
+                //改状态为已读
+                v.hasread = 1;
+              }
+            });
+          } else {
+            this.$Message.error(res.msg);
+          }
+        });
+      }
     },
     showReadChange() {
       this.searchForm.showRead = this.searchForm.showRead ? 1 : 0;
@@ -253,6 +255,9 @@ export default {
     font-weight: 400;
     line-height: 30px;
   }
+  .sn {
+    user-select: text;
+  }
 }
 .nodeta {
   min-height: 300px;

src/views/regionSection/regionManage/adminManage.vue

@@ -169,16 +169,13 @@
           </RadioGroup>
         </FormItem>
         <FormItem label="地址" style="width: 100%">
-          <Input
-              v-model="adminInfo.address"
-              placeholder="请输入地址"
-          ></Input>
+          <Input v-model="adminInfo.address" placeholder="请输入地址"></Input>
         </FormItem>
         <FormItem label="描述信息" style="width: 100%">
           <Input
-              type="textarea"
-              v-model="adminInfo.comm"
-              placeholder="请输入描述信息"
+            type="textarea"
+            v-model="adminInfo.comm"
+            placeholder="请输入描述信息"
           ></Input>
         </FormItem>
         <FormItem label="账号类型" style="width: 100%">
@@ -187,7 +184,7 @@
             <Radio :label="2">学校管理员</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem v-if="adminInfo.userType === 1" label="所属区域" prop="regionid" style="width: 100%">
+        <FormItem label="所属区域" prop="regionid" style="width: 100%">
           <Select
             :transfer="true"
             v-model="adminInfo.regionid"
@@ -201,17 +198,22 @@
             >
           </Select>
         </FormItem>
-        <FormItem v-if="adminInfo.userType === 2" label="选择学校" class="require" style="width: 100%">
+        <FormItem
+          v-if="adminInfo.userType === 2"
+          label="选择学校"
+          prop="schoolid"
+          style="width: 100%"
+        >
           <Select
-              :transfer="true"
-              v-model="adminInfo.schoolid"
-              style="width: 180px"
+            :transfer="true"
+            v-model="adminInfo.schoolid"
+            style="width: calc(50% - 65px)"
           >
             <Option
-                v-for="item in searchForm.schoolList"
-                :value="item.schoolid"
-                :key="item.schoolid"
-            >{{ item.schoolName }}</Option
+              v-for="item in searchForm.schoolList"
+              :value="item.schoolid"
+              :key="item.schoolid"
+              >{{ item.schoolName }}</Option
             >
           </Select>
         </FormItem>
@@ -369,6 +371,14 @@ export default {
             message: "请选择区域",
             trigger: "change"
           }
+        ],
+        schoolid: [
+          {
+            required: true,
+            type: "number",
+            message: "请选择学校",
+            trigger: "change"
+          }
         ]
       },
       // 新建/编辑