平台-设备导入

src/api/device_manager.js

@@ -41,29 +41,44 @@ export const device_manager_export_id = (data) =>
 export const device_manager_detail_d = (data) =>
   setRequest("device_manager/detail_d", data);
 /**
- * 11.3.1设备导入--列表
+ * 11.3.1设备导入--列表（按详情）
  */
 export const deviceAuth_list = (data) => setRequest("deviceAuth/list", data);
 /**
- * 11.3.2设备导入--新增
+ * 11.3.1.2设备导入--列表（按批次）
+ */
+export const deviceAuth_list_batch = (data) =>
+  setRequest("deviceAuth/list_batch", data);
+/**
+ * 11.3.2设备导入--新增（按详情）
  */
 export const deviceAuth_add = (data) => setRequest("deviceAuth/add", data);
 /**
- * 11.3.3设备导入--更新
+ * 11.3.3设备导入--更新（按详情）
  */
 export const deviceAuth_edit = (data) => setRequest("deviceAuth/edit", data);
 /**
- * 11.3.4设备导入--删除
+ * 11.3.4设备导入--删除（按详情）
  */
 export const deviceAuth_delete = (data) =>
   setRequest("deviceAuth/delete", data);
 /**
- * 11.3.4.2设备导入--批量删除
+ * 11.3.4.2设备导入--批量删除（按详情）
  */
 export const deviceAuth_batch_delete = (data) =>
   setRequest("deviceAuth/batch_delete", data);
 /**
- * 11.3.4.2设备导入--批量删除
+ * 11.3.5设备导入--导入
  */
 export const deviceAuth_import = (data) =>
   setRequest("deviceAuth/import", data);
+/**
+ * 11.3.6设备导入--详情（按批次）
+ */
+export const deviceAuth_list_sn = (data) =>
+  setRequest("deviceAuth/list_sn", data);
+/**
+ * 11.3.7设备导入--删除（按批次）
+ */
+export const deviceAuth_delete_db = (data) =>
+  setRequest("deviceAuth/delete_db", data);

src/views/platformSection/deviceImport/batch.vue

