区域白名单

src/views/regionSection/networkManage/whitelist.vue

@@ -22,6 +22,11 @@
             <div v-if="row.whiteType === 2" class="app_tag">公用</div>
           </div>
         </template>
+        <template slot-scope="{ row }" slot="website">
+          <div class="website" :title="row.website">
+            {{ row.website }}
+          </div>
+        </template>
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
@@ -154,12 +159,28 @@
         <div v-if="viewInfo.whiteType === 2" class="wltype_1">公共</div>
       </div>
       <Form :label-width="80" inline>
-        <FormItem label="简介" style="margin-bottom: 0; width: 100%">{{
-          viewInfo.comm
-        }}</FormItem>
-        <FormItem label="网址" style="margin-bottom: 0; width: 100%">{{
-          viewInfo.website
-        }}</FormItem>
+        <FormItem label="简介" style="margin-bottom: 0; width: 100%">
+          <div
+            style="
+              line-height: 36px;
+              word-wrap: break-word;
+              word-break: break-all;
+            "
+          >
+            {{ viewInfo.comm }}
+          </div></FormItem
+        >
+        <FormItem label="网址" style="margin-bottom: 0; width: 100%">
+          <div
+            style="
+              line-height: 36px;
+              word-wrap: break-word;
+              word-break: break-all;
+            "
+          >
+            {{ viewInfo.website }}
+          </div>
+        </FormItem>
         <FormItem label="授权" style="margin-bottom: 0; width: 100%">
           <Table border :columns="columns1" :data="viewInfo.schools"> </Table>
         </FormItem>
@@ -262,7 +283,7 @@ export default {
         },
         {
           title: "网址",
-          key: "website",
+          slot: "website",
           align: "center"
         },
         {
@@ -483,6 +504,7 @@ export default {
             targetSchool: res.obj.targetSchool,
             website: res.obj.website,
             regionid: res.obj.regionid,
+            whiteType: res.obj.whiteType,
             comm: res.obj.comm,
             schools: res.obj.schools
           };
@@ -704,4 +726,12 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.table_wrap {
+  .website {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
 </style>

src/views/regionSection/networkManage/whitelistLibrary.vue

@@ -10,7 +10,6 @@
           style="width: 150px"
         />
       </div>
-      <Button type="primary" class="primary_btn" @click="toAdd()">新建</Button>
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
@@ -46,119 +45,11 @@
         show-sizer
       ></Page>
     </div>
-    <!-- 新建/编辑 -->
-    <Modal
-      class="modal1"
-      :mask-closable="false"
-      v-model="whiteLibraryInfo.show"
-      :title="whiteLibraryInfo.whiteid ? '编辑' : '新建'"
-    >
-      <Form
-        v-if="whiteLibraryInfo.show"
-        ref="addForm"
-        :model="whiteLibraryInfo"
-        :rules="rules"
-        :label-width="90"
-        inline
-      >
-        <FormItem label="名称" prop="name" style="width: 100%">
-          <Input
-            v-model="whiteLibraryInfo.name"
-            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>
-        </FormItem>
-        <FormItem label="网址" prop="whiteAddress" style="width: 100%">
-          <Input
-            type="textarea"
-            v-model="whiteLibraryInfo.whiteAddress"
-            placeholder="请填写正确的IP地址或者域名，多个IP或域名之间用英文分号隔开"
-          ></Input>
-          <div style="color: #7c8db5">
-            说明：IP例如：192.168.1.200或者192.168.1.200/24，域名例如：new.iflytek.com
-          </div>
-        </FormItem>
-      </Form>
-      <div slot="footer">
-        <Button @click="whiteLibraryInfo.show = false">取消</Button>
-        <Button @click="saveAddInfo()" type="primary">保存</Button>
-      </div>
-    </Modal>
-    <!-- 查看 -->
-    <Modal
-      class="modal1"
-      :mask-closable="false"
-      v-model="viewInfo.show"
-      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>
-      <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>
-        <FormItem label="网址" style="margin-bottom: 0; width: 100%">{{
-          viewInfo.whiteAddress
-        }}</FormItem>
-      </Form>
-      <div slot="footer" style="text-align: center">
-        <Button @click="viewInfo.show = false">关闭</Button>
-      </div>
-    </Modal>
   </div>
 </template>
 
 <script>
-import {
-  whiteLibrary_list,
-  whiteLibrary_add,
-  whiteLibrary_edit,
-  whiteLibrary_delete, whiteLibrary_add_white
-} from "@/api/whiteLibrary";
+import { whiteLibrary_list, whiteLibrary_add_white } from "@/api/whiteLibrary";
 export default {
   data() {
     return {
@@ -169,54 +60,6 @@ export default {
         list: [],
         total: 0
       },
-      rules: {
-        name: [
-          {
-            required: true,
-            message: "请输入名称",
-            trigger: "change"
-          }
-        ],
-        wltype: [
-          {
-            required: true,
-            type: "number",
-            message: "请选择状态",
-            trigger: "change"
-          }
-        ],
-        versionname: [
-          {
-            required: true,
-            message: "请输入版本名称",
-            trigger: "change"
-          }
-        ]
-      },
-      // 新建/编辑
-      whiteLibraryInfo: {
-        show: false,
-        whiteid: null,
-        rversion: null,
-        name: "",
-        // 1app 2网页
-        wltype: 1,
-        website: "",
-        versionname: "",
-        comm: "",
-        whiteAddress: ""
-      },
-      // 查看
-      viewInfo: {
-        show: false,
-        name: "",
-        // 1app 2网页
-        wltype: 1,
-        website: "",
-        versionname: "",
-        comm: "",
-        whiteAddress: ""
-      },
       userInfo: {},
       columns: [
         {
@@ -242,11 +85,6 @@ export default {
           key: "versionName",
           align: "center"
         },
-        {
-          title: "版本号",
-          key: "rversion",
-          align: "center"
-        },
         {
           title: "包名",
           key: "website",
@@ -305,7 +143,6 @@ export default {
       }).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);