设备导出

src/views/platformSection/log/deviceExport.vue

@@ -131,57 +131,32 @@ export default {
       });
     },
     toExport(row) {
+      let form = {};
       if (row) {
-        logDeviceBind_list_all({
-          regionid: row.regionid
-        }).then((data) => {
-          if (data.code === 0) {
-            exportToExcel(
-              [
-                {
-                  list: data.obj.map((item) => {
-                    return {
-                      区域名称: item.regionName,
-                      学校数: item.schoolnum,
-                      用户数: item.usernum,
-                      设备数: item.snnum
-                    };
-                  }),
-                  name: row.regionName
-                }
-              ],
-              `设备导出_${row.regionName}`
-            );
-          } else {
-            this.$Message.error(data.msg);
-          }
-        });
-      } else {
-        logDeviceBind_list({
-          name: this.searchForm.name
-        }).then((data) => {
-          if (data.code === 0) {
-            exportToExcel(
-              [
-                {
-                  list: data.obj.data.map((item) => {
-                    return {
-                      区域名称: item.regionName,
-                      学校数: item.schoolnum,
-                      用户数: item.usernum,
-                      设备数: item.snnum
-                    };
-                  }),
-                  name: "设备导出"
-                }
-              ],
-              "设备导出"
-            );
-          } else {
-            this.$Message.error(data.msg);
-          }
-        });
+        form.regionid = row.regionid;
       }
+      logDeviceBind_list_all(form).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.map((item) => {
+                  return {
+                    区域名称: item.regionName,
+                    学校数: item.schoolnum,
+                    用户数: item.usernum,
+                    设备数: item.snnum
+                  };
+                }),
+                name: "设备导出"
+              }
+            ],
+            `设备导出`
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
     }
   }
 };

src/views/schoolSection/log/deviceExport.vue

@@ -2,20 +2,28 @@
   <div class="main_root">
     <div class="search_header">
       <div class="search_left">
-        <Input
+        <!-- <Input
           v-model="searchForm.name"
           placeholder="请输入名称"
           search
           @on-search="searchList()"
           style="width: 150px"
-        />
+        /> -->
       </div>
       <Button type="primary" class="primary_btn" @click="toExport()"
         >导出</Button
       >
     </div>
     <div class="table_wrap">
-      <Table :columns="columns" :data="searchForm.list"></Table>
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="violatedSlot">
+          <div class="action_list">
+            <!-- 0不违规1违规 -->
+            <div v-if="row.violated === 1" class="action_success">是</div>
+            <div v-else-if="row.violated === 0" class="action_error">否</div>
+          </div>
+        </template>
+      </Table>
     </div>
     <div class="page_wrap">
       <Page
@@ -61,8 +69,13 @@ export default {
           }
         },
         {
-          title: "设备号码",
-          key: "sn",
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
           align: "center"
         },
         {
@@ -76,22 +89,33 @@ export default {
           align: "center"
         },
         {
-          title: "学校名称",
-          key: "schoolName",
+          title: "设备号码",
+          key: "deviceMac",
           align: "center"
         },
         {
-          title: "班级",
-          key: "classname",
+          title: "设备型号",
+          key: "deviceModel",
           align: "center"
         },
         {
-          title: "地址",
-          key: "deviceMac",
+          title: "ID(IMEI/MEID/ESN)",
+          key: "sn",
           align: "center"
         },
         {
-          title: "时间",
+          title: "Rom版本",
+          key: "romVersion",
+          align: "center"
+        },
+        {
+          title: "是否违规",
+          slot: "violatedSlot",
+          width: 100,
+          align: "center"
+        },
+        {
+          title: "更新时间",
           key: "createtime",
           width: 190,
           align: "center"
@@ -150,13 +174,21 @@ export default {
               {
                 list: data.obj.data.map((item) => {
                   return {
-                    设备号码: item.sn,
-                    登录名: item.loginname,
-                    姓名: item.username,
                     学校名称: item.schoolName,
                     班级: item.classname,
-                    地址: item.deviceMac,
-                    时间: item.createtime
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.deviceMac,
+                    设备型号: item.deviceModel,
+                    "ID(IMEI/MEID/ESN)": item.sn,
+                    Rom版本: item.romVersion,
+                    是否违规:
+                      item.violated === 1
+                        ? "是"
+                        : item.violated === 2
+                        ? "否"
+                        : "",
+                    更新时间: item.createtime
                   };
                 }),
                 name: "设备导出"

src/views/schoolSection/log/deviceInstallation.vue

@@ -46,6 +46,7 @@
 
 <script>
 import { dateFormat } from "@/utils";
+import { exportToExcel } from "@/utils/exportToExcel";
 import { logAppStart_list_install } from "@/api/log";
 export default {
   data() {
@@ -164,7 +165,45 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      let _begindate = this.searchForm.dataRange[0];
+      _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
+      let _enddate = this.searchForm.dataRange[1];
+      _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      logAppStart_list_install({
+        regionid: 1,
+        schoolid: 1,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.sn,
+                    应用名称: item.appName,
+                    应用包名: item.appPackage,
+                    版本名称: item.versionName,
+                    上报时间: item.createtime
+                  };
+                }),
+                name: "设备已安装应用"
+              }
+            ],
+            "设备已安装应用"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>