@@ -0,0 +1,475 @@
+<template>
+  <div>
+    <div class="search_header">
+      <div class="search_left">
+        <Select
+          v-model="searchForm.regionid"
+          :transfer="true"
+          @on-change="searchList()"
+          style="margin-right: 16px; width: 150px"
+        >
+          <Option :value="0">所有区域</Option>
+          <Option
+            v-for="regionItem in searchForm.regionList"
+            :value="regionItem.regionid"
+            :key="regionItem.regionid"
+            >{{ regionItem.regionName }}</Option
+          >
+        </Select>
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :transfer="true"
+          type="daterange"
+          placeholder="请选择年月日进行搜索"
+          style="width: 220px"
+        ></DatePicker>
+      </div>
+      <div class="search_right">
+        <Button type="primary" class="primary_btn" @click="toImport()"
+          >导入</Button
+        >
+      </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 class="action_del" @click="toDel(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="importInfo.show"
+      title="导入"
+    >
+      <Form
+        v-if="importInfo.show"
+        ref="importForm"
+        :model="importInfo"
+        :rules="rules"
+        :label-width="100"
+      >
+        <FormItem label="所属区域" prop="regionid">
+          <Select
+            :transfer="true"
+            v-model="importInfo.regionid"
+            placeholder="请选择所属区域"
+          >
+            <Option
+              v-for="regionItem in searchForm.regionList"
+              :value="regionItem.regionid"
+              :key="regionItem.regionid"
+              >{{ regionItem.regionName }}</Option
+            >
+          </Select>
+        </FormItem>
+        <FormItem label="上传文件" class="require">
+          <div style="display: flex">
+            <Upload
+              action
+              :show-upload-list="false"
+              :before-upload="
+                (file) => {
+                  upLoadExcel(file);
+                  return false;
+                }
+              "
+              accept=".xlsx,.xls"
+            >
+              <Button type="primary" class="primary_btn">上传excel</Button>
+            </Upload>
+            <div style="margin-left: 16px; color: #7c8db5">
+              支持格式：xlsx/xls文件
+            </div>
+          </div>
+          <div v-if="importInfo.file">{{ importInfo.file.name }}</div>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button @click="importInfo.show = false">取消</Button>
+        <Button @click="saveFileInfo()" type="primary" class="primary_btn"
+          >保存</Button
+        >
+      </div>
+    </Modal>
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="viewInfo.show"
+      title="查看"
+    >
+      <div class="view_title">{{ viewInfo.regionName }}</div>
+      <div class="view_main">
+        <div
+          class="sn_item"
+          v-for="(snItem, snIndex) in viewInfo.snList"
+          :key="snIndex"
+        >
+          {{ snItem }}
+        </div>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="viewInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="importErrorInfo.show"
+      title="提示"
+    >
+      <div
+        style="margin-bottom: 16px; font-size: 18px"
+        v-if="importErrorInfo.snDuplicate.length > 0"
+      >
+        以下SN重复：
+      </div>
+      <div
+        style="margin-bottom: 16px; font-size: 18px"
+        v-if="
+          importErrorInfo.snDuplicate.length === 0 &&
+          importErrorInfo.snExisted.length > 0
+        "
+      >
+        以下SN已存在：
+      </div>
+      <div class="view_main" v-if="importErrorInfo.snDuplicate.length > 0">
+        <div
+          class="sn_item"
+          v-for="(snItem, snIndex) in importErrorInfo.snDuplicate"
+          :key="snIndex"
+        >
+          {{ snItem }}
+        </div>
+      </div>
+      <div
+        class="view_main"
+        v-if="
+          importErrorInfo.snDuplicate.length === 0 &&
+          importErrorInfo.snExisted.length > 0
+        "
+      >
+        <div
+          class="sn_item"
+          v-for="(snItem, snIndex) in importErrorInfo.snExisted"
+          :key="snIndex"
+        >
+          {{ snItem }}
+        </div>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="importErrorInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { region_list_sel_pt } from "@/api/region";
+import {
+  deviceAuth_list_batch,
+  deviceAuth_delete_db,
+  deviceAuth_import,
+  deviceAuth_list_sn
+} from "@/api/device_manager";
+import { dateFormat } from "@/utils";
+export default {
+  data() {
+    return {
+      dateFormat,
+      rules: {
+        regionid: [
+          {
+            required: true,
+            type: "number",
+            message: "请选择所属区域",
+            trigger: "change"
+          }
+        ]
+      },
+      searchForm: {
+        regionid: 0,
+        regionList: [],
+        dataRange: [],
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      viewInfo: {
+        show: false,
+        regionName: null,
+        snList: []
+      },
+      importInfo: {
+        show: false,
+        regionid: null,
+        file: null
+      },
+      importErrorInfo: {
+        show: false,
+        // 重复SN列表
+        snDuplicate: [],
+        // 已存在SN列表
+        snExisted: []
+      },
+      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: "createtime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "导入数量",
+          key: "importNum",
+          align: "center"
+        },
+        {
+          title: "操作人",
+          key: "updatename",
+          align: "center"
+        },
+        {
+          title: "操作时间",
+          key: "updatetime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 130,
+          align: "center"
+        }
+      ]
+    };
+  },
+  created() {
+    this.getRegionList();
+    this.searchList();
+  },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
+  methods: {
+    // 获取搜索区域列表
+    getRegionList() {
+      region_list_sel_pt({}).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.regionList = data.obj;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 搜索
+    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;
+      deviceAuth_list_batch({
+        rtype: this.powerParams.rtype,
+        regionid: this.searchForm.regionid,
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        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);
+        }
+      });
+    },
+    toImport() {
+      this.importInfo = {
+        show: true,
+        regionid: null,
+        file: null
+      };
+    },
+    upLoadExcel(file) {
+      this.importInfo.file = null;
+      let str = file.name.split(".");
+      let suffix = str[str.length - 1];
+      suffix = suffix.toLowerCase();
+      if (suffix !== "xlsx" && suffix !== "xls") {
+        this.$Message.warning("文件格式不正确");
+        return;
+      }
+      this.importInfo.file = file;
+    },
+    saveFileInfo() {
+      this.$refs.importForm.validate((valid) => {
+        if (valid) {
+          if (!this.importInfo.file) {
+            this.$Message.error("请上传文件");
+            return;
+          }
+          this.importInfo.show = false;
+          let formData = new FormData();
+          formData.append("file", this.importInfo.file);
+          formData.append("regionid", this.importInfo.regionid);
+          deviceAuth_import(formData).then((data) => {
+            if (data.code === 0) {
+              if (data.obj.code === 1) {
+                this.importErrorInfo = {
+                  show: true,
+                  // 重复SN列表
+                  snDuplicate: data.obj.snDuplicate || [],
+                  // 已存在SN列表
+                  snExisted: data.obj.snExisted || []
+                };
+              } else {
+                this.searchList();
+                this.$Message.success(data.msg);
+              }
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        }
+      });
+    },
+    toView(row) {
+      this.viewInfo = {
+        show: true,
+        regionName: row.regionName,
+        snList: []
+      };
+      deviceAuth_list_sn({
+        dbid: row.dbid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.viewInfo.snList = data.obj;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 删除
+    toDel(row) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: `您确定要批量删除 ${row.importNum} 条数据吗？`,
+        onOk: () => {
+          deviceAuth_delete_db({
+            rtype: this.powerParams.rtype,
+            dbid: row.dbid
+          }).then((data) => {
+            if (data.code === 0) {
+              this.searchList();
+              this.$Message.success(data.msg);
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        },
+        onCancel: () => {}
+      });
+    }
+  }
+};
+</script>
+
+<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;
+  }
+  .search_right {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .primary_btn {
+      margin-left: 16px;
+    }
+  }
+}
+.view_title {
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
+}
+.view_main {
+  display: flex;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+  .sn_item {
+    margin-top: -1px;
+    margin-left: -1px;
+    padding: 0 4px;
+    width: 25%;
+    font-size: 16px;
+    line-height: 30px;
+    text-align: center;
+    word-break: break-all;
+    border: 1px solid #ced9f2;
+  }
+}
+</style>

src/views/platformSection/deviceImport/detail.vue

@@ -0,0 +1,428 @@
+<template>
+  <div>
+    <div class="search_header">
+      <div class="search_left">
+        <Select
+          v-model="searchForm.regionid"
+          @on-change="searchList()"
+          style="margin-right: 16px; width: 150px"
+        >
+          <Option :value="0">所有区域</Option>
+          <Option
+            v-for="regionItem in searchForm.regionList"
+            :value="regionItem.regionid"
+            :key="regionItem.regionid"
+            >{{ regionItem.regionName }}</Option
+          >
+        </Select>
+        <Select
+          v-model="searchForm.snState"
+          @on-change="searchList()"
+          style="margin-right: 16px; width: 150px"
+        >
+          <Option :value="-1">所有状态</Option>
+          <Option :value="0">正常</Option>
+          <Option :value="1">注销</Option>
+        </Select>
+        <Input
+          v-model="searchForm.sn"
+          placeholder="请输入序列号模糊搜索"
+          search
+          @on-search="searchList()"
+          style="width: 200px"
+        />
+      </div>
+      <div class="search_right">
+        <Button type="primary" class="primary_btn" @click="toAdd()"
+          >新建</Button
+        >
+        <Button type="primary" class="primary_btn" @click="toBatchDelete()"
+          >批量删除</Button
+        >
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table
+        :columns="columns"
+        :data="searchForm.list"
+        @on-selection-change="tableSelectionChange"
+      >
+        <template slot-scope="{ row }" slot="snStateSlot">
+          <div class="action_list">
+            <div class="action_success" v-if="row.snState === 0">正常</div>
+            <div class="action_error" v-else-if="row.snState === 1">注销</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="actionSlot">
+          <div class="action_list">
+            <div @click="toEdit(row)">编辑</div>
+            <div class="action_del" @click="toDel(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="addInfo.show"
+      :title="addInfo.daid ? '编辑' : '新建'"
+    >
+      <Form
+        v-if="addInfo.show"
+        ref="addForm"
+        :model="addInfo"
+        :rules="rules"
+        :label-width="100"
+      >
+        <FormItem label="所属区域" prop="regionid">
+          <Select
+            :transfer="true"
+            v-model="addInfo.regionid"
+            placeholder="请选择所属区域"
+          >
+            <Option
+              v-for="regionItem in searchForm.regionList"
+              :value="regionItem.regionid"
+              :key="regionItem.regionid"
+              >{{ regionItem.regionName }}</Option
+            >
+          </Select>
+        </FormItem>
+        <FormItem label="SN序列号" prop="sn">
+          <Input v-model="addInfo.sn" placeholder="请输入SN序列号"></Input>
+        </FormItem>
+        <FormItem v-if="addInfo.daid" label="所属状态" prop="snState">
+          <RadioGroup v-model="addInfo.snState">
+            <Radio :label="0">正常</Radio>
+            <Radio :label="1">注销</Radio>
+          </RadioGroup>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button @click="addInfo.show = false">取消</Button>
+        <Button @click="saveAddInfo()" type="primary" class="primary_btn"
+          >保存</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { region_list_sel_pt } from "@/api/region";
+import {
+  deviceAuth_list,
+  deviceAuth_add,
+  deviceAuth_edit,
+  deviceAuth_delete,
+  deviceAuth_batch_delete
+} from "@/api/device_manager";
+export default {
+  data() {
+    return {
+      rules: {
+        regionid: [
+          {
+            required: true,
+            type: "number",
+            message: "请选择所属区域",
+            trigger: "change"
+          }
+        ],
+        sn: [
+          {
+            required: true,
+            message: "请输入SN序列号",
+            trigger: "change"
+          }
+        ],
+        snState: [
+          {
+            required: true,
+            type: "number",
+            message: "请选择所属状态",
+            trigger: "change"
+          }
+        ]
+      },
+      addInfo: {
+        daid: null,
+        rversion: null,
+        show: false,
+        regionid: null,
+        sn: null,
+        snState: null
+      },
+      searchForm: {
+        regionid: 0,
+        snState: -1,
+        regionList: [],
+        sn: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      // 批量删除
+      batchDeleteList: [],
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center"
+        },
+        {
+          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: "SN",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "状态",
+          slot: "snStateSlot",
+          width: 90,
+          align: "center"
+        },
+        {
+          title: "创建人",
+          key: "createname",
+          align: "center"
+        },
+        {
+          title: "创建时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "操作人",
+          key: "updatename",
+          align: "center"
+        },
+        {
+          title: "操作时间",
+          key: "updatetime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 130,
+          align: "center"
+        }
+      ]
+    };
+  },
+  created() {
+    this.getRegionList();
+    this.searchList();
+  },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
+  methods: {
+    // 获取搜索区域列表
+    getRegionList() {
+      region_list_sel_pt({}).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.regionList = data.obj;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 搜索
+    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();
+    },
+    tableSelectionChange(list) {
+      this.batchDeleteList = list.map((item) => {
+        return {
+          daid: item.daid
+        };
+      });
+    },
+    // 获取列表
+    getList() {
+      this.batchDeleteList = [];
+      deviceAuth_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.searchForm.regionid,
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        sn: this.searchForm.sn
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toAdd() {
+      this.addInfo = {
+        daid: null,
+        rversion: null,
+        show: true,
+        regionid: null,
+        sn: null,
+        snState: null
+      };
+    },
+    saveAddInfo() {
+      this.$refs.addForm.validate((valid) => {
+        if (valid) {
+          this.addInfo.show = false;
+          let api =
+            this.addInfo.daid && this.addInfo.rversion
+              ? deviceAuth_edit
+              : deviceAuth_add;
+          let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            regionid: this.addInfo.regionid,
+            sn: this.addInfo.sn
+          };
+          if (this.addInfo.daid && this.addInfo.rversion) {
+            form.daid = this.addInfo.daid;
+            form.snState = this.addInfo.snState;
+            form.rversion = this.addInfo.rversion;
+          }
+          api(form).then((data) => {
+            if (data.code === 0) {
+              this.searchList();
+              this.$Message.success(data.msg);
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        }
+      });
+    },
+    toEdit(row) {
+      this.addInfo = {
+        daid: row.daid,
+        rversion: row.rversion,
+        show: true,
+        regionid: row.regionid,
+        sn: row.sn,
+        snState: row.snState
+      };
+    },
+    // 删除
+    toDel(row) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: `您确定删除【${row.sn}】吗？`,
+        onOk: () => {
+          deviceAuth_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            daid: row.daid,
+            rversion: row.rversion
+          }).then((data) => {
+            if (data.code === 0) {
+              this.searchList();
+              this.$Message.success(data.msg);
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        },
+        onCancel: () => {}
+      });
+    },
+    toBatchDelete() {
+      if (this.batchDeleteList.length === 0) {
+        this.$Message.error("请选择数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "提示",
+        content: `您确定要批量删除选中的 ${this.batchDeleteList.length} 条数据吗？`,
+        onOk: () => {
+          deviceAuth_batch_delete(this.batchDeleteList).then((data) => {
+            if (data.code === 0) {
+              this.searchList();
+              this.$Message.success(data.msg);
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        },
+        onCancel: () => {}
+      });
+    }
+  }
+};
+</script>
+
+<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;
+  }
+  .search_right {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .primary_btn {
+      margin-left: 16px;
+    }
+  }
+}
+</style>

src/views/platformSection/deviceImport/deviceImport.vue

@@ -1,521 +1,56 @@
 <template>
   <div class="main_root">
-    <div class="search_header">
-      <div class="search_left">
-        <Select
-          v-model="searchForm.regionid"
-          style="margin-right: 16px; width: 150px"
-        >
-          <Option :value="0">所有区域</Option>
-          <Option
-            v-for="regionItem in searchForm.regionList"
-            :value="regionItem.regionid"
-            :key="regionItem.regionid"
-            >{{ regionItem.regionName }}</Option
-          >
-        </Select>
-        <Input
-          v-model="searchForm.sn"
-          placeholder="请输入序列号模糊搜索"
-          search
-          @on-search="searchList()"
-          style="width: 200px"
-        />
-      </div>
-      <div class="search_right">
-        <Button type="primary" class="primary_btn" @click="toImport()"
-          >导入</Button
-        >
-        <Button type="primary" class="primary_btn" @click="toAdd()"
-          >新建</Button
-        >
-        <Button type="primary" class="primary_btn" @click="toBatchDelete()"
-          >批量删除</Button
-        >
-      </div>
-    </div>
-    <div class="table_wrap">
-      <Table
-        :columns="columns"
-        :data="searchForm.list"
-        @on-selection-change="tableSelectionChange"
+    <div class="menu_info">
+      <div
+        :class="['menu_item', selectedMenu === 1 ? 'selected' : '']"
+        @click="selectedMenu = 1"
       >
-        <template slot-scope="{ row }" slot="snStateSlot">
-          <div class="action_list">
-            <div class="action_success" v-if="row.snState === 0">正常</div>
-            <div class="action_error" v-else-if="row.snState === 1">注销</div>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="actionSlot">
-          <div class="action_list">
-            <div @click="toEdit(row)">编辑</div>
-            <div class="action_del" @click="toDel(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="addInfo.show"
-      :title="addInfo.daid ? '编辑' : '新建'"
-    >
-      <Form
-        v-if="addInfo.show"
-        ref="addForm"
-        :model="addInfo"
-        :rules="rules"
-        :label-width="100"
-      >
-        <FormItem label="所属区域" prop="regionid">
-          <Select
-            :transfer="true"
-            v-model="addInfo.regionid"
-            placeholder="请选择所属区域"
-          >
-            <Option
-              v-for="regionItem in searchForm.regionList"
-              :value="regionItem.regionid"
-              :key="regionItem.regionid"
-              >{{ regionItem.regionName }}</Option
-            >
-          </Select>
-        </FormItem>
-        <FormItem label="SN序列号" prop="sn">
-          <Input v-model="addInfo.sn" placeholder="请输入SN序列号"></Input>
-        </FormItem>
-        <FormItem v-if="addInfo.daid" label="所属状态" prop="snState">
-          <RadioGroup v-model="addInfo.snState">
-            <Radio :label="0">正常</Radio>
-            <Radio :label="1">注销</Radio>
-          </RadioGroup>
-        </FormItem>
-      </Form>
-      <div slot="footer">
-        <Button @click="addInfo.show = false">取消</Button>
-        <Button @click="saveAddInfo()" type="primary" class="primary_btn"
-          >保存</Button
-        >
+        按批次
       </div>
-    </Modal>
-    <Modal
-      class="modal1"
-      :mask-closable="false"
-      v-model="importInfo.show"
-      title="导入"
-    >
-      <Form
-        v-if="importInfo.show"
-        ref="importForm"
-        :model="importInfo"
-        :rules="rules"
-        :label-width="100"
+      <div
+        :class="['menu_item', selectedMenu === 2 ? 'selected' : '']"
+        @click="selectedMenu = 2"
       >
-        <FormItem label="所属区域" prop="regionid">
-          <Select
-            :transfer="true"
-            v-model="importInfo.regionid"
-            placeholder="请选择所属区域"
-          >
-            <Option
-              v-for="regionItem in searchForm.regionList"
-              :value="regionItem.regionid"
-              :key="regionItem.regionid"
-              >{{ regionItem.regionName }}</Option
-            >
-          </Select>
-        </FormItem>
-        <FormItem label="上传文件" class="require">
-          <div style="display: flex">
-            <Upload
-              action
-              :show-upload-list="false"
-              :before-upload="
-                (file) => {
-                  upLoadExcel(file);
-                  return false;
-                }
-              "
-              accept=".xlsx,.xls"
-            >
-              <Button type="primary" class="primary_btn">上传excel</Button>
-            </Upload>
-            <div style="margin-left: 16px; color: #7c8db5">
-              支持格式：xlsx/xls文件
-            </div>
-          </div>
-          <div v-if="importInfo.file">{{ importInfo.file.name }}</div>
-        </FormItem>
-      </Form>
-      <div slot="footer">
-        <Button @click="importInfo.show = false">取消</Button>
-        <Button @click="saveFileInfo()" type="primary" class="primary_btn"
-          >保存</Button
-        >
+        按详情
       </div>
-    </Modal>
+    </div>
+    <Batch v-if="selectedMenu === 1"></Batch>
+    <Detail v-else-if="selectedMenu === 2"></Detail>
   </div>
 </template>
 
 <script>
-import { region_list_sel_pt } from "@/api/region";
-import {
-  deviceAuth_list,
-  deviceAuth_add,
-  deviceAuth_edit,
-  deviceAuth_delete,
-  deviceAuth_batch_delete,
-  deviceAuth_import
-} from "@/api/device_manager";
+import Batch from "./batch.vue";
+import Detail from "./detail.vue";
 export default {
+  components: {
+    Batch,
+    Detail
+  },
   data() {
     return {
-      rules: {
-        regionid: [
-          {
-            required: true,
-            type: "number",
-            message: "请选择所属区域",
-            trigger: "change"
-          }
-        ],
-        sn: [
-          {
-            required: true,
-            message: "请输入SN序列号",
-            trigger: "change"
-          }
-        ],
-        snState: [
-          {
-            required: true,
-            type: "number",
-            message: "请选择所属状态",
-            trigger: "change"
-          }
-        ]
-      },
-      addInfo: {
-        daid: null,
-        rversion: null,
-        show: false,
-        regionid: null,
-        sn: null,
-        snState: null
-      },
-      searchForm: {
-        regionid: 0,
-        regionList: [],
-        sn: "",
-        page: 1,
-        size: 10,
-        list: [],
-        total: 0
-      },
-      importInfo: {
-        show: false,
-        regionid: null,
-        file: null
-      },
-      // 批量删除
-      batchDeleteList: [],
-      columns: [
-        {
-          type: "selection",
-          width: 60,
-          align: "center"
-        },
-        {
-          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: "SN",
-          key: "sn",
-          align: "center"
-        },
-        {
-          title: "状态",
-          slot: "snStateSlot",
-          width: 90,
-          align: "center"
-        },
-        {
-          title: "创建人",
-          key: "createname",
-          align: "center"
-        },
-        {
-          title: "创建时间",
-          key: "createtime",
-          width: 190,
-          align: "center"
-        },
-        {
-          title: "操作人",
-          key: "updatename",
-          align: "center"
-        },
-        {
-          title: "操作时间",
-          key: "updatetime",
-          width: 190,
-          align: "center"
-        },
-        {
-          title: "操作",
-          slot: "actionSlot",
-          width: 130,
-          align: "center"
-        }
-      ]
+      selectedMenu: 1
     };
-  },
-  created() {
-    this.getRegionList();
-    this.searchList();
-  },
-  computed: {
-    powerParams() {
-      return this.$store.getters.powerParams;
-    }
-  },
-  methods: {
-    // 获取搜索区域列表
-    getRegionList() {
-      region_list_sel_pt({}).then((data) => {
-        if (data.code === 0) {
-          this.searchForm.regionList = data.obj;
-        } else {
-          this.$Message.error(data.msg);
-        }
-      });
-    },
-    // 搜索
-    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();
-    },
-    tableSelectionChange(list) {
-      this.batchDeleteList = list.map((item) => {
-        return {
-          daid: item.daid
-        };
-      });
-    },
-    // 获取列表
-    getList() {
-      this.batchDeleteList = [];
-      deviceAuth_list({
-        rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        regionid: this.searchForm.regionid,
-        page: this.searchForm.page,
-        size: this.searchForm.size,
-        sn: this.searchForm.sn
-      }).then((data) => {
-        if (data.code === 0) {
-          this.searchForm.list = data.obj.data;
-          this.searchForm.total = data.obj.total;
-        } else {
-          this.$Message.error(data.msg);
-        }
-      });
-    },
-    toImport() {
-      this.importInfo = {
-        show: true,
-        regionid: null,
-        file: null
-      };
-    },
-    upLoadExcel(file) {
-      this.importInfo.file = null;
-      let str = file.name.split(".");
-      let suffix = str[str.length - 1];
-      suffix = suffix.toLowerCase();
-      if (suffix !== "xlsx" && suffix !== "xls") {
-        this.$Message.warning("文件格式不正确");
-        return;
-      }
-      this.importInfo.file = file;
-    },
-    saveFileInfo() {
-      this.$refs.importForm.validate((valid) => {
-        if (valid) {
-          if (!this.importInfo.file) {
-            this.$Message.error("请上传文件");
-            return;
-          }
-          this.importInfo.show = false;
-          let formData = new FormData();
-          formData.append("file", this.importInfo.file);
-          formData.append("regionid", this.importInfo.regionid);
-          deviceAuth_import(formData).then((data) => {
-            if (data.code === 0) {
-              this.searchList();
-              this.$Message.success(data.msg);
-            } else {
-              this.$Message.error(data.msg);
-            }
-          });
-        }
-      });
-    },
-    toAdd() {
-      this.addInfo = {
-        daid: null,
-        rversion: null,
-        show: true,
-        regionid: null,
-        sn: null,
-        snState: null
-      };
-    },
-    saveAddInfo() {
-      this.$refs.addForm.validate((valid) => {
-        if (valid) {
-          this.addInfo.show = false;
-          let api =
-            this.addInfo.daid && this.addInfo.rversion
-              ? deviceAuth_edit
-              : deviceAuth_add;
-          let form = {
-            rtype: this.powerParams.rtype,
-            objectid: this.powerParams.objectid,
-            regionid: this.addInfo.regionid,
-            sn: this.addInfo.sn
-          };
-          if (this.addInfo.daid && this.addInfo.rversion) {
-            form.daid = this.addInfo.daid;
-            form.snState = this.addInfo.snState;
-            form.rversion = this.addInfo.rversion;
-          }
-          api(form).then((data) => {
-            if (data.code === 0) {
-              this.searchList();
-              this.$Message.success(data.msg);
-            } else {
-              this.$Message.error(data.msg);
-            }
-          });
-        }
-      });
-    },
-    toEdit(row) {
-      this.addInfo = {
-        daid: row.daid,
-        rversion: row.rversion,
-        show: true,
-        regionid: row.regionid,
-        sn: row.sn,
-        snState: row.snState
-      };
-    },
-    // 删除
-    toDel(row) {
-      this.$Modal.confirm({
-        title: "提示",
-        content: `您确定删除【${row.sn}】吗？`,
-        onOk: () => {
-          deviceAuth_delete({
-            rtype: this.powerParams.rtype,
-            objectid: this.powerParams.objectid,
-            daid: row.daid,
-            rversion: row.rversion
-          }).then((data) => {
-            if (data.code === 0) {
-              this.searchList();
-              this.$Message.success(data.msg);
-            } else {
-              this.$Message.error(data.msg);
-            }
-          });
-        },
-        onCancel: () => {}
-      });
-    },
-    toBatchDelete() {
-      if (this.batchDeleteList.length === 0) {
-        this.$Message.error("请选择数据");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "提示",
-        content: `您确定删除选中数据吗？`,
-        onOk: () => {
-          deviceAuth_batch_delete(this.batchDeleteList).then((data) => {
-            if (data.code === 0) {
-              this.searchList();
-              this.$Message.success(data.msg);
-            } else {
-              this.$Message.error(data.msg);
-            }
-          });
-        },
-        onCancel: () => {}
-      });
-    }
   }
 };
 </script>
 
 <style lang="less" scoped>
-.search_header {
+.menu_info {
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   align-items: center;
-  margin: 16px 16px;
-  .search_left {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-  }
-  .search_right {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    .primary_btn {
-      margin-left: 16px;
+  margin: 16px;
+  font-size: 16px;
+  color: #7c8db5;
+  .menu_item {
+    margin-right: 16px;
+    padding: 0 4px 6px;
+    border-bottom: 2px solid transparent;
+    cursor: pointer;
+    &.selected {
+      color: #339dff;
+      border-color: #339dff;
     }
   }
 }

src/views/schoolSection/networkManage/whitelist.vue

@@ -102,16 +102,27 @@
         <div>{{ viewInfo.whiteName }}</div>
         <div v-if="viewInfo.whiteType === 2" class="public">公用</div>
       </div>
-      <Input
-        v-if="viewInfo.comm"
-        v-model="viewInfo.comm"
-        disabled
-        type="textarea"
-      />
       <Form :label-width="46">
-        <FormItem label="网址" style="margin-bottom: 0; width: 100%">{{
-          viewInfo.website
-        }}</FormItem>
+        <FormItem
+          label="简介"
+          style="
+            margin-bottom: 0;
+            width: 100%;
+            word-break: break-all;
+            word-wrap: break-word;
+          "
+          >{{ viewInfo.comm }}</FormItem
+        >
+        <FormItem
+          label="网址"
+          style="
+            margin-bottom: 0;
+            width: 100%;
+            word-break: break-all;
+            word-wrap: break-word;
+          "
+          >{{ viewInfo.website }}</FormItem
+        >
       </Form>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>

src/views/schoolSection/setting/deviceSetting.vue

@@ -24,9 +24,9 @@
       <div class="require">
         学校强制绑定设备开关打开后，每个学生只能绑定一台设备，一旦和设备绑定将不能在其他设备上登录，需要更换设备时，需要管理员对该学生进行解绑操作。
       </div>
-      <div class="require">
+      <!-- <div class="require">
         SD卡功能设置开启后，该学校的所有设备SD功能均可使用，如果需要单独控制可以在设备管理中对单个设备进行开启或关闭操作。
-      </div>
+      </div> -->
       <div class="require">
         隐藏图库，相机开启后，该学校的所有设备桌面不再显示图库，相机。
       </div>