Merge remote-tracking branch 'origin/gzb' into wzl

# Conflicts:
#	src/api/setting.js

src/api/region.js

@@ -13,6 +13,11 @@ export const region_list_qy = (data) => setRequest("region/list_qy", data);
  */
 export const region_list_sel_pt = (data) =>
   setRequest("region/list_sel_pt", data);
+/**
+ * 2.1.1.2区域--区域选择列表
+ */
+export const region_list_sel_qy = (data) =>
+    setRequest("region/list_sel_qy", data);
 /**
  * 2.1.1.2区域--区域学校选择列表
  */
@@ -38,3 +43,37 @@ export const region_detail = (data) => setRequest("region/detail", data);
  */
 export const region_list_admin = (data) =>
   setRequest("region/list_admin", data);
+
+/**
+ * 2.2.1搜索--搜索所有用户
+ */
+export const search_list_user = (data) => setRequest("search/list_user", data);
+/**
+ * 2.2.2搜索--搜索设备用户
+ */
+export const search_list_duser = (data) =>
+  setRequest("search/list_duser", data);
+/**
+ * 2.2.3搜索--搜索设备
+ */
+export const search_list_device = (data) =>
+  setRequest("search/list_device", data);
+/**
+ * 2.2.4搜索--搜索所有应用
+ */
+export const search_list_app = (data) => setRequest("search/list_app", data);
+/**
+ * 2.2.5搜索--搜索所有白名单
+ */
+export const search_list_white = (data) =>
+  setRequest("search/list_white", data);
+/**
+ * 2.2.6搜索--搜索设备型号
+ */
+export const search_list_dmodel = (data) =>
+  setRequest("search/list_dmodel", data);
+/**
+ * 2.2.7搜索--搜索客户端版本
+ */
+export const search_list_client = (data) =>
+  setRequest("search/list_client", data);

src/api/setting.js

@@ -56,3 +56,15 @@ export const deviceSet_edit = (data) => setRequest("deviceSet/edit", data);
  * 8.3.2.3 设备设置管理-重置
  */
 export const deviceSet_delete = (data) => setRequest("deviceSet/delete", data);
+/**
+ * 8.4.1 开机设置-详情
+ */
+export const autoapp_detail = (data) => setRequest("autoapp/detail", data);
+/**
+ * 8.4.2 开机设置-保存
+ */
+export const autoapp_edit = (data) => setRequest("autoapp/edit", data);
+/**
+ * 8.4.3 开机设置-重置
+ */
+export const autoapp_delete = (data) => setRequest("autoapp/delete", data);

src/views/login/login.vue

@@ -137,7 +137,7 @@ export default {
         ],
         phone: [{ required: true, validator: phoneCheck, trigger: "blur" }],
         msgcode: [
-          { required: true, message: "短信验证码不能为空", trigger: "blur" }
+          { required: true, message: "验证码不能为空", trigger: "blur" }
         ]
       },
       isaccount: false,

src/views/regionSection/applicationManage/applicationManage.vue

@@ -144,7 +144,7 @@
           </Select>
         </FormItem>
         <FormItem label="状态" style="width: 300px">
-          <RadioGroup v-model="wallpaperInfo.appState">
+          <RadioGroup v-model="wallpaperInfo.enable">
             <Radio :label="1">启用</Radio>
             <Radio :label="2">禁用</Radio>
           </RadioGroup>
@@ -525,7 +525,7 @@ export default {
         appid: null,
         appName: "",
         appgroupid: "",
-        appState: 1,
+        enable: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -980,7 +980,7 @@ export default {
         appid: null,
         appName: "",
         appgroupid: "",
-        appState: 1,
+        enable: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -1052,7 +1052,7 @@ export default {
           let appImg = this.wallpaperInfo.appImg.join(";");
           let form = {
             appName: this.wallpaperInfo.appName,
-            appState: this.wallpaperInfo.appState,
+            enable: this.wallpaperInfo.enable,
             appType: this.wallpaperInfo.appType,
             forced: this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
@@ -1138,7 +1138,7 @@ export default {
             appid: res.obj.appid,
             appName: res.obj.appName,
             appgroupid: res.obj.appgroupid,
-            appState: res.obj.enable,
+            enable: res.obj.enable,
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,

src/views/regionSection/index.vue

@@ -115,7 +115,7 @@
               tag="div"
               to="/region/settingDevice"
               class="drop_down_list_item"
-              >设置设置</router-link
+              >设备设置</router-link
             >
             <router-link
               @click.native="routeDropdownChange()"

src/views/regionSection/log/admin.vue

@@ -1,14 +1,159 @@
 <template>
-  <div class="main_root">管理员日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、事件"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list"></Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { dateFormat } from "@/utils";
+import { logOperate_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "aname",
+          align: "center"
+        },
+        {
+          title: "事件",
+          key: "content",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+        localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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;
+      logOperate_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/log/appLaunch.vue

@@ -1,14 +1,186 @@
 <template>
-  <div class="main_root">应用启动日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、设备号"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <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
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { dateFormat } from "@/utils";
+import { logAppStart_list_start } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "aname",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "应用名称",
+          key: "appName",
+          align: "center"
+        },
+        {
+          title: "违规",
+          slot: "violatedSlot",
+          align: "center"
+        },
+        {
+          title: "下载时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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_start({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/log/applicationDownload.vue

@@ -1,14 +1,178 @@
 <template>
-  <div class="main_root">应用下载日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、事件"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list"></Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { dateFormat } from "@/utils";
+import { logAppDown_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "aname",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "应用名称",
+          key: "appName",
+          align: "center"
+        },
+        {
+          title: "版本号",
+          key: "appVersion",
+          align: "center"
+        },
+        {
+          title: "下载时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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;
+      logAppDown_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/log/deviceEvents.vue

@@ -1,14 +1,216 @@
 <template>
-  <div class="main_root">设备事件日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Select
+          v-model="searchForm.doEvent"
+          :transfer="true"
+          style="margin-right: 10px; width: 150px"
+          @on-change="searchList()"
+        >
+          <Option :value="0">所有事件</Option>
+          <Option
+            v-for="(eventName, eventVal) in doEventInfo"
+            :value="Number(eventVal)"
+            :key="eventVal"
+            >{{ eventName }}</Option
+          >
+        </Select>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、设备号"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+        >导出</Button
+      >
+    </div>
+    <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">
+          <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
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { dateFormat, doEventInfo } from "@/utils";
+import { logdoperate_list_event } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      doEventInfo,
+      searchForm: {
+        dataRange: [],
+        doEvent: 0,
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "事件",
+          slot: "doEventSlot",
+          align: "center"
+        },
+        {
+          title: "描述",
+          key: "comm",
+          align: "center"
+        },
+        {
+          title: "违规",
+          slot: "violatedSlot",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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;
+      logdoperate_list_event({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        doEvent: this.searchForm.doEvent,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/log/deviceExport.vue

@@ -1,14 +1,154 @@
 <template>
-  <div class="main_root">设备导出</div>
+  <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
+      >
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="actionSlot">
+          <div class="action_list">
+            <div @click="toExport(row)">导出</div>
+          </div>
+        </template>
+      </Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { logDeviceBind_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "区域名称",
+          key: "regionName",
+          align: "center"
+        },
+        {
+          title: "学校数",
+          key: "schoolnum",
+          align: "center"
+        },
+        {
+          title: "用户数",
+          key: "usernum",
+          align: "center"
+        },
+        {
+          title: "设备数",
+          key: "snnum",
+          align: "center"
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 90,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      logDeviceBind_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/log/deviceInstallation.vue

@@ -1,14 +1,192 @@
 <template>
-  <div class="main_root">设备已安装应用</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、设备号、应用"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+        >导出</Button
+      >
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list"></Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { dateFormat } from "@/utils";
+import { logAppStart_list_install } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "应用名称",
+          key: "appName",
+          align: "center"
+        },
+        {
+          title: "应用包名",
+          key: "appPackage",
+          align: "center"
+        },
+        {
+          title: "版本名称",
+          key: "versionName",
+          align: "center"
+        },
+        {
+          title: "版本号",
+          key: "versionNum",
+          align: "center"
+        },
+        {
+          title: "上报时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/log/deviceLocation.vue

@@ -1,14 +1,177 @@
 <template>
-  <div class="main_root">设备位置日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+            v-model="searchForm.dataRange"
+            @on-change="searchList()"
+            :editable="false"
+            :transfer="true"
+            format="yyyy-MM-dd"
+            type="daterange"
+            placement="bottom-start"
+            placeholder="请选择日期范围"
+            style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+            v-model="searchForm.name"
+            placeholder="请输入登录名、事件"
+            search
+            @on-search="searchList()"
+            style="width: 180px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+      >导出</Button
+      >
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list"></Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+          :transfer="true"
+          :total="searchForm.total"
+          :current="searchForm.page"
+          :page-size="searchForm.size"
+          :page-size-opts="[10, 20, 40, 60]"
+          @on-change="pageChange"
+          @on-page-size-change="pageSizeChange"
+          show-total
+          show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { dateFormat } from "@/utils";
+import { logDeviceLogin_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+                "span",
+                params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "地址",
+          key: "ipAddress",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+        localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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;
+      logDeviceLogin_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/log/devicePush.vue

@@ -1,14 +1,169 @@
 <template>
-  <div class="main_root">设备推送日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、事件"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="pushTypeSlot">
+          <!-- 1发送消息 2解除限制 3限制使用 4更新策略 5重启设备 6恢复出厂 -->
+          <div>{{ pushTypeInfo[row.pushType] }}</div>
+        </template>
+      </Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { dateFormat, pushTypeInfo } from "@/utils";
+import { logPush_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      pushTypeInfo,
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "aname",
+          align: "center"
+        },
+        {
+          title: "事件",
+          slot: "pushTypeSlot",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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;
+      logPush_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/log/violatingDevice.vue

@@ -1,14 +1,259 @@
 <template>
-  <div class="main_root">违规设备日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Select
+          v-model="searchForm.doEvent"
+          :transfer="true"
+          style="margin-right: 10px; width: 150px"
+          @on-change="searchList()"
+        >
+          <Option :value="0">所有事件</Option>
+          <Option
+            v-for="(eventName, eventVal) in doEventInfo"
+            :value="Number(eventVal)"
+            :key="eventVal"
+            >{{ eventName }}</Option
+          >
+        </Select>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、设备号"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+        >导出</Button
+      >
+    </div>
+    <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="noticedSlot">
+          <div class="action_list">
+            <!-- 是否通知：0否 1是 -->
+            <div v-if="row.noticed === 1" class="action_success">是</div>
+            <div v-else-if="row.noticed === 0" class="action_error">否</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="lockedSlot">
+          <div class="action_list">
+            <!-- 是否锁定：0否 1是 -->
+            <div v-if="row.locked === 1" class="action_success">是</div>
+            <div v-else-if="row.locked === 0" class="action_error">否</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="resetedSlot">
+          <div class="action_list">
+            <!-- 是否重置：0否 1是 -->
+            <div v-if="row.reseted === 1" class="action_success">是</div>
+            <div v-else-if="row.reseted === 0" class="action_error">否</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="emailedSlot">
+          <div class="action_list">
+            <!-- 是否发送邮件：0否 1是 -->
+            <div v-if="row.emailed === 1" class="action_success">是</div>
+            <div v-else-if="row.emailed === 0" class="action_error">否</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="handledSlot">
+          <div class="action_list">
+            <!-- 是否处理：0否 1是 -->
+            <div v-if="row.handled === 1" class="action_success">是</div>
+            <div v-else-if="row.handled === 0" class="action_error">否</div>
+          </div>
+        </template>
+      </Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { dateFormat, doEventInfo } from "@/utils";
+import { logdoperate_list_violate } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      doEventInfo,
+      searchForm: {
+        dataRange: [],
+        doEvent: 0,
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "事件",
+          slot: "doEventSlot",
+          align: "center"
+        },
+        {
+          title: "通知",
+          slot: "noticedSlot",
+          align: "center"
+        },
+        {
+          title: "锁定",
+          slot: "lockedSlot",
+          align: "center"
+        },
+        {
+          title: "重置",
+          slot: "resetedSlot",
+          align: "center"
+        },
+        {
+          title: "发邮件",
+          slot: "emailedSlot",
+          align: "center"
+        },
+        {
+          title: "处理结果",
+          slot: "handledSlot",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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;
+      logdoperate_list_violate({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        doEvent: this.searchForm.doEvent,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/regionSection/networkManage/whitelist.vue

@@ -319,7 +319,7 @@ export default {
         },
         {
           title: "所属区域",
-          key: "regionName",
+          key: "name",
           align: "center"
         },
         {
@@ -383,7 +383,7 @@ export default {
       //获取区域学校
       region_list_rs({
         regionid: this.userInfo.regionid,
-        regionName: this.whiteLibraryInfo.schoolname
+        name: this.whiteLibraryInfo.schoolname
       }).then((res) => {
         if (res.code === 0) {
           this.getHandleData(res.obj[0]);
@@ -394,7 +394,7 @@ export default {
       });
     },
     getHandleData(node) {
-      node.title = node.regionName;
+      node.title = node.name;
       node.expand = true;
       if (node.children && node.children.length > 0) {
         for (let child of node.children) {

src/views/regionSection/notice/index.vue

@@ -1,14 +1,250 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+            v-model="searchForm.dataRange"
+            @on-change="searchList()"
+            :editable="false"
+            :transfer="true"
+            format="yyyy-MM-dd"
+            type="daterange"
+            placement="bottom-start"
+            placeholder="请选择日期范围"
+            style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+            v-model="searchForm.title"
+            placeholder="请输入标题"
+            search
+            @on-search="searchList()"
+            style="width: 150px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="actionSlot">
+          <div class="action_list">
+            <div @click="toView(row)">查看</div>
+          </div>
+        </template>
+      </Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+          :transfer="true"
+          :total="searchForm.total"
+          :current="searchForm.page"
+          :page-size="searchForm.size"
+          :page-size-opts="[10, 20, 40, 60]"
+          @on-change="pageChange"
+          @on-page-size-change="pageSizeChange"
+          show-total
+          show-sizer
+      ></Page>
+    </div>
+    <!-- 查看 -->
+    <Modal
+        class="modal1"
+        :mask-closable="false"
+        v-model="viewInfo.show"
+        title="查看"
+    >
+      <div class="notice_title">{{ viewInfo.noticeTitle }}</div>
+      <div class="notice_create">
+        <div>{{ viewInfo.createname }}</div>
+        <div>{{ viewInfo.updatetime }}</div>
+      </div>
+      <div class="notice_content" v-html="viewInfo.noticeContent"></div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="viewInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
 </template>
 
 <script>
+import { notice_list_region, notice_detail_region } from "@/api/notice";
+import { dateFormat } from "@/utils";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        title: "",
+        page: 1,
+        size: 10,
+        dataRange: [],
+        list: [],
+        total: 0
+      },
+      // 查看信息
+      viewInfo: {
+        show: false,
+        noticeTitle: null,
+        createname: null,
+        updatetime: null,
+        noticeContent: null,
+        noticeType: null,
+        regions: []
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+                "span",
+                params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "标题",
+          key: "noticeTitle",
+          align: "center"
+        },
+        {
+          title: "发布人",
+          key: "createname",
+          width: 140,
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "updatetime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 90,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+        localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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;
+      notice_list_region({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        title: this.searchForm.title,
+        begindate: _begindate,
+        enddate: _enddate
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 查看
+    toView(row) {
+      notice_detail_region({
+        noticeid: row.noticeid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.viewInfo = {
+            show: true,
+            noticeTitle: data.obj.noticeTitle,
+            createname: data.obj.createname,
+            updatetime: data.obj.updatetime,
+            noticeContent: data.obj.noticeContent,
+            noticeType: data.obj.noticeType,
+            regions: data.obj.noticeType === 1 ? [] : data.obj.regions
+          };
+          console.log(data.obj.noticeContent)
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+.notice_title {
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
+}
+.notice_create {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 16px;
+  font-size: 12px;
+  color: #afbcc7;
+  > div {
+    margin: 0 10px;
+  }
+}
+.notice_content {
+  font-size: 16px;
+  /deep/ img{
+    width: 100%;
+  }
+}
+.notice_regions {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  flex-wrap: wrap;
+  margin-top: 16px;
+  padding: 10px 16px;
+  font-size: 14px;
+  border-radius: 8px;
+  background: #f0f6fc;
+  > div {
+    margin: 10px 16px;
+  }
+}
+</style>

src/views/regionSection/regionManage/regionManage.vue

@@ -68,7 +68,7 @@
         </FormItem>
         <FormItem
           label="登录账号"
-          prop="loginname"
+          prop="admin.loginname"
           style="width: calc(50% - 10px)"
         >
           <Input
@@ -76,7 +76,11 @@
             placeholder="请输入登录账号"
           ></Input>
         </FormItem>
-        <FormItem label="密码" prop="loginpwd" style="width: calc(50% - 10px)">
+        <FormItem
+          label="密码"
+          prop="admin.loginpwd"
+          style="width: calc(50% - 10px)"
+        >
           <Input
             v-model="regionInfo.admin.loginpwd"
             placeholder="请输入密码"
@@ -84,7 +88,7 @@
         </FormItem>
         <FormItem
           label="确认密码"
-          prop="loginpwd1"
+          prop="admin.loginpwd1"
           style="width: calc(50% - 10px)"
         >
           <Input
@@ -92,7 +96,7 @@
             placeholder="请输入确认密码"
           ></Input>
         </FormItem>
-        <FormItem label="手机号码" prop="phone" style="width: calc(50% - 10px)">
+        <FormItem label="手机号码" style="width: calc(50% - 10px)">
           <Input
             v-model="regionInfo.admin.phone"
             placeholder="请输入手机号码"
@@ -195,21 +199,16 @@ export default {
     // 密码验证
     const pwdCheck = (rule, value, callback) => {
       if (!reg.test(this.regionInfo.admin.loginpwd)) {
-        new Error("密码格式不正确!");
-      } else {
-        callback();
+        return callback(new Error("密码格式不正确!"));
       }
     };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
       if (!reg.test(this.regionInfo.admin.loginpwd1)) {
-        new Error("密码格式不正确!");
-      } else if (
-        this.regionInfo.admin.loginpwd != this.regionInfo.admin.loginpwd1
-      ) {
+        return callback(new Error("密码格式不正确!"));
+      }
+      if (this.regionInfo.admin.loginpwd != this.regionInfo.admin.loginpwd1) {
         return callback(new Error("两次输入密码不一致！"));
-      } else {
-        callback();
       }
     };
     return {
@@ -294,14 +293,14 @@ export default {
             trigger: "blur"
           }
         ],
-        loginpwd: [
+        "admin.loginpwd": [
           {
             required: true,
             validator: pwdCheck,
             trigger: "blur"
           }
         ],
-        loginpwd1: [
+        "admin.loginpwd1": [
           {
             required: true,
             validator: pwdAgainCheck,

src/views/regionSection/regionManage/schoolManage.vue

@@ -314,7 +314,7 @@
 </template>
 
 <script>
-import { region_list_sel_pt } from "@/api/region";
+import { region_list_sel_pt, region_list_sel_qy } from "@/api/region";
 import { login_msg_code } from "@/api/login";
 import { generateRandomString } from "@/utils";
 import {
@@ -559,7 +559,7 @@ export default {
     },
     // 获取搜索区域列表
     getSearchRegionList() {
-      region_list_sel_pt({}).then((data) => {
+      region_list_sel_qy({ regionid: this.userInfo.regionid }).then((data) => {
         if (data.code === 0) {
           this.searchForm.dropList = data.obj;
         } else {
@@ -588,7 +588,7 @@ export default {
       school_list({
         page: this.searchForm.page,
         size: this.searchForm.size,
-        areaCode: obj && obj.areaCode?obj.areaCode:this.searchForm.areaCode,
+        areaCode: obj && obj.areaCode ? obj.areaCode : this.searchForm.areaCode,
         schoolName: this.searchForm.schoolName,
         regionid: this.searchForm.regionid
       }).then((data) => {

src/views/regionSection/search/allUsers.vue

@@ -2,12 +2,12 @@
   <div class="main_root">
     <div class="search_header">
       <Input
-        v-model="searchForm.regionName"
+        v-model="searchForm.name"
         placeholder="请输入学生姓名、账号"
         style="width: 200px"
       />
       <Input
-        v-model="searchForm.regionName"
+        v-model="searchForm.title"
         placeholder="请输入学校名称"
         style="width: 150px; margin: 0 10px"
       />
@@ -16,7 +16,9 @@
       </Button>
     </div>
     <div class="table_wrap">
-      <Table :columns="columns" :data="searchForm.list"> </Table>
+      <Table :columns="columns" :data="searchForm.list">
+
+      </Table>
     </div>
     <div class="page_wrap">
       <Page
@@ -35,12 +37,13 @@
 </template>
 
 <script>
-import { region_list_qy } from "@/api/region";
+import {region_list_qy, search_list_user} from "@/api/region";
 export default {
   data() {
     return {
       searchForm: {
-        regionName: "",
+        title: "",
+        name: "",
         page: 1,
         size: 10,
         list: [],
@@ -62,36 +65,36 @@ export default {
         },
         {
           title: "登录名",
-          key: "regionName",
+          key: "loginname",
           align: "center"
         },
         {
           title: "学生姓名",
-          key: "createname",
+          key: "username",
           width: 140,
           align: "center"
         },
         {
           title: "状态",
-          key: "createtime",
+          slot: "enabled",
           width: 190,
           align: "center"
         },
         {
           title: "学校名称",
-          key: "updatename",
+          key: "schoolName",
           width: 140,
           align: "center"
         },
         {
           title: "创建时间",
-          key: "updatetime",
+          key: "createtime",
           width: 190,
           align: "center"
         },
         {
           title: "最后登录时间",
-          slot: "actionSlot",
+          key: "createtime",
           width: 220,
           align: "center"
         }
@@ -120,14 +123,15 @@ export default {
     },
     // 获取列表
     getList() {
-      return;
-      region_list_qy({
+      search_list_user({
         page: this.searchForm.page,
         size: this.searchForm.size,
-        regionName: this.searchForm.regionName
+        name: this.searchForm.name,
+        title: this.searchForm.title,
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
+          console.log(this.searchForm.list)
           this.searchForm.total = data.obj.total;
         } else {
           this.$Message.error(data.msg);

src/views/regionSection/setting/allApps.vue

@@ -1,14 +0,0 @@
-<template>
-  <div class="main_root"></div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {};
-  },
-  methods: {}
-};
-</script>
-
-<style lang="less" scoped></style>

src/views/regionSection/setting/device.vue

@@ -9,13 +9,16 @@
     <div class="content">
       <Form ref="addForm" :model="adminInfo" :label-width="100" inline>
         <FormItem label="动态密码" style="width: 100%">
-          <RadioGroup v-model="adminInfo.whited">
+          <RadioGroup v-model="adminInfo.trend">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
         <FormItem label="管理密码" style="width: 100%">
-          <Input v-model="adminInfo.name" placeholder="请输入管理密码"></Input>
+          <Input
+            v-model="adminInfo.password"
+            placeholder="请输入管理密码"
+          ></Input>
         </FormItem>
       </Form>
     </div>
@@ -25,17 +28,78 @@
         >保存</Button
       >
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
+import {
+  password_detail,
+  password_edit
+} from "@/api/setting";
+
 export default {
   data() {
     return {
-      adminInfo: {}
+      adminInfo: {
+        trend: 1,
+        password: ""
+      },
+      userInfo: {},
+      showLoading: false
     };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.init();
+  },
+  methods: {
+    init() {
+      password_detail({}).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          if (res.obj) {
+            this.adminInfo = {
+              trend: res.obj.trend,
+              password: res.obj.password
+            };
+          }
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    //刷新页面
+    Refresh() {
+      location.reload();
+    },
+    saveInfo() {
+      if (!this.adminInfo.password) {
+        this.$Message.error("请输入管理密码！");
+        return;
+      }
+      let form = {
+        trend: this.adminInfo.trend,
+        password: this.adminInfo.password
+      };
+      console.log(form);
+      this.showLoading = true;
+      password_edit(form).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          console.log(res.obj);
+          this.$Message.success(res.msg);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
@@ -55,6 +119,15 @@ export default {
       padding-left: 20px;
       height: 40px;
       line-height: 40px;
+      &::before {
+        content: "*" !important;
+        display: inline-block;
+        margin-right: 4px;
+        line-height: 1;
+        font-family: SimSun;
+        font-size: 14px;
+        color: #ed4014;
+      }
     }
   }
   .content {

src/views/regionSection/setting/logo.vue

@@ -8,7 +8,8 @@
     <div class="content">
       <div class="header">
         <div class="LOGO">
-          <img src="../../../assets/img/setting/LOGO.png" />
+          <img v-if="form.logoPath" :src="$api.showImageUrl + form.logoPath" />
+          <img v-else src="../../../assets/img/setting/LOGO.png" />
         </div>
       </div>
       <div class="navigation">
@@ -73,14 +74,114 @@
 </template>
 
 <script>
+import axios from "axios";
+import { logo_delete, logo_detail, logo_edit } from "@/api/setting";
 export default {
   data() {
-    return {};
+    return {
+      userInfo: {},
+      form: {
+        logoPath: "",
+        rversion: "",
+        objectid: "",
+        logoid: ""
+      }
+    };
+  },
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.init();
   },
   methods: {
-    upLoad() {},
-    resetting() {},
-    saveInfo() {},
+    init() {
+      logo_detail({ objectid: this.userInfo.regionid, llevel: 2 }).then(
+        (res) => {
+          this.showLoading = false;
+          if (res.code === 0) {
+            if (res.obj) {
+              this.form = {
+                logoPath: res.obj.logoPath,
+                rversion: res.obj.rversion,
+                objectid: res.obj.objectid,
+                logoid: res.obj.logoid
+              };
+            }
+          } else {
+            this.$Message.error(res.msg);
+          }
+        }
+      );
+    },
+    upLoad(file) {
+      let str = file.name.split(".");
+      let suffix = str[str.length - 1];
+      suffix = suffix.toLowerCase();
+      if (suffix !== "png" && suffix !== "jpeg" && suffix !== "jpg") {
+        this.$Message.warning("请上传png、jpeg、jpg类型的文件");
+        return false;
+      }
+      let formData = new FormData();
+      formData.append("file", file);
+      formData.append("savefolder", "app");
+      formData.append("isrename", "1");
+      let Url = this.$api.baseImageUrl + "up/upfile";
+      this.showLoading = true;
+      axios
+        .post(Url, formData, {
+          timeout: 1000 * this.$api.axiosFileTimeout
+        })
+        .then((res) => {
+          this.showLoading = false;
+          if (res.data.code === 0) {
+            console.log(res.data);
+            this.form.logoPath = res.data.obj;
+            this.$Message.success(res.data.msg);
+          } else {
+            this.$Message.error(res.data.msg);
+          }
+        })
+        .catch(() => {
+          this.showLoading = false;
+          this.$Message.error("图片上传失败");
+        });
+    },
+    //重置
+    resetting() {
+      this.showLoading = true;
+      logo_delete({
+        rversion: this.form.rversion,
+        logoid: this.form.logoid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.form.logoPath = "";
+          console.log(res.obj);
+          this.$Message.success(res.msg);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    saveInfo() {
+      let form = {
+        logoPath: this.form.logoPath,
+        llevel: 2,
+        objectid: this.userInfo.regionid
+      };
+      console.log(form);
+      this.showLoading = true;
+      logo_edit(form).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          console.log(res.obj);
+          this.$Message.success(res.msg);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
     //刷新页面
     Refresh() {
       location.reload();
@@ -91,13 +192,22 @@ export default {
 
 <style lang="less" scoped>
 .main_root {
-  padding: 40px 100px 100px;
+  padding: 40px 100px 40px;
   position: relative;
   .comm {
     height: 40px;
     line-height: 40px;
     font-size: 16px;
     color: #253a70;
+    &::before {
+      content: "*" !important;
+      display: inline-block;
+      margin-right: 4px;
+      line-height: 1;
+      font-family: SimSun;
+      font-size: 14px;
+      color: #ed4014;
+    }
   }
   .content {
     margin-top: 10px;
@@ -162,7 +272,7 @@ export default {
   }
   .footer {
     position: absolute;
-    bottom: 100px;
+    bottom: 40px;
     width: 100%;
     height: 32px;
     text-align: center;

src/views/regionSection/setting/powerUp.vue

@@ -8,19 +8,21 @@
       <Form ref="addForm" :model="adminInfo" :label-width="140" inline>
         <FormItem label="开机启动应用包名" style="width: 100%">
           <Input
-            v-model="adminInfo.name"
+            v-model="adminInfo.appPackage"
             placeholder="请输入开机启动应用包名"
           ></Input>
         </FormItem>
         <FormItem label="页面地址" style="width: 100%">
-          <Input v-model="adminInfo.name" placeholder="请输入页面地址"></Input>
+          <Input
+            v-model="adminInfo.authUrl"
+            placeholder="请输入页面地址"
+          ></Input>
         </FormItem>
         <FormItem label="约定标识" style="width: 100%">
-          <RadioGroup v-model="adminInfo.whited">
+          <RadioGroup v-model="adminInfo.singleType">
             <Radio :label="1">账号</Radio>
-            <Radio :label="0">学号</Radio>
-            <Radio :label="1">手机号码</Radio>
-            <Radio :label="0">身份证号码</Radio>
+            <Radio :label="2">手机号码</Radio>
+            <Radio :label="3">身份证号码</Radio>
           </RadioGroup>
         </FormItem>
       </Form>
@@ -31,17 +33,84 @@
         >保存</Button
       >
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
+import {
+  autoapp_detail,
+  autoapp_edit
+} from "@/api/setting";
+
 export default {
   data() {
     return {
-      adminInfo: {}
+      adminInfo: {
+        regionid: "",
+        appPackage: "",
+        authUrl: "",
+        singleType: 1
+      },
+      userInfo: {},
+      showLoading: false
     };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.init();
+  },
+  methods: {
+    init() {
+      autoapp_detail({ regionid: this.userInfo.regionid }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          if (res.obj) {
+            console.log(res.obj);
+            this.adminInfo = {
+              appPackage: res.obj.appPackage,
+              authUrl: res.obj.authUrl,
+              singleType: res.obj.singleType
+            };
+          }
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    //刷新页面
+    Refresh() {
+      location.reload();
+    },
+    saveInfo() {
+      if (!this.adminInfo.password) {
+        this.$Message.error("请输入管理密码！");
+        return;
+      }
+      let form = {
+        regionid: this.userInfo.regionid,
+        appPackage: this.adminInfo.appPackage,
+        authUrl: this.adminInfo.authUrl,
+        singleType: this.adminInfo.singleType
+      };
+      console.log(form);
+      this.showLoading = true;
+      autoapp_edit(form).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          console.log(res.obj);
+          this.$Message.success(res.msg);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
@@ -61,6 +130,15 @@ export default {
       padding-left: 20px;
       height: 40px;
       line-height: 40px;
+      &::before {
+        content: "*" !important;
+        display: inline-block;
+        margin-right: 4px;
+        line-height: 1;
+        font-family: SimSun;
+        font-size: 14px;
+        color: #ed4014;
+      }
     }
   }
   .content {

src/views/regionSection/setting/wallpaper.vue

@@ -2,16 +2,27 @@
   <div class="main_root">
     <div class="search_header">
       <Input
-        v-model="searchForm.regionName"
+        v-model="searchForm.name"
         placeholder="请输入壁纸名称"
         search
         @on-search="searchList()"
         style="width: 150px"
       />
-      <Button type="primary" class="primary_btn" @click="toAdd()">新建</Button>
+      <Button
+        v-if="searchForm.list.length === 0"
+        type="primary"
+        class="primary_btn"
+        @click="toAdd()"
+        >新建</Button
+      >
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="hpath">
+          <div class="hpath">
+            <img v-if="row.hpath" :src="$api.showImageUrl + row.hpath" />
+          </div>
+        </template>
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
@@ -39,7 +50,7 @@
       class="modal1"
       :mask-closable="false"
       v-model="wallpaperInfo.show"
-      :title="wallpaperInfo.id ? '编辑' : '新建'"
+      :title="wallpaperInfo.wallpaperid ? '编辑' : '新建'"
     >
       <Form
         v-if="wallpaperInfo.show"
@@ -49,13 +60,13 @@
         :label-width="100"
         inline
       >
-        <FormItem label="名称" prop="Name" style="width: 100%">
+        <FormItem label="名称" prop="wname" style="width: 100%">
           <Input
-            v-model="wallpaperInfo.name"
+            v-model="wallpaperInfo.wname"
             placeholder="请输入壁纸名称"
           ></Input>
         </FormItem>
-        <FormItem label="壁纸" prop="img" style="width: 100%">
+        <FormItem label="壁纸" style="width: 100%">
           <div class="up">
             <Upload
               class="Upload"
@@ -67,14 +78,26 @@
                   return false;
                 }
               "
-              accept=".png,.jpeg,.jpg,gif"
+              accept=".png,.jpeg,.jpg,.gif"
             >
-              <div class="icon">横屏壁纸</div>
+              <div v-if="!wallpaperInfo.hpath" class="icon">横屏壁纸</div>
+              <div v-else class="hpath">
+                <img :src="$api.showImageUrl + wallpaperInfo.hpath" />
+              </div>
             </Upload>
             <span>支持图片格式：jpg、jgeg、gif、png</span>
           </div>
         </FormItem>
-        <FormItem label="适配类型" style="width: 100%"> </FormItem>
+        <FormItem label="适配类型" class="require" style="width: 100%">
+          <div v-for="item in device_list" :key="item.dgroupid">
+            <CheckboxDevice
+              @CheckboxDevice="CheckboxDevice"
+              :dgroupid="item.dgroupid"
+              ref="checkbevice"
+              :module="item"
+            ></CheckboxDevice>
+          </div>
+        </FormItem>
       </Form>
       <div slot="footer">
         <div>
@@ -87,39 +110,66 @@
     </Modal>
     <!-- 查看 -->
     <Modal
-      class="modal1"
+      class="modal1 view"
       :mask-closable="false"
       v-model="viewInfo.show"
       title="查看"
     >
-      <div class="view_title">{{ viewInfo.regionName }}</div>
-      <Table
-        style="border: 1px solid #e8eaec; border-bottom: none"
-        :columns="viewInfo.columns"
-        :data="viewInfo.list"
-      ></Table>
+      <div class="view_titles">{{ viewInfo.wname }}</div>
+      <div class="view_content">
+        <div class="view_title">壁纸效果</div>
+        <div class="hpath">
+          <img v-if="viewInfo.hpat" :src="$api.showImageUrl + viewInfo.hpath" />
+        </div>
+      </div>
+      <div class="view_content" style="margin-top: 20px">
+        <div class="view_title">适配类型</div>
+        <div class="view_devices">
+          <div
+            class="view_list"
+            v-for="item in viewInfo.devices"
+            :key="item.dgroupid"
+          >
+            <div class="dgname">{{ item.dgname }}</div>
+            <div class="devices">
+              <span v-for="sitem in item.devices" :key="sitem.deviceid">{{
+                sitem.deviceModel
+              }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
     </Modal>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
-import { generateRandomString } from "@/utils";
+import axios from "axios";
+import CheckboxDevice from "@/components/Checkbox/CheckboxDevice";
 import {
-  region_list_admin,
-  region_delete,
-  region_add,
-  region_edit,
-  region_list_qy
-} from "@/api/region";
-import { login_msg_code } from "@/api/login";
+  wallpaper_add,
+  wallpaper_delete,
+  wallpaper_detail,
+  wallpaper_edit,
+  wallpaper_list
+} from "@/api/setting";
+import { device_list } from "@/api/appgroup";
 export default {
+  components: {
+    CheckboxDevice
+  },
   data() {
     return {
+      showLoading: false,
       searchForm: {
-        regionName: "",
+        name: "",
         page: 1,
         size: 10,
         list: [],
@@ -127,16 +177,19 @@ export default {
       },
       // 新建
       wallpaperInfo: {
-        show: true,
+        show: false,
         id: null,
-        name: "",
-        img: ""
+        wname: "",
+        hpath: "",
+        wlevel: "",
+        objectid: "",
+        deviceids: []
       },
       // 编辑
       modifyRegion: {
         show: false,
         regionid: null,
-        regionName: "",
+        name: "",
         regionCode: "",
         comm: "",
         rversion: null
@@ -144,34 +197,10 @@ export default {
       // 查看
       viewInfo: {
         show: false,
-        regionName: "",
-        list: [],
-        columns: [
-          {
-            title: "序号",
-            type: "index",
-            width: 70,
-            align: "center"
-          },
-          {
-            title: "名称",
-            key: "aname",
-            align: "center"
-          },
-          {
-            title: "账号",
-            key: "loginname",
-            align: "center"
-          },
-          {
-            title: "手机号码",
-            key: "phone",
-            align: "center"
-          }
-        ]
+        name: ""
       },
       rules: {
-        regionName: [
+        wname: [
           {
             required: true,
             message: "请输入区域名称",
@@ -179,6 +208,9 @@ export default {
           }
         ]
       },
+      userInfo: {},
+      device_list: [],
+      deviceids: {}, //设备类型
       columns: [
         {
           title: "序号",
@@ -195,17 +227,17 @@ export default {
         },
         {
           title: "横屏壁纸",
-          key: "regionName",
+          slot: "hpath",
           align: "center"
         },
         {
           title: "壁纸名称",
-          key: "createname",
+          key: "wname",
           align: "center"
         },
         {
           title: "操作人",
-          key: "createtime",
+          key: "updatename",
           align: "center"
         },
         {
@@ -224,10 +256,60 @@ export default {
     };
   },
   created() {
-    // this.searchList();
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.init();
+    this.searchList();
   },
   methods: {
-    upLoad() {},
+    CheckboxDevice(dgroupid, val) {
+      this.deviceids[dgroupid] = val;
+    },
+    init() {
+      //获取分组下设备
+      this.showLoading = true;
+      device_list({}).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.device_list = res.obj;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    upLoad(file) {
+      let str = file.name.split(".");
+      let suffix = str[str.length - 1];
+      suffix = suffix.toLowerCase();
+      if (suffix !== "png" && suffix !== "jpeg" && suffix !== "jpg") {
+        this.$Message.warning("请上传png、jpeg、jpg类型的文件");
+        return false;
+      }
+      let formData = new FormData();
+      formData.append("file", file);
+      formData.append("savefolder", "app");
+      formData.append("isrename", "1");
+      let Url = this.$api.baseImageUrl + "up/upfile";
+      this.showLoading = true;
+      axios
+        .post(Url, formData, {
+          timeout: 1000 * this.$api.axiosFileTimeout
+        })
+        .then((res) => {
+          this.showLoading = false;
+          if (res.data.code === 0) {
+            this.wallpaperInfo.hpath = res.data.obj;
+            this.$Message.success(res.data.msg);
+          } else {
+            this.$Message.error(res.data.msg);
+          }
+        })
+        .catch(() => {
+          this.showLoading = false;
+          this.$Message.error("图片上传失败");
+        });
+    },
     // 搜索
     searchList() {
       this.searchForm.page = 1;
@@ -246,11 +328,14 @@ export default {
     },
     // 获取列表
     getList() {
-      region_list_qy({
+      this.showLoading = true;
+      wallpaper_list({
         page: this.searchForm.page,
         size: this.searchForm.size,
-        regionName: this.searchForm.regionName
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
@@ -261,57 +346,55 @@ export default {
     },
     // 新建
     toAdd() {
-      this.$refs.addForm.resetFields();
       this.wallpaperInfo = {
         show: true,
-        // 验证码计时
-        timer: null,
-        name:"",
-        img:""
+        id: null,
+        wname: "",
+        hpath: "",
+        wlevel: "",
+        objectid: "",
+        deviceids: []
       };
-
     },
     // 保存新建
     saveAddInfo() {
       this.$refs.addForm.validate((valid) => {
         if (valid) {
-          this.wallpaperInfo.show = false;
-          region_add({
-            regionName: this.wallpaperInfo.regionName,
-            regionCode: this.wallpaperInfo.regionCode,
-            admin: {
-              aname: this.wallpaperInfo.admin.aname,
-              loginname: this.wallpaperInfo.admin.loginname,
-              loginpwd: this.wallpaperInfo.admin.loginpwd,
-              phone: this.wallpaperInfo.admin.phone,
-              msgcode: this.wallpaperInfo.admin.msgcode,
-              address: this.wallpaperInfo.admin.address,
-              comm: this.wallpaperInfo.admin.comm
+          //获取选中设备
+          let deviceids = [];
+          for (let key in this.deviceids) {
+            for (let deviceid of this.deviceids[key]) {
+              deviceids.push(deviceid);
             }
-          }).then((data) => {
-            if (data.code === 0) {
-              this.searchList();
-              this.$Message.success(data.msg);
-            } else {
-              this.$Message.error(data.msg);
-            }
-          });
-        }
-      });
-    },
-    // 保存编辑
-    saveModifyInfo() {
-      this.$refs.modifyForm.validate((valid) => {
-        if (valid) {
-          this.wallpaperInfo.show = false;
-          region_edit({
-            regionName: this.modifyRegion.regionName,
-            regionCode: this.modifyRegion.regionCode,
-            comm: this.modifyRegion.comm,
-            regionid: this.modifyRegion.regionid,
-            rversion: this.modifyRegion.rversion
-          }).then((data) => {
+          }
+          if (deviceids.length === 0) {
+            this.$Message.error("请选择设备!");
+            return;
+          }
+          if (!this.wallpaperInfo.hpath) {
+            this.$Message.error("请上传横屏壁纸!");
+            return;
+          }
+          let api = this.wallpaperInfo.wallpaperid
+            ? wallpaper_edit
+            : wallpaper_add;
+          let form = {
+            wname: this.wallpaperInfo.wname,
+            hpath: this.wallpaperInfo.hpath,
+            wlevel: 2,
+            objectid: this.userInfo.regionid,
+            deviceids
+          };
+          if (this.wallpaperInfo.wallpaperid) {
+            //编辑
+            form.rversion = this.wallpaperInfo.rversion;
+            form.wallpaperid = this.wallpaperInfo.wallpaperid;
+          }
+          this.showLoading = true;
+          api(form).then((data) => {
+            this.showLoading = false;
             if (data.code === 0) {
+              this.wallpaperInfo.show = false;
               this.searchList();
               this.$Message.success(data.msg);
             } else {
@@ -323,13 +406,18 @@ export default {
     },
     // 查看
     toView(row) {
-      region_list_admin({
-        regionid: row.regionid
+      this.showLoading = true;
+      wallpaper_detail({
+        wallpaperid: row.wallpaperid
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
-          this.viewInfo.show = true;
-          this.viewInfo.regionName = row.regionName;
-          this.viewInfo.list = data.obj;
+          this.viewInfo = {
+            show: true,
+            wname: data.obj.wname,
+            hpath: data.obj.hpath,
+            devices: data.obj.devices
+          };
         } else {
           this.$Message.error(data.msg);
         }
@@ -337,13 +425,48 @@ export default {
     },
     // 编辑
     toEdit(row) {
-      this.$refs.addForm.resetFields();
+      this.showLoading = true;
+      wallpaper_detail({
+        wallpaperid: row.wallpaperid
+      }).then((data) => {
+        this.showLoading = false;
+        if (data.code === 0) {
+          this.wallpaperInfo = {
+            show: true,
+            wallpaperid: data.obj.wallpaperid,
+            wname: data.obj.wname,
+            hpath: data.obj.hpath,
+            wlevel: data.obj.wlevel,
+            objectid: data.obj.objectid,
+            deviceids: data.obj.devices,
+            rversion: data.obj.rversion
+          };
+          this.$nextTick(() => {
+            //回显设备
+            let checkedArr = this.$refs.checkbevice;
+            if (checkedArr) {
+              for (let m = 0; m < checkedArr.length; m++) {
+                let dgroupid = checkedArr[m].module.dgroupid;
+                let marr = data.obj.devices;
+                for (let h = 0; h < marr.length; h++) {
+                  let arr = marr[h].devices;
+                  if (dgroupid == marr[h].dgroupid) {
+                    checkedArr[m].getCheckedDevices(arr);
+                  }
+                }
+              }
+            }
+          });
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
       this.wallpaperInfo = {
         show: true,
         // 验证码计时
         timer: null,
-        name:"",
-        img:""
+        name: "",
+        img: ""
       };
     },
     // 删除
@@ -352,8 +475,8 @@ export default {
         title: "提示",
         content: "您确定删除选中数据吗？",
         onOk: () => {
-          region_delete({
-            regionid: row.regionid,
+          wallpaper_delete({
+            wallpaperid: row.wallpaperid,
             rversion: row.rversion
           }).then((data) => {
             if (data.code === 0) {
@@ -378,11 +501,63 @@ export default {
   align-items: center;
   margin: 16px 16px;
 }
-.view_title {
-  margin-bottom: 16px;
-  font-size: 18px;
-  font-weight: bold;
-  text-align: center;
+.view {
+  .view_titles {
+    margin-bottom: 16px;
+    font-size: 18px;
+    font-weight: bold;
+    text-align: center;
+  }
+  .view_content {
+    display: flex;
+    .view_title {
+      width: 70px;
+      flex: none;
+      margin: 0 10px;
+    }
+    .hpath {
+      width: 180px;
+      height: 120px;
+      border-radius: 8px;
+      overflow: hidden;
+      border: 3px solid #333333;
+      background-color: #f0f6fc;
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
+    }
+    .view_devices {
+      .view_list {
+        margin-bottom: 20px;
+      }
+      .dgname {
+        line-height: 30px;
+      }
+      .devices {
+        display: flex;
+        flex-wrap: wrap;
+        span {
+          margin-right: 20px;
+          margin-bottom: 10px;
+        }
+      }
+    }
+  }
+}
+
+.table_wrap {
+  .hpath {
+    width: 100px;
+    height: 60px;
+    margin: 10px auto;
+    img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+  }
 }
 .up {
   display: flex;
@@ -399,6 +574,18 @@ export default {
     .icon {
       color: #b8c2d9;
     }
+    .hpath {
+      width: 180px;
+      height: 120px;
+      border-radius: 8px;
+      overflow: hidden;
+      padding: 3px;
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
+    }
   }
   span {
     margin-left: 20px;