Merge commit 'bb50e8eef43f62421726c3dc9177d21f68a7c5c7' into gzb

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -113,8 +113,19 @@
       v-model="logDetailInfo.show"
       title="违规详情"
     >
-      <div class="table_wrap">
-        <Table :columns="detailColumns" :data="logDetailInfo.list">
+      <div class="user_info">
+        <div>
+          当前设备绑定用户：<span>{{ logDetailInfo.user.username }}</span>
+        </div>
+        <div>
+          绑定时间: <span>{{ logDetailInfo.user.createtime }}</span>
+        </div>
+        <div>
+          所属班级：<span>{{ logDetailInfo.user.classname }}</span>
+        </div>
+      </div>
+      <div class="table_wrap_modal">
+        <Table :columns="detailColumns" :data="logDetailInfo.events">
           <template slot-scope="{ row }" slot="doEventSlot">
             <div>{{ doEventInfo[row.doEvent] }}</div>
           </template>
@@ -160,7 +171,8 @@ export default {
       },
       logDetailInfo: {
         show: false,
-        list: []
+        user: {},
+        events: []
       },
       tableSelection: [],
       controlMessageInfo: {
@@ -237,7 +249,7 @@ export default {
         // },
         {
           title: "更新时间",
-          key: "updatetime",
+          key: "createtime",
           width: 190,
           align: "center"
         },
@@ -382,7 +394,8 @@ export default {
         if (data.code === 0) {
           this.logDetailInfo = {
             show: true,
-            list: data.obj
+            user: data.obj.user || {},
+            events: data.obj.events || []
           };
         } else {
           this.$Message.error(data.msg);
@@ -773,4 +786,22 @@ export default {
     }
   }
 }
+.table_wrap_modal {
+  border: 1px solid #e8eaec;
+  border-bottom: none;
+}
+.user_info {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  margin-bottom: 16px;
+  font-size: 16px;
+  color: #7c8db5;
+  > div {
+    margin-right: 20px;
+    span {
+      color: #2e4276;
+    }
+  }
+}
 </style>

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -313,7 +313,12 @@
                 <Checkbox
                   :disabled="true"
                   class="checked"
-                  v-model="row.checked"
+                  :value="
+                    Boolean(
+                      strategyInfo.padViolatesInfo &&
+                        strategyInfo.padViolatesInfo[row.violateType]
+                    )
+                  "
                 ></Checkbox>
                 <span
                   style="display: inline-block; width: 120px; text-align: left"
@@ -321,19 +326,28 @@
                 >
               </template>
               <template slot-scope="{ row }" slot="noticed">
-                <Checkbox :disabled="true" class="checked" v-model="row.noticed"
+                <Checkbox
+                  :disabled="true"
+                  class="checked"
+                  :value="
+                    strategyInfo.padViolatesInfo &&
+                    strategyInfo.padViolatesInfo[row.violateType] &&
+                    strategyInfo.padViolatesInfo[row.violateType].noticed === 1
+                  "
                   >通知管理员</Checkbox
                 >
               </template>
               <template slot-scope="{ row }" slot="violationHandling">
-                <RadioGroup v-model="row.handleMethod">
-                  <Radio
-                    style="margin-right: 20px"
-                    :disabled="true"
-                    label="锁定"
-                  ></Radio>
-                  <Radio :disabled="true" label="恢复出厂设置"></Radio>
-                </RadioGroup>
+                <CheckboxGroup
+                  :value="
+                    strategyInfo.padViolatesInfo &&
+                    strategyInfo.padViolatesInfo[row.violateType] &&
+                    strategyInfo.padViolatesInfo[row.violateType].handleMethod
+                  "
+                >
+                  <Checkbox :disabled="true" label="锁定"></Checkbox>
+                  <Checkbox :disabled="true" label="恢复出厂设置"></Checkbox>
+                </CheckboxGroup>
               </template>
             </Table>
           </div>
@@ -1209,15 +1223,13 @@ export default {
             this.strategyInfo.pdtypeInfo = pdtypeInfo;
           }
           if (this.strategyInfo.hasviolate) {
+            let padViolatesInfo = {};
             this.strategyInfo.padViolates = res.obj.padViolates;
             this.strategyInfo.padViolates.forEach((item) => {
-              let arr = res.obj.padViolates.filter((v) => {
-                return v.violateType === item.violateType;
-              });
-              item.checked = arr.length > 0 ? true : false;
-              item.noticed = arr.length > 0 && arr[0].noticed ? true : false;
-              item.handleMethod = arr.length > 0 ? arr[0].handleMethod : "";
+              item.handleMethod = item.handleMethod.split("；");
+              padViolatesInfo[item.violateType] = item;
             });
+            this.strategyInfo.padViolatesInfo = padViolatesInfo;
           }
           this.strategyInfo.show = true;
         } else {