Merge commit '44211739b99cc4dd4b03f67236fd02021d1ecfcf' into gzb

src/utils/exportToExcel.js

@@ -57,6 +57,42 @@ const openDownloadDialog = (blob, fileName) => {
   }
   aLink.dispatchEvent(event);
 };
+// 列自适应宽度
+const setColFitWidth = (tableData, headerList, sheet) => {
+  function getCellWidth(value) {
+    // 判断是否为null或undefined
+    if (!value) {
+      return 10;
+    } else if (/.*[\u4e00-\u9fa5]+.*$/.test(value)) {
+      // 判断是否包含中文
+      return value.toString().length * 2.1;
+    } else {
+      return value.toString().length * 1.1;
+    }
+  }
+  let colWidths = []; // 所有列的名称数组
+  // 计算每一列的所有单元格宽度
+  // 先遍历行
+  tableData.forEach((row) => {
+    // 遍历列
+    for (const key in row) {
+      let index = headerList.findIndex((v) => v === key);
+      if (!colWidths[index]) {
+        colWidths[index] = [];
+      }
+      colWidths[index].push(getCellWidth(row[key]));
+    }
+  });
+  sheet["!cols"] = [];
+  // 每一列取最大值最为列宽
+  colWidths.forEach((widths, index) => {
+    // 计算列头的宽度
+    widths.push(getCellWidth(headerList[index]));
+    // 设置最大值为列宽
+    sheet["!cols"].push({ wch: Math.max(...widths, 10) });
+  });
+  return sheet;
+};
 /**
  * 导出Excel表格
  * @param sheetListInfo sheet列表信息 [{list:数组数据, name: sheet名称}]
@@ -65,12 +101,14 @@ const openDownloadDialog = (blob, fileName) => {
 export const exportToExcel = (sheetListInfo, excelName) => {
   const wb = XLSX2.utils.book_new();
   sheetListInfo.forEach((sheetItem, sheetIndex) => {
+    let headerList = [];
     sheetItem.list.forEach((item) => {
       for (const key in item) {
+        headerList.push(key);
         item[key] = item[key] || "";
       }
     });
-    const sheet = XLSX2.utils.json_to_sheet(sheetItem.list);
+    let sheet = XLSX2.utils.json_to_sheet(sheetItem.list);
     // 设置每个单元格的样式
     let range = XLSX.utils.decode_range(sheet["!ref"]);
     for (let R = range.s.r; R <= range.e.r; ++R) {
@@ -83,6 +121,7 @@ export const exportToExcel = (sheetListInfo, excelName) => {
         }
       }
     }
+    sheet = setColFitWidth(sheetItem.list, headerList, sheet);
     XLSX2.utils.book_append_sheet(
       wb,
       sheet,

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

@@ -305,7 +305,8 @@ export default {
         regionid: this.searchForm.regionid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        sn: this.searchForm.sn
+        sn: this.searchForm.sn,
+        snState: this.searchForm.snState
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/platformSection/regionManage/adminManage.vue

@@ -346,6 +346,7 @@ export default {
         timer: null,
         second: 60,
         adminid: null,
+        atype: null,
         aname: "",
         loginname: "",
         loginpwd: "",
@@ -412,7 +413,6 @@ export default {
         {
           title: "最后登录IP",
           key: "lastip",
-          width: 150,
           align: "center"
         },
         {
@@ -492,6 +492,7 @@ export default {
         timer: null,
         second: 60,
         adminid: null,
+        atype: null,
         aname: "",
         loginname: "",
         loginpwd: generateRandomString(),
@@ -622,6 +623,7 @@ export default {
         timer: null,
         second: 60,
         adminid: row.adminid,
+        atype: row.atype,
         aname: row.aname,
         loginname: row.loginname,
         loginpwd: row.loginpwd,

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -17,7 +17,7 @@
           placeholder="请输入设备号"
           search
           @on-search="searchList()"
-          style="width: 310px"
+          style="width: 200px"
         />
       </div>
       <div class="search_right">

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -37,7 +37,7 @@
           </Select>
           <Input
             v-model="searchForm.name"
-            placeholder="请输入名姓名、登录名、设备名、设备型号"
+            placeholder="请输入登录账号、姓名、设备型号、设备号"
             search
             @on-search="searchList()"
             style="width: 310px"
@@ -885,17 +885,17 @@ export default {
               value: params.value,
               unit: "B"
             };
-            if (memoryInfo.value / 1024 < 1024) {
+            if (memoryInfo.value / 1000 < 1000) {
               memoryInfo.value =
-                Math.floor((memoryInfo.value / 1024) * 100) / 100;
+                Math.floor((memoryInfo.value / 1000) * 100) / 100;
               memoryInfo.unit = "KB";
-            } else if (memoryInfo.value / 1024 / 1024 < 1024) {
+            } else if (memoryInfo.value / 1000 / 1000 < 1000) {
               memoryInfo.value =
-                Math.floor((memoryInfo.value / 1024 / 1024) * 100) / 100;
+                Math.floor((memoryInfo.value / 1000 / 1000) * 100) / 100;
               memoryInfo.unit = "MB";
             } else {
               memoryInfo.value =
-                Math.floor((memoryInfo.value / 1024 / 1024 / 1024) * 100) / 100;
+                Math.floor((memoryInfo.value / 1000 / 1000 / 1000) * 100) / 100;
               memoryInfo.unit = "GB";
             }
             return `${params.name}：${memoryInfo.value}${memoryInfo.unit}`;
@@ -927,17 +927,17 @@ export default {
                   value: params.value,
                   unit: "B"
                 };
-                if (memoryInfo.value / 1024 < 1024) {
+                if (memoryInfo.value / 1000 < 1000) {
                   memoryInfo.value =
-                    Math.floor((memoryInfo.value / 1024) * 100) / 100;
+                    Math.floor((memoryInfo.value / 1000) * 100) / 100;
                   memoryInfo.unit = "KB";
-                } else if (memoryInfo.value / 1024 / 1024 < 1024) {
+                } else if (memoryInfo.value / 1000 / 1000 < 1000) {
                   memoryInfo.value =
-                    Math.floor((memoryInfo.value / 1024 / 1024) * 100) / 100;
+                    Math.floor((memoryInfo.value / 1000 / 1000) * 100) / 100;
                   memoryInfo.unit = "MB";
                 } else {
                   memoryInfo.value =
-                    Math.floor((memoryInfo.value / 1024 / 1024 / 1024) * 100) /
+                    Math.floor((memoryInfo.value / 1000 / 1000 / 1000) * 100) /
                     100;
                   memoryInfo.unit = "GB";
                 }

src/views/schoolSection/deviceManage/inLineDevice.vue

@@ -25,7 +25,7 @@
         </Select>
         <Input
           v-model="searchForm.name"
-          placeholder="请输入姓名、登录账号、设备号、设备型号"
+          placeholder="请输入登录账号、姓名、设备型号、设备号"
           search
           @on-search="searchList()"
           style="width: 310px"

src/views/schoolSection/deviceManage/outControlDevice.vue

@@ -35,7 +35,7 @@
         </Select>
         <Input
           v-model="searchForm.name"
-          placeholder="请输入姓名、登录账号、设备号、设备型号"
+          placeholder="请输入登录账号、姓名、设备型号、设备号"
           search
           @on-search="searchList()"
           style="width: 310px"

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -4,7 +4,7 @@
       <div class="search_left">
         <Input
           v-model="searchForm.name"
-          placeholder="请输入姓名、登录账号、设备号、设备型号"
+          placeholder="请输入登录账号、姓名、设备型号、设备号"
           search
           @on-search="searchList()"
           style="width: 310px"

src/views/schoolSection/log/deviceEvents.vue

@@ -42,7 +42,6 @@
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="doEventSlot">
-          <!-- 1发送消息 2解除锁定 3锁定 4更新策略 5重启设备 6恢复出厂 -->
           <div>{{ doEventInfo[row.doEvent] }}</div>
         </template>
         <template slot-scope="{ row }" slot="violatedSlot">
@@ -237,9 +236,9 @@ export default {
                     // 0不违规1违规
                     违规:
                       item.violated === 1
-                        ? "违规"
+                        ? "是"
                         : item.violated === 0
-                        ? "不违规"
+                        ? "否"
                         : "",
                     时间: item.createtime
                   };