学校-白名单

src/api/whiteLibrary.js

@@ -29,3 +29,23 @@ export const whiteLibrary_delete = (data) =>
  */
 export const whiteLibrary_detail = (data) =>
   setRequest("whiteLibrary/detail", data);
+/**
+ * 4.2.1白名单--管理列表
+ */
+export const white_list = (data) => setRequest("white/list", data);
+/**
+ * 4.2.2白名单--添加
+ */
+export const white_add = (data) => setRequest("white/add", data);
+/**
+ * 4.2.3白名单--更新
+ */
+export const white_edit = (data) => setRequest("white/edit", data);
+/**
+ * 4.2.4白名单--删除
+ */
+export const white_delete = (data) => setRequest("white/delete", data);
+/**
+ * 4.2.5白名单--详情
+ */
+export const white_detail = (data) => setRequest("white/detail", data);

src/views/schoolSection/networkManage/whitelist.vue

@@ -16,21 +16,24 @@
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="nameSlot">
           <div class="name_slot">
-            <div class="name_content" :title="row.name">{{ row.name }}</div>
-            <div v-if="row.wltype === 1" class="app_tag">APP</div>
-            <div v-else-if="row.wltype === 2" class="web_tag">网址</div>
+            <div class="name_content" :title="row.whiteName">
+              {{ row.whiteName }}
+            </div>
+            <div v-if="row.whiteType === 2" class="public_tag">公用</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="whiteAddressSlot">
-          <div class="white_address" :title="row.whiteAddress">
-            {{ row.whiteAddress }}
+          <div class="white_address" :title="row.website">
+            {{ row.website }}
           </div>
         </template>
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
-            <div @click="toView(row)">查看</div>
-            <div @click="toEdit(row)">编辑</div>
-            <div class="action_del" @click="toDel(row)">删除</div>
+            <div @click="toView(row)" v-if="row.whiteType !== 2">查看</div>
+            <div @click="toEdit(row)" v-if="row.whiteType !== 2">编辑</div>
+            <div class="action_del" @click="toDel(row)">
+              {{ row.whiteType === 2 ? "移除" : "删除" }}
+            </div>
           </div>
         </template>
       </Table>
@@ -52,57 +55,30 @@
     <Modal
       class="modal1"
       :mask-closable="false"
-      v-model="whiteLibraryInfo.show"
-      :title="whiteLibraryInfo.wlid ? '编辑' : '新建'"
+      v-model="whiteListInfo.show"
+      :title="whiteListInfo.whiteid ? '编辑' : '新建'"
     >
       <Form
-        v-if="whiteLibraryInfo.show"
+        v-if="whiteListInfo.show"
         ref="addForm"
-        :model="whiteLibraryInfo"
+        :model="whiteListInfo"
         :rules="rules"
         :label-width="90"
         inline
       >
-        <FormItem label="名称" prop="name" style="width: 100%">
+        <FormItem label="名称" prop="whiteName" style="width: 100%">
           <Input
-            v-model="whiteLibraryInfo.name"
+            v-model="whiteListInfo.whiteName"
             placeholder="请输入名称"
           ></Input>
         </FormItem>
-        <FormItem label="类型" prop="wltype" style="width: 100%">
-          <RadioGroup v-model="whiteLibraryInfo.wltype">
-            <Radio :label="1">APP</Radio>
-            <Radio :label="2">网址</Radio>
-          </RadioGroup>
-        </FormItem>
-        <template v-if="whiteLibraryInfo.wltype === 1">
-          <FormItem
-            label="版本名称"
-            prop="versionName"
-            style="width: calc(50% - 10px)"
-          >
-            <Input
-              v-model="whiteLibraryInfo.versionName"
-              placeholder="请输入版本名称"
-            ></Input>
-          </FormItem>
-          <FormItem label="包名" prop="website" style="width: calc(50% - 10px)">
-            <Input
-              v-model="whiteLibraryInfo.website"
-              placeholder="请输入包名"
-            ></Input>
-          </FormItem>
-        </template>
         <FormItem label="简介" prop="comm" style="width: 100%">
-          <Input
-            v-model="whiteLibraryInfo.comm"
-            placeholder="请输入简介"
-          ></Input>
+          <Input v-model="whiteListInfo.comm" placeholder="请输入简介"></Input>
         </FormItem>
-        <FormItem label="网址" prop="whiteAddress" style="width: 100%">
+        <FormItem label="网址" prop="website" style="width: 100%">
           <Input
             type="textarea"
-            v-model="whiteLibraryInfo.whiteAddress"
+            v-model="whiteListInfo.website"
             placeholder="请填写正确的IP地址或者域名，多个IP或域名之间用英文分号隔开"
           ></Input>
           <div style="color: #7c8db5">
@@ -111,7 +87,7 @@
         </FormItem>
       </Form>
       <div slot="footer">
-        <Button @click="whiteLibraryInfo.show = false">取消</Button>
+        <Button @click="whiteListInfo.show = false">取消</Button>
         <Button @click="saveAddInfo()" type="primary">保存</Button>
       </div>
     </Modal>
@@ -123,28 +99,18 @@
       title="查看"
     >
       <div class="view_title">
-        <div>{{ viewInfo.name }}</div>
-        <div v-if="viewInfo.wltype === 1" class="wltype_1">APP</div>
-        <div v-if="viewInfo.wltype === 2" class="wltype_2">网址</div>
+        <div>{{ viewInfo.whiteName }}</div>
+        <div v-if="viewInfo.whiteType === 2" class="public">公用</div>
       </div>
-      <Form :label-width="80" inline>
-        <template v-if="viewInfo.wltype === 1">
-          <FormItem
-            label="版本名称"
-            style="margin-bottom: 0; width: calc(50% - 10px)"
-            >{{ viewInfo.versionName }}</FormItem
-          >
-          <FormItem
-            label="包名"
-            style="margin-bottom: 0; width: calc(50% - 10px)"
-            >{{ viewInfo.website }}</FormItem
-          >
-        </template>
-        <FormItem label="简介" style="margin-bottom: 0; width: 100%">{{
-          viewInfo.comm
-        }}</FormItem>
+      <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.whiteAddress
+          viewInfo.website
         }}</FormItem>
       </Form>
       <div slot="footer" style="text-align: center">
@@ -156,68 +122,50 @@
 
 <script>
 import {
-  whiteLibrary_list,
-  whiteLibrary_add,
-  whiteLibrary_edit,
-  whiteLibrary_delete
+  white_list,
+  white_add,
+  white_edit,
+  white_delete
 } from "@/api/whiteLibrary";
 export default {
   data() {
     return {
       searchForm: {
-        name: "",
+        whiteName: "",
         page: 1,
         size: 10,
         list: [],
         total: 0
       },
       rules: {
-        name: [
+        whiteName: [
           {
             required: true,
             message: "请输入名称",
             trigger: "change"
           }
-        ],
-        wltype: [
-          {
-            required: true,
-            type: "number",
-            message: "请选择状态",
-            trigger: "change"
-          }
-        ],
-        versionName: [
-          {
-            required: true,
-            message: "请输入版本名称",
-            trigger: "change"
-          }
         ]
       },
       // 新建/编辑
-      whiteLibraryInfo: {
+      whiteListInfo: {
         show: false,
-        wlid: null,
+        whiteid: null,
         rversion: null,
-        name: "",
-        // 1app 2网页
-        wltype: 1,
+        whiteName: "",
+        // 1所有学校2指定学校
+        targetSchool: 2,
         website: "",
-        versionName: "",
+        regionid: null,
         comm: "",
-        whiteAddress: ""
+        schoolids: []
       },
       // 查看
       viewInfo: {
         show: false,
-        name: "",
-        // 1app 2网页
-        wltype: 1,
+        whiteName: "",
+        whiteType: "",
         website: "",
-        versionName: "",
-        comm: "",
-        whiteAddress: ""
+        comm: ""
       },
       columns: [
         {
@@ -234,20 +182,10 @@ export default {
           }
         },
         {
-          title: "应用名称",
+          title: "名称",
           slot: "nameSlot",
           align: "center"
         },
-        {
-          title: "版本名称",
-          key: "versionName",
-          align: "center"
-        },
-        {
-          title: "包名",
-          key: "website",
-          align: "center"
-        },
         {
           title: "网址",
           slot: "whiteAddressSlot",
@@ -296,10 +234,12 @@ export default {
     },
     // 获取列表
     getList() {
-      whiteLibrary_list({
+      console.warn("---注意替换regionid---->white_list");
+      white_list({
+        regionid: 11,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        name: this.searchForm.name
+        whiteName: this.searchForm.whiteName
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
@@ -311,41 +251,41 @@ export default {
     },
     // 新建
     toAdd() {
-      this.whiteLibraryInfo = {
+      console.warn("---注意替换regionid---schoolids->");
+      this.whiteListInfo = {
         show: true,
-        wlid: null,
+        whiteid: null,
         rversion: null,
-        name: "",
-        // 1app 2网页
-        wltype: 1,
+        whiteName: "",
+        // 1所有学校2指定学校
+        targetSchool: 2,
         website: "",
-        versionName: "",
+        regionid: 11,
         comm: "",
-        whiteAddress: ""
+        schoolids: [4]
       };
     },
     // 保存新建
     saveAddInfo() {
       this.$refs.addForm.validate((valid) => {
         if (valid) {
-          this.whiteLibraryInfo.show = false;
+          this.whiteListInfo.show = false;
           let api =
-            this.whiteLibraryInfo.wlid && this.whiteLibraryInfo.rversion
-              ? whiteLibrary_edit
-              : whiteLibrary_add;
+            this.whiteListInfo.whiteid && this.whiteListInfo.rversion
+              ? white_edit
+              : white_add;
           let form = {
-            name: this.whiteLibraryInfo.name,
-            wltype: this.whiteLibraryInfo.wltype,
-            comm: this.whiteLibraryInfo.comm,
-            whiteAddress: this.whiteLibraryInfo.whiteAddress
+            whiteName: this.whiteListInfo.whiteName,
+            targetSchool: this.whiteListInfo.targetSchool,
+            website: this.whiteListInfo.website,
+            comm: this.whiteListInfo.comm,
+            schoolids: this.whiteListInfo.schoolids
           };
-          if (this.whiteLibraryInfo.wltype === 1) {
-            form.website = this.whiteLibraryInfo.website;
-            form.versionName = this.whiteLibraryInfo.versionName;
-          }
-          if (this.whiteLibraryInfo.wlid && this.whiteLibraryInfo.rversion) {
-            form.wlid = this.whiteLibraryInfo.wlid;
-            form.rversion = this.whiteLibraryInfo.rversion;
+          if (this.whiteListInfo.whiteid && this.whiteListInfo.rversion) {
+            form.whiteid = this.whiteListInfo.whiteid;
+            form.rversion = this.whiteListInfo.rversion;
+          } else {
+            form.regionid = this.whiteListInfo.regionid;
           }
           api(form).then((data) => {
             if (data.code === 0) {
@@ -362,38 +302,38 @@ export default {
     toView(row) {
       this.viewInfo = {
         show: true,
-        name: row.name,
-        // 1app 2网页
-        wltype: row.wltype,
+        whiteName: row.whiteName,
+        whiteType: row.whiteType,
         website: row.website,
-        versionName: row.versionName,
-        comm: row.comm,
-        whiteAddress: row.whiteAddress
+        comm: row.comm
       };
     },
     // 编辑
     toEdit(row) {
-      this.whiteLibraryInfo = {
+      console.warn("---注意替换regionid-schoolids--->");
+      this.whiteListInfo = {
         show: true,
-        wlid: row.wlid,
+        whiteid: row.whiteid,
         rversion: row.rversion,
-        name: row.name,
-        // 1app 2网页
-        wltype: row.wltype,
+        whiteName: row.whiteName,
+        // 1所有学校2指定学校
+        targetSchool: 2,
         website: row.website,
-        versionName: row.versionName,
+        regionid: 11,
         comm: row.comm,
-        whiteAddress: row.whiteAddress
+        schoolids: [4]
       };
     },
     // 删除
     toDel(row) {
       this.$Modal.confirm({
         title: "提示",
-        content: "您确定删除选中数据吗？",
+        content: `确定要将“${row.whiteName}”从白名单中${
+          row.whiteType === 2 ? "移除" : "删除"
+        }？`,
         onOk: () => {
-          whiteLibrary_delete({
-            wlid: row.wlid,
+          white_delete({
+            whiteid: row.whiteid,
             rversion: row.rversion
           }).then((data) => {
             if (data.code === 0) {
@@ -431,17 +371,7 @@ export default {
   font-size: 18px;
   font-weight: bold;
   text-align: center;
-  .wltype_1 {
-    margin-left: 10px;
-    padding: 0 10px;
-    line-height: 20px;
-    color: #fff;
-    font-weight: normal;
-    font-size: 12px;
-    border-radius: 4px;
-    background: #7854f6;
-  }
-  .wltype_2 {
+  .public {
     margin-left: 10px;
     padding: 0 10px;
     line-height: 20px;
@@ -462,7 +392,7 @@ export default {
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  .app_tag {
+  .public_tag {
     margin-left: 4px;
     width: 32px;
     text-align: center;
@@ -472,16 +402,6 @@ export default {
     border-radius: 5px;
     background-color: #7854f6;
   }
-  .web_tag {
-    margin-left: 4px;
-    width: 32px;
-    text-align: center;
-    color: #fff;
-    line-height: 1.6;
-    font-size: 12px;
-    border-radius: 5px;
-    background-color: #52c41a;
-  }
 }
 .white_address {
   max-width: 100%;

src/views/schoolSection/networkManage/whitelistLibrary.vue

@@ -142,15 +142,23 @@ export default {
     },
     // 添加到白名单
     addToWhitelist(row) {
-      whiteLibrary_add_white({
-        wlid: row.wlid,
-        regionid: row.regionid
-      }).then((data) => {
-        if (data.code === 0) {
-          this.searchList();
-        } else {
-          this.$Message.error(data.msg);
-        }
+      console.warn("---注意替换regionid---->whiteLibrary_add_white");
+      this.$Modal.confirm({
+        title: "提示",
+        content: `确定要将“${row.name}”加到白名单？`,
+        onOk: () => {
+          whiteLibrary_add_white({
+            wlid: row.wlid,
+            regionid: 11
+          }).then((data) => {
+            if (data.code === 0) {
+              this.$Message.success(data.msg);
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        },
+        onCancel: () => {}
       });
     }
   }