修改了T189，T317，157，ST51等问题

public/sceneview.html

@@ -39,7 +39,8 @@
                     creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
                 } else {
                     // creteIframe(arr[1])
-                    creteIframe(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${arr[1]}`)
+                    // creteIframe(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${arr[1]}`)
+                    creteIframe(`http://106.12.170.138:8080/onemapV5.0/sceneview.html?${arr[1]}`)
                 }
             }
         }

src/api/resource/plat.ts

@@ -137,6 +137,8 @@ export function platList(text) {
         ROLES: rolesId
     }
     const f = new URLSearchParams();
+    if (!text) text = { pageSize: 10, pageIndex: 1 };
+    text.pageIndex = (text.pageIndex - 1) * text.pageSize;
     f.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
     f.append("methodName", "getAllResourceByRootId");
     f.append("args[]", session.getItem('tokenV2'));

src/api/resource/updateExamine.ts

@@ -53,6 +53,7 @@ export const updateQueryTaskInfoPage = (params) => {
         defHttp.post({ url: Api.GetFlowInfoDB, params: params }).then((res) => {
             const result = res.resp_code === 0 ? res.datas : []
             result.items = result.pageData;
+            console.log(result)
             resolve(result)
         })
     })
@@ -73,6 +74,7 @@ export const updateQueryTaskYbInfoPage = (params) => {
         defHttp.post({ url: Api.GetFlowInfoYB, params: params }).then((res) => {
             const result = res.resp_code === 0 ? res.datas : [];
             result.items = result.pageData;
+            console.log(result)
             resolve(result)
         })
     })

src/views/dataAdmin/assembly/MapSourceModal.vue

@@ -50,7 +50,7 @@ export default defineComponent({
     const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
-      isView.value = !!data?.see || !!data?.isView;
+      isView.value = data.see;
       isUpdate.value ? formData.value = data.record : formData.value = null;
       activeKey.value = '1';
     });

src/views/dataAdmin/assembly/SourceDetail.vue

@@ -136,8 +136,8 @@ export default defineComponent({
       detail: props.formData,
       isUpdate: props.isUpdate,
       isView: props.isView,
-      // fileList: [],
     });
+
     var fileList = ref([]);
     var isViewImg = ref(false);
     var assemblyType = ref([
@@ -194,25 +194,25 @@ export default defineComponent({
       desc: [{ required: true, message: 'Please input activity form', trigger: 'blur' }],
     };
     const { createMessage } = useMessage();
-    watch(
-      () => props.formData,
-      (obj) => {
-        data.detail = obj;
-        console.log('组件formData', obj);
-        if (data.isUpdate) setFormData()
-      }
-    );
-    watch(
-      () => props.isUpdate,
-      (obj) => {
-        data.isUpdate = obj;
-        if (!data.isUpdate) resetForm()
+    watch(() => props.formData, (obj) => {
+      data.detail = obj;
+      if (data.isUpdate) setFormData()
+    });
+    watch(() => props.isUpdate, (obj) => {
+      data.isUpdate = obj;
+      if (!data.isUpdate && !props.isView) {
+        resetForm()
+      } else {
+        setFormData()
       }
-    );
+    });
     watch(
       () => props.isView,
       (obj) => {
         data.isView = obj;
+        if (data.isView != undefined && data.isView != null) {
+          setFormData()
+        }
       }
     );
     const submitForm = () => {

src/views/dataAdmin/assembly/index.vue

@@ -175,6 +175,7 @@ export default defineComponent({
     function handleCreate() {
       openModal(true, {
         isUpdate: false,
+        see: null
       });
     }
 
@@ -184,6 +185,7 @@ export default defineComponent({
       openModal(true, {
         record,
         isUpdate: true,
+        see: false
       });
     }
     //查看
@@ -192,7 +194,7 @@ export default defineComponent({
       openModal(true, {
         record,
         isUpdate: true,
-        see: true
+        see: true,
       });
     }
 

src/views/resource/examine/index.vue

@@ -42,6 +42,14 @@
         <template #FLOWNAME="{ record }">
           {{ record.FLOWNAME.replace('上传', '') }}
         </template>
+        <template #ISPASS="{ record }">
+          <a-tag
+            :style="`color:${record.ISPASS == '1' ? 'green' : 'red'};opacity:${(record.ISPASS === '1' || record.ISPASS === '0') ? '1' : '0'};`">
+            {{
+              record.ISPASS == '1' ? '通过' : record.ISPASS == '0' ? '不通过' : ''
+            }}
+          </a-tag>
+        </template>
         <template #status="{ record }">
           <a-tag :style="`color:${record.status === 3 || record.status === 3 ? 'red' : ''};`">
             {{
@@ -285,11 +293,13 @@ export default defineComponent({
     async function handleVliew(record: Recordable) {
       //场景资源
       if (current.value === 'ER') {
-        window.open(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${record.SERVICEID}`, 'target', '');
+        // window.open(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${record.SERVICEID}`, 'target', '');
+        window.open(`./sceneview.html?${record.SERVICEID}`, 'target', '');
       }
       //地图资源
       if (current.value === 'MR') {
-        window.open(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${record.SERVICEID}`, 'target', '');
+        // window.open(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${record.SERVICEID}`, 'target', '');
+        window.open(`./mapview.html?${record.SERVICEID}`, 'target', '');
       }
       //地图资源
       if (current.value === 'SR') {

src/views/resource/plat/index.vue

@@ -123,8 +123,18 @@ export default defineComponent({
               updateAction()
             }
           } else {
-            achieveList.value = r;
-            updateAction()
+            console.log(o, r)
+            if (o.isPage) {
+              var c = r.find(j => j.type == activeKey.value)
+              achieveList.value.forEach(i => {
+                if (i.type == activeKey.value) {
+                  i.items = c.items;
+                }
+              })
+            } else {
+              achieveList.value = r;
+              updateAction()
+            }
           }
         }
       });

src/views/resource/plat/item/child/MyPage.vue

@@ -30,18 +30,21 @@ export default defineComponent({
             eventBus.emit('platListCenter', {
                 pageSize: pageSize,
                 pageIndex: current,
+                isPage: true
             });
         };
         watch(pageSize, () => {
             eventBus.emit('platListCenter', {
                 pageSize: pageSize.value,
                 pageIndex: current1.value,
+                isPage: true
             });
         });
         watch(current1, () => {
             eventBus.emit('platListCenter', {
                 pageSize: pageSize.value,
                 pageIndex: current1.value,
+                isPage: true
             });
         });
         watch(() => props.total, (val) => total.value = val, {

src/views/resource/proxy/index.vue

@@ -11,20 +11,20 @@
       <BasicTable @register="registerTable" @fetch-success="onFetchSuccess">
         <template #toolbar>
           <Authority>
-            <a-button type="primary" @click="showModalBatch">指定IP设置</a-button>
+            <a-button type="primary" @click="showModalBatch">IP管理</a-button>
           </Authority>
         </template>
 
         <template #action="{ record }">
           <TableAction :actions="[
             {
-              label: '指定IP设置',
+              label: 'IP管理',
               onClick: showModal.bind(null, record),
             },
-            {
-              label: '删除',
-              onClick: handleDel.bind(null, record),
-            },
+            // {
+            //   label: '删除',
+            //   onClick: handleDel.bind(null, record),
+            // },
           ]" />
         </template>
       </BasicTable>
@@ -249,6 +249,7 @@ export default defineComponent({
 
     const disabled = ref(true);
     const showModal = (e) => {
+      console.log(e);
       visible.value = true;
       disabled.value = e ? true : false;
       if (e) {

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

@@ -87,12 +87,12 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '代理地址',
-    dataIndex: 'PUBLICCURL',
+    dataIndex: 'MAPINGURL',
     width: 160,
   },
   {
     title: '真实地址',
-    dataIndex: 'MAPINGURL',
+    dataIndex: 'PUBLICCURL',
     width: 160,
   },