代理中心问题修改

.env.development

@@ -11,8 +11,8 @@ VITE_GLOB_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://192.168.2.225/api"]]
 
 # 线上演示环境
-# VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
-VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
+VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
+# VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:20043"],["/agent","http://127.0.0.1:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:8008"],["/agent","http://127.0.0.1:8008"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]

src/api/resource/proxy.ts

@@ -27,7 +27,9 @@ export function getProxyList(params) {
                 if (r.resp_code == 0) {
                     console.log("代理中心数据:", r.datas);
                     r.datas[params.serviceType].items = r.datas[params.serviceType].pageData
-                    resolve(r.datas[params.serviceType]);
+                    var list = r.datas[params.serviceType];
+                    list.items.forEach(i => i.id = i.SERVICEID);
+                    resolve(list);
                 }
             })
     })
@@ -54,6 +56,12 @@ export function proxyDel(params) {
  * @description:保存修改代理中心
  */
 export function proxySave(params) {
-    return defHttp.post({ url: Api.proxySave, params: { mapServerProxy: [params] }, ...interfaceType })
+    var list = null;
+    if (params.serviceid.indexOf(",") > -1) {
+        list = params.serviceid.split(',').map(i => { return { serviceid: i, ipaddress: params.ipaddress } });
+    } else {
+        list = [params]
+    }
+    return defHttp.post({ url: Api.proxySave, params: { mapServerProxy: list }, ...interfaceType })
 }
 

src/views/interface/item/AssemblyData.vue

@@ -9,7 +9,8 @@
             <div class="item-top">
               <div class="title">{{ i.name }}</div>
               <div class="opts-btn">
-                <div class="add-library btn" @click="applyWay(i)">加入申请库</div>
+                <div class="add-library btn" v-if="i.status2 == '0'" @click="applyWay(i)">加入申请库</div>
+                <div class="add-library btn" v-else style="color: #333;">已加入申请库</div>
                 <div class="interface-details btn" @click="showDrawer(i)">查看详情</div>
               </div>
             </div>
@@ -108,6 +109,7 @@ export default defineComponent({
         // eventBus.emit("interfaceNum", e);
         total.value = e.totalNum;
         list.value = e.list;
+        console.log("接口list:", list.value)
       })
     }
     //根据关键字查询接口列表
@@ -168,6 +170,7 @@ export default defineComponent({
         if (r.datas && r.resp_code == 0) {
           message.success('申请成功');
           searchRef.value.getResData();
+          getGroupIdList()
         }
       })
     }

src/views/resource/proxy/index.vue

@@ -11,7 +11,7 @@
       <BasicTable @register="registerTable" @fetch-success="onFetchSuccess">
         <template #toolbar>
           <Authority>
-            <a-button type="primary" @click="showModal">指定IP设置</a-button>
+            <a-button type="primary" @click="showModalBatch">指定IP设置</a-button>
           </Authority>
         </template>
 
@@ -74,7 +74,7 @@ export default defineComponent({
     const currRoute = currentRoute.value;
     let current = ref(currRoute?.query?.type || 'MR');
     let statusShow = ref(1);
-    const [registerTable, { getSelectRows, setProps, reload, setSelectedRowKeys, getDataSource }] = useTable({
+    const [registerTable, { getSelectRows, setProps, reload, setSelectedRowKeys, getDataSource, getSelectRowKeys }] = useTable({
       title: '地图资源审核列表',
       api: (param) => {
         statusShow.value = param.checkStatus;
@@ -83,7 +83,8 @@ export default defineComponent({
       }, //求接口
       //dataSource: dataSources, //表格的数据
       columns,
-      rowKey: (record) => record.BUSSID,
+      // rowKey: (record) => record.SERVICEID,
+      rowKey: 'id',
       formConfig: {
         labelWidth: 90,
         schemas: searchFormSchemaMR,
@@ -101,7 +102,7 @@ export default defineComponent({
       },
       pagination: {
         hideOnSinglePage: false,
-        pageSize: 10,
+        // pageSize: 10,
       },
       clickToRowSelect: true, //点击当前行多选框不选中,默认是true
       rowSelection: { type: 'checkbox' }, //是否有多选功能
@@ -206,7 +207,13 @@ export default defineComponent({
      */
     async function handleDel(record: Recordable) {
       console.log(record);
-      proxyDel(record).then((r) => {
+      record.serviceid = record.SERVICEID;
+      record.ipaddress = record.IPS
+      proxyDel({
+        serviceid: record.SERVICEID,  
+        serviceType: record.SERVICETYPE,
+        ipaddress: record.IPS
+      }).then((r) => {
         if (r) {
           message.success(r.resp_msg);
           reload();
@@ -249,6 +256,14 @@ export default defineComponent({
       }
     };
 
+    function showModalBatch() {
+      var list = getSelectRowKeys();
+      if (list.length) {
+        formState.value.serviceid = list.join(',');
+        visible.value = true;
+      }
+    };
+
     function handleOk() {
       proxySave(formState.value).then((r) => {
         if (r.resp_code == 0) {
@@ -257,6 +272,7 @@ export default defineComponent({
           formState.value.serviceid = '';
           message.success('保存成功');
           reload();
+          setSelectedRowKeys([]);
         } else {
           message.error(r.resp_msg);
         }
@@ -269,6 +285,7 @@ export default defineComponent({
 
 
     return {
+      showModalBatch,
       disabled,
       labelCol: { span: 2 },
       wrapperCol: { span: 6 },
@@ -344,6 +361,7 @@ export default defineComponent({
       border-radius: 2px;
       cursor: pointer;
     }
+
     .active {
       background: #0671dd;
       color: #fff;

src/views/resource/proxy/map.data.ts

@@ -97,7 +97,7 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    title: '限制制定IP',
+    title: '限制指定IP',
     dataIndex: 'IPS',
     width: 120,
   },