日志

src/views/platformSection/notice/notice.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input

src/views/regionSection/log/admin.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input

src/views/regionSection/log/appLaunch.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
@@ -99,7 +99,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/regionSection/log/applicationDownload.vue

@@ -10,15 +10,15 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
           v-model="searchForm.name"
-          placeholder="请输入登录名、事件"
+          placeholder="请输入登录名、姓名、设备号、应用名称"
           search
           @on-search="searchList()"
-          style="width: 180px"
+          style="width: 300px"
         />
       </div>
     </div>
@@ -91,7 +91,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/regionSection/log/deviceEvents.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Select
@@ -128,7 +128,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -237,7 +237,7 @@ export default {
                     班级: item.classname,
                     登录名: item.loginname,
                     姓名: item.username,
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     事件: this.doEventInfo[item.doEvent],
                     描述: item.comm,
                     // 0不违规1违规

src/views/regionSection/log/deviceExport.vue

@@ -126,7 +126,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -175,7 +175,6 @@ export default {
     headerTree() {
       //打开树形区域列表
       this.isshowtree = true;
-      console.log(this.isshowtree);
     },
     async getSelectedNodes(data) {
       this.searchForm.title = data[0].title;
@@ -275,7 +274,7 @@ export default {
                     班级: item.classname,
                     登录名: item.loginname,
                     姓名: item.username,
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     设备型号: item.deviceModel,
                     Rom版本: item.romVersion,
                     违规: item.violated === 1 ? "是" : "否",

src/views/regionSection/log/deviceInstallation.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
@@ -102,7 +102,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -214,7 +214,7 @@ export default {
                     班级: item.classname,
                     登录名: item.loginname,
                     姓名: item.username,
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     应用名称: item.appName,
                     应用包名: item.appPackage || "",
                     版本名称: item.appVersion || "",

src/views/regionSection/log/deviceLocation.vue

@@ -10,12 +10,12 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
           v-model="searchForm.name"
-          placeholder="请输入登录名、事件"
+          placeholder="请输入登录名、设备号"
           search
           @on-search="searchList()"
           style="width: 180px"
@@ -80,7 +80,7 @@ export default {
           }
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -196,7 +196,7 @@ export default {
               {
                 list: data.obj.map((item) => {
                   return {
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     登录名: item.loginname,
                     姓名: item.username,
                     学校名称: item.schoolName,

src/views/regionSection/log/devicePush.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
@@ -92,7 +92,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/regionSection/log/violatingDevice.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Select
@@ -159,7 +159,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -283,7 +283,7 @@ export default {
                     班级: item.classname,
                     登录名: item.loginname,
                     姓名: item.username,
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     事件: this.doEventInfo[item.doEvent],
                     通知: item.noticed === 1 ? "是" : "否",
                     锁定: item.locked === 1 ? "是" : "否",

src/views/regionSection/notice/index.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input

src/views/schoolSection/log/admin.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input

src/views/schoolSection/log/appLaunch.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
@@ -98,7 +98,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/applicationDownload.vue

@@ -10,15 +10,15 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
           v-model="searchForm.name"
-          placeholder="请输入登录名、事件"
+          placeholder="请输入登录名、姓名、设备号、应用名称"
           search
           @on-search="searchList()"
-          style="width: 180px"
+          style="width: 300px"
         />
       </div>
     </div>
@@ -90,7 +90,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceEvents.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Select
@@ -73,7 +73,7 @@
 <script>
 import { dateFormat, doEventInfo } from "@/utils";
 import { exportToExcel } from "@/utils/exportToExcel";
-import { logdoperate_list_event } from "@/api/log";
+import { logdoperate_list_event, logdoperate_list_event_all } from "@/api/log";
 export default {
   data() {
     return {
@@ -122,7 +122,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -211,7 +211,7 @@ export default {
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       let _regionids = this.$store.state.userPower.regionids;
       _regionids = [..._regionids];
-      logdoperate_list_event({
+      logdoperate_list_event_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: _regionids.pop(),
@@ -225,13 +225,13 @@ export default {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
                     学校名称: item.schoolName,
                     班级: item.classname,
                     登录名: item.loginname,
                     姓名: item.username,
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     事件: this.doEventInfo[item.doEvent],
                     描述: item.comm,
                     // 0不违规1违规

src/views/schoolSection/log/deviceExport.vue

@@ -2,13 +2,6 @@
   <div class="main_root">
     <div class="search_header">
       <div class="search_left">
-        <!-- <Input
-          v-model="searchForm.name"
-          placeholder="请输入名称"
-          search
-          @on-search="searchList()"
-          style="width: 150px"
-        /> -->
       </div>
       <Button type="primary" class="primary_btn" @click="toExport()"
         >导出</Button
@@ -43,12 +36,11 @@
 
 <script>
 import { exportToExcel } from "@/utils/exportToExcel";
-import { logDeviceBind_list_school } from "@/api/log";
+import { logDeviceBind_list_school, logDeviceBind_list_user } from "@/api/log";
 export default {
   data() {
     return {
       searchForm: {
-        name: "",
         page: 1,
         size: 10,
         list: [],
@@ -76,7 +68,8 @@ export default {
         {
           title: "班级",
           key: "classname",
-          align: "center"
+          align: "center",
+          width: 110
         },
         {
           title: "登录名",
@@ -89,8 +82,8 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
-          key: "deviceMac",
+          title: "设备号",
+          key: "sn",
           align: "center"
         },
         {
@@ -98,27 +91,22 @@ export default {
           key: "deviceModel",
           align: "center"
         },
-        {
-          title: "SN",
-          key: "sn",
-          align: "center"
-        },
         {
           title: "Rom版本",
           key: "romVersion",
           align: "center"
         },
         {
-          title: "是否违规",
-          slot: "violatedSlot",
-          width: 100,
-          align: "center"
+          title: "违规",
+          slot: "violated",
+          align: "center",
+          width: 70
         },
         {
           title: "更新时间",
           key: "createtime",
-          width: 190,
-          align: "center"
+          align: "center",
+          width: 180
         }
       ]
     };
@@ -158,8 +146,7 @@ export default {
         regionid: _regionids.pop(),
         schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
-        size: this.searchForm.size,
-        name: this.searchForm.name
+        size: this.searchForm.size
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
@@ -170,37 +157,23 @@ export default {
       });
     },
     toExport() {
-      let _regionids = this.$store.state.userPower.regionids;
-      _regionids = [..._regionids];
-      logDeviceBind_list_school({
-        rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        regionid: _regionids.pop(),
-        schoolid: this.powerParams.objectid,
-        page: this.searchForm.page,
-        size: this.searchForm.size,
-        name: this.searchForm.name
+      logDeviceBind_list_user({
+        schoolid: this.powerParams.objectid
       }).then((data) => {
         if (data.code === 0) {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
                     学校名称: item.schoolName,
                     班级: item.classname,
                     登录名: item.loginname,
                     姓名: item.username,
-                    设备号码: item.deviceMac,
+                    设备号: item.sn,
                     设备型号: item.deviceModel,
-                    SN: item.sn,
                     Rom版本: item.romVersion,
-                    是否违规:
-                      item.violated === 1
-                        ? "是"
-                        : item.violated === 2
-                        ? "否"
-                        : "",
+                    违规: item.violated === 1 ? "是" : "否",
                     更新时间: item.createtime
                   };
                 }),

src/views/schoolSection/log/deviceInstallation.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
@@ -97,7 +97,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -113,7 +113,7 @@ export default {
         },
         {
           title: "版本名称",
-          key: "versionName",
+          key: "appVersion",
           align: "center"
         },
         {
@@ -197,16 +197,16 @@ export default {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
                     学校名称: item.schoolName,
                     班级: item.classname,
                     登录名: item.loginname,
                     姓名: item.username,
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     应用名称: item.appName,
                     应用包名: item.appPackage,
-                    版本名称: item.versionName,
+                    版本名称: item.appVersion || "",
                     上报时间: item.createtime
                   };
                 }),

src/views/schoolSection/log/deviceLocation.vue

@@ -10,12 +10,12 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
           v-model="searchForm.name"
-          placeholder="请输入登录名、事件"
+          placeholder="请输入登录名、设备号"
           search
           @on-search="searchList()"
           style="width: 180px"
@@ -47,7 +47,7 @@
 <script>
 import { dateFormat } from "@/utils";
 import { exportToExcel } from "@/utils/exportToExcel";
-import { logDeviceLogin_list } from "@/api/log";
+import {logDeviceLogin_list, logDeviceLogin_list_all} from "@/api/log";
 export default {
   data() {
     return {
@@ -74,7 +74,7 @@ export default {
           }
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -171,7 +171,7 @@ export default {
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       let _regionids = this.$store.state.userPower.regionids;
       _regionids = [..._regionids];
-      logDeviceLogin_list({
+      logDeviceLogin_list_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: _regionids.pop(),
@@ -184,9 +184,9 @@ export default {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     登录名: item.loginname,
                     姓名: item.username,
                     学校名称: item.schoolName,

src/views/schoolSection/log/devicePush.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
@@ -91,7 +91,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/violatingDevice.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Select
@@ -101,7 +101,10 @@
 <script>
 import { dateFormat, doEventInfo } from "@/utils";
 import { exportToExcel } from "@/utils/exportToExcel";
-import { logdoperate_list_violate } from "@/api/log";
+import {
+  logdoperate_list_violate,
+  logdoperate_list_violate_all
+} from "@/api/log";
 export default {
   data() {
     return {
@@ -150,7 +153,7 @@ export default {
           align: "center"
         },
         {
-          title: "设备号码",
+          title: "设备号",
           key: "sn",
           align: "center"
         },
@@ -258,7 +261,7 @@ export default {
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       let _regionids = this.$store.state.userPower.regionids;
       _regionids = [..._regionids];
-      logdoperate_list_violate({
+      logdoperate_list_violate_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: _regionids.pop(),
@@ -274,13 +277,13 @@ export default {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
                     学校名称: item.schoolName,
                     班级: item.classname,
                     登录名: item.loginname,
                     姓名: item.username,
-                    设备号码: item.sn,
+                    设备号: item.sn,
                     事件: this.doEventInfo[item.doEvent],
                     通知: item.noticed === 1 ? "是" : "否",
                     锁定: item.locked === 1 ? "是" : "否",

src/views/schoolSection/notice/notice.vue

@@ -10,7 +10,7 @@
           format="yyyy-MM-dd"
           type="daterange"
           placement="bottom-start"
-          placeholder="请选择日期范围"
+          placeholder="请选择日期段"
           style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input