Merge commit 'e3cf5dbdac717beb1e6f67111d7309b92103a1c5' into gzb

src/assets/less/common.less

@@ -63,11 +63,9 @@ body,
 .ivu-table {
   color: #798cb5;
   background-color: #ffffff66;
-  .ivu-table-header {
-    background-color: #e9f0ff;
-  }
   .ivu-table-header,
   .ivu-table-fixed-header {
+    background-color: #e9f0ff;
     thead tr {
       background-color: #e9f0ff;
       th {
@@ -78,6 +76,11 @@ body,
       }
     }
   }
+  .ivu-table-fixed-body {
+    .ivu-table-tbody {
+      background-color: #fff;
+    }
+  }
   .ivu-table-fixed .ivu-table-tbody tr,
   .ivu-table-fixed-right .ivu-table-tbody tr,
   .ivu-table-body .ivu-table-tbody tr {

src/views/platformSection/deviceManage/deviceManageExport/deviceManageExport.vue

@@ -115,7 +115,7 @@ export default {
           },
           {
             title: "姓名",
-            minWidth: 100,
+            minWidth: 80,
             key: "username",
             align: "center"
           },
@@ -136,6 +136,7 @@ export default {
       columns: [
         {
           title: "序号",
+          fixed: "left",
           align: "center",
           width: 70,
           render: (h, params) => {
@@ -161,13 +162,13 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },
@@ -197,6 +198,7 @@ export default {
         },
         {
           title: "操作",
+          fixed: "right",
           slot: "actionSlot",
           width: 90,
           align: "center"

src/views/platformSection/deviceManage/deviceManageImport/detail.vue

@@ -46,6 +46,7 @@
         :columns="columns"
         :data="searchForm.list"
         @on-selection-change="tableSelectionChange"
+        @on-row-click="tableRowClick"
       >
         <template slot-scope="{ row }" slot="snStateSlot">
           <div class="action_list">
@@ -54,7 +55,7 @@
           </div>
         </template>
         <template slot-scope="{ row }" slot="actionSlot">
-          <div class="action_list">
+          <div class="action_list" @click.stop>
             <div @click="toEdit(row)">编辑</div>
             <div class="action_del" @click="toDel(row)">删除</div>
           </div>
@@ -190,11 +191,13 @@ export default {
       columns: [
         {
           type: "selection",
+          fixed: "left",
           width: 60,
           align: "center"
         },
         {
           title: "序号",
+          fixed: "left",
           align: "center",
           width: 70,
           render: (h, params) => {
@@ -208,13 +211,15 @@ export default {
         },
         {
           title: "所属区域",
+          fixed: "left",
           minWidth: 150,
           key: "regionName",
           align: "center"
         },
         {
           title: "设备号",
-          width: 170,
+          fixed: "left",
+          minWidth: 170,
           key: "sn",
           align: "center"
         },
@@ -250,6 +255,7 @@ export default {
         },
         {
           title: "操作",
+          fixed: "right",
           slot: "actionSlot",
           width: 130,
           align: "center"
@@ -300,6 +306,26 @@ export default {
         };
       });
     },
+    // 表格行点击
+    tableRowClick(row, index) {
+      let otherSelectedList = this.batchDeleteList.filter((item) => {
+        return item.daid !== row.daid;
+      });
+      if (
+        (this.batchDeleteList.length > 0 &&
+          otherSelectedList.length === this.batchDeleteList.length) ||
+        this.batchDeleteList.length === 0
+      ) {
+        row._checked = true;
+        this.batchDeleteList.push({
+          daid: row.daid
+        });
+      } else {
+        row._checked = false;
+        this.batchDeleteList = otherSelectedList;
+      }
+      this.searchForm.list.splice(index, 1, row);
+    },
     // 获取列表
     getList() {
       this.batchDeleteList = [];

src/views/regionSection/home/index.vue

@@ -117,21 +117,25 @@ export default {
         },
         {
           title: "学校名称",
+          minWidth: 100,
           key: "schoolName",
           align: "center"
         },
         {
           title: "设备数",
+          width: 80,
           key: "devicenum",
           align: "center"
         },
         {
           title: "班级数",
+          width: 80,
           key: "classnum",
           align: "center"
         },
         {
           title: "用户数",
+          width: 80,
           key: "usernum",
           align: "center"
         }

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -44,9 +44,10 @@
         :columns="columns"
         :data="searchForm.list"
         @on-selection-change="selectionChange"
+        @on-row-click="deviceTableRowClick"
       >
         <template slot-scope="{ row }" slot="actionSlot">
-          <div class="action_list">
+          <div class="action_list" @click.stop>
             <div v-if="row.sn && row.num > 0" @click="toDetail(row)">
               违规详情
             </div>
@@ -239,7 +240,7 @@ export default {
         // },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },
@@ -256,7 +257,7 @@ export default {
         },
         {
           title: "累计违规数量",
-          minWidth: 100,
+          width: 120,
           key: "num",
           align: "center"
         },
@@ -444,6 +445,24 @@ export default {
     selectionChange(selection) {
       this.tableSelection = selection;
     },
+    // 表格行点击
+    deviceTableRowClick(row, index) {
+      let otherSelectedList = this.tableSelection.filter((item) => {
+        return item.sn !== row.sn;
+      });
+      if (
+        (this.tableSelection.length > 0 &&
+          otherSelectedList.length === this.tableSelection.length) ||
+        this.tableSelection.length === 0
+      ) {
+        row._checked = true;
+        this.tableSelection.push(row);
+      } else {
+        row._checked = false;
+        this.tableSelection = otherSelectedList;
+      }
+      this.searchForm.list.splice(index, 1, row);
+    },
     // 其他操作
     dropdownSelected(name) {
       if (!this.wsEnterInfo.isEnter) {

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -84,6 +84,7 @@
           :columns="columns"
           :data="searchForm.list"
           @on-selection-change="selectionChange"
+          @on-row-click="deviceTableRowClick"
         >
           <template slot-scope="{ row }" slot="loginnameSlot">
             <!-- lockState锁定状态0未锁定1已锁定 -->
@@ -103,7 +104,7 @@
             </div>
           </template>
           <template slot-scope="{ row }" slot="actionSlot">
-            <div class="action_list">
+            <div class="action_list" @click.stop>
               <div v-if="row.sn" @click="toView(row)">查看</div>
               <div @click="toStrategy(row)">策略</div>
               <div v-if="row.sn" @click="toPsw(row)">设备密码</div>
@@ -653,11 +654,13 @@ export default {
       columns: [
         {
           type: "selection",
+          fixed: "left",
           width: 60,
           align: "center"
         },
         {
           title: "序号",
+          fixed: "left",
           align: "center",
           width: 70,
           render: (h, params) => {
@@ -671,13 +674,14 @@ export default {
         },
         {
           title: "登录账号",
+          fixed: "left",
           minWidth: 100,
           slot: "loginnameSlot",
           align: "center"
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
@@ -695,16 +699,16 @@ export default {
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },
-        {
-          title: "Rom版本",
-          minWidth: 200,
-          key: "romVersion",
-          align: "center"
-        },
+        // {
+        //   title: "Rom版本",
+        //   minWidth: 200,
+        //   key: "romVersion",
+        //   align: "center"
+        // },
         {
           title: "更新时间",
           key: "updatetime",
@@ -713,6 +717,7 @@ export default {
         },
         {
           title: "操作",
+          fixed: "right",
           slot: "actionSlot",
           width: 275,
           align: "center"
@@ -1275,6 +1280,24 @@ export default {
     selectionChange(selection) {
       this.tableSelection = selection;
     },
+    // 表格行点击
+    deviceTableRowClick(row, index) {
+      let otherSelectedList = this.tableSelection.filter((item) => {
+        return item.sn !== row.sn;
+      });
+      if (
+        (this.tableSelection.length > 0 &&
+          otherSelectedList.length === this.tableSelection.length) ||
+        this.tableSelection.length === 0
+      ) {
+        row._checked = true;
+        this.tableSelection.push(row);
+      } else {
+        row._checked = false;
+        this.tableSelection = otherSelectedList;
+      }
+      this.searchForm.list.splice(index, 1, row);
+    },
     // 其他操作
     dropdownSelected(name) {
       if (!this.wsEnterInfo.isEnter) {

src/views/schoolSection/deviceManage/inLineDevice.vue

@@ -97,7 +97,7 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
@@ -121,7 +121,7 @@ export default {
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/outControlDevice.vue

@@ -98,7 +98,7 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
@@ -122,7 +122,7 @@ export default {
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -73,7 +73,7 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
@@ -97,7 +97,7 @@ export default {
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/admin.vue

@@ -77,7 +77,7 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "aname",
           align: "center"
         },

src/views/schoolSection/log/appLaunch.vue

@@ -97,13 +97,13 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/applicationDownload.vue

@@ -89,13 +89,13 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceEvents.vue

@@ -120,13 +120,13 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceExport.vue

@@ -79,13 +79,13 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceInstallation.vue

@@ -93,13 +93,13 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceLocation.vue

@@ -75,7 +75,7 @@ export default {
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },
@@ -87,7 +87,7 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },

src/views/schoolSection/log/devicePush.vue

@@ -103,7 +103,7 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "aname",
           align: "center"
         },
@@ -121,7 +121,7 @@ export default {
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/violatingDevice.vue

@@ -152,13 +152,13 @@ export default {
         },
         {
           title: "姓名",
-          minWidth: 100,
+          minWidth: 80,
           key: "username",
           align: "center"
         },
         {
           title: "设备号",
-          width: 170,
+          minWidth: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/setting/wallpaper.vue

@@ -324,13 +324,13 @@ export default {
         },
         {
           title: "横屏壁纸",
-          minWidth: 150,
+          width: 150,
           slot: "hpathSlot",
           align: "center"
         },
         {
           title: "竖屏壁纸",
-          minWidth: 150,
+          width: 150,
           slot: "vpathSlot",
           align: "center"
         },