Преглед на файлове

冗余字段隐藏和代理中心列表页面修改

sujunling преди 1 година
родител
ревизия
7212849fe4

+ 4 - 17
src/views/dataAdmin/dataAdmin/mapUpload/SourceDetail.vue

@@ -106,11 +106,11 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :span="12" class="form-col">
+          <!-- <a-col :span="12" class="form-col">
             <a-form-item ref="sourcetable" label="数据表" name="sourcetable" class="label-form-item">
               <a-input v-model:value="formState.formdatabase" placeholder="请输入数据表" :disabled="isView" />
             </a-form-item>
-          </a-col>
+          </a-col> -->
 
           <a-col :span="12" class="form-col">
             <a-form-item ref="collect" label="管理部门" name="collect" class="label-form-item">
@@ -178,10 +178,8 @@
             </a-form-item>
           </a-col> -->
 
-          <a-col :span="5" class="form-col">
+          <!-- <a-col :span="5" class="form-col">
             <a-form-item ref="runtimestatus" label="运行状态" name="runtimestatus" class="label-form-item">
-              <!-- <a-switch checked-children="" un-checked-children="" v-model:checked="formState.runtimestatus"
-                :disabled="isView" /> -->
               <a-radio-group v-model:value="formState.runtimestatus" button-style="solid" :disabled="isView">
                 <a-radio-button :value="true">是</a-radio-button>
                 <a-radio-button :value="false">否</a-radio-button>
@@ -191,8 +189,6 @@
 
           <a-col :span="5" class="form-col">
             <a-form-item ref="public" label="是否公开" name="public" class="label-form-item">
-              <!-- <a-switch checked-children="" un-checked-children="" v-model:checked="formState.public"
-                :disabled="isView" /> -->
               <a-radio-group v-model:value="formState.public" button-style="solid" :disabled="isView">
                 <a-radio-button :value="true">是</a-radio-button>
                 <a-radio-button :value="false">否</a-radio-button>
@@ -200,10 +196,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="5" class="form-col">
-            <!-- <a-form-item ref="searched" label="是否共享" name="searched" class="label-form-item">
-              <a-switch checked-children="" un-checked-children="" v-model:checked="formState.searched" :disabled="isView" /> -->
             <a-form-item ref="searched" label="是否共享" name="searched" class="label-form-item">
-              <!-- <a-switch checked-children="" un-checked-children="" v-model:checked="formState.share" :disabled="isView" /> -->
               <a-radio-group v-model:value="formState.searched" button-style="solid" :disabled="isView">
                 <a-radio-button :value="true">是</a-radio-button>
                 <a-radio-button :value="false">否</a-radio-button>
@@ -212,8 +205,6 @@
           </a-col>
           <a-col :span="5" class="form-col">
             <a-form-item ref="externalApply" label="是否外部申请" name="externalApply" class="label-form-item">
-              <!-- <a-switch checked-children="" un-checked-children="" v-model:checked="formState.externalApply"
-                :disabled="isView" /> -->
               <a-radio-group v-model:value="formState.externalApply" button-style="solid" :disabled="isView">
                 <a-radio-button :value="true">是</a-radio-button>
                 <a-radio-button :value="false">否</a-radio-button>
@@ -221,17 +212,13 @@
             </a-form-item>
           </a-col>
           <a-col :span="4" class="form-col">
-            <!-- <a-form-item ref="share" label="是否展示" name="share" class="label-form-item">
-              <a-switch checked-children="" un-checked-children="" v-model:checked="formState.share" :disabled="isView" /> -->
             <a-form-item ref="share" label="是否展示" name="share" class="label-form-item">
-              <!-- <a-switch checked-children="" un-checked-children="" v-model:checked="formState.searched"
-                :disabled="isView" /> -->
               <a-radio-group v-model:value="formState.share" button-style="solid" :disabled="isView">
                 <a-radio-button :value="true">是</a-radio-button>
                 <a-radio-button :value="false">否</a-radio-button>
               </a-radio-group>
             </a-form-item>
-          </a-col>
+          </a-col> -->
 
           <!-- <a-col :span="6" class="form-col">
             <a-form-item

+ 24 - 18
src/views/resource/examine/index.vue

@@ -70,22 +70,14 @@
           }}
         </template> -->
       </BasicTable>
-      <!-- <check v-if="ischect" @register="registerModal" @success="handleSuccess" />
-      <map-resource-upload v-if="!ischect && current === 'MR'" @register="registerModal"
+      <check v-if="ischect" @register="registerModal" @success="handleSuccess" />
+      <map-resource-upload v-if="!ischect && current === 'MR'" @register="registerModalMR"
         @success="handleSuccess"></map-resource-upload>
-      <scene-resource-upload v-if="!ischect && current === 'ER'" @register="registerModal"
+      <scene-resource-upload v-if="!ischect && current === 'ER'" @register="registerModalER"
         @success="handleSuccess"></scene-resource-upload>
-      <file-resource-upload v-if="!ischect && current === 'DR'" @register="registerModal"
+      <file-resource-upload v-if="!ischect && current === 'DR'" @register="registerModalDR"
         @success="handleSuccess"></file-resource-upload>
-      <ass-resource-upload v-if="!ischect && current === 'SR'" @register="registerModal"
-        @success="handleSuccess"></ass-resource-upload> -->
-      <map-resource-upload v-if="current === 'MR'" @register="registerModal"
-        @success="handleSuccess"></map-resource-upload>
-      <scene-resource-upload v-if="current === 'ER'" @register="registerModal"
-        @success="handleSuccess"></scene-resource-upload>
-      <file-resource-upload v-if="current === 'DR'" @register="registerModal"
-        @success="handleSuccess"></file-resource-upload>
-      <ass-resource-upload v-if="current === 'SR'" @register="registerModal"
+      <ass-resource-upload v-if="!ischect && current === 'SR'" @register="registerModalSR"
         @success="handleSuccess"></ass-resource-upload>
     </div>
   </div>
@@ -138,7 +130,7 @@ export default defineComponent({
     const appStore = useAppStore();
     const { currentRoute } = useRouter();
     const currRoute = currentRoute.value;
-    let current = ref(currRoute?.query?.type || 'MR');
+    const current = ref(currRoute?.query?.type || 'MR');
     let statusShow = ref(1);
     const [registerTable, { getSelectRows, setProps, reload, setSelectedRowKeys, getDataSource }] = useTable({
       title: '地图资源审核列表',
@@ -210,6 +202,16 @@ export default defineComponent({
       // }
     };
     const [registerModal, { openModal }] = useModal();
+    const [registerModalMR, { openModal: openModalMR }] = useModal();
+    const [registerModalDR, { openModal: openModalDR }] = useModal();
+    const [registerModalER, { openModal: openModalER }] = useModal();
+    const [registerModalSR, { openModal: openModalSR }] = useModal();
+    var open = {
+      MR: openModalMR,
+      DR: openModalDR,
+      ER: openModalER,
+      SR: openModalSR,
+    }
     watch(
       () => current.value, (val) => {
         let searchFormSchema = searchFormSchemaMR;
@@ -257,7 +259,7 @@ export default defineComponent({
         }
         const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {});
         if (record.bussid) res.bussid = record.BUSSID;
-        openModal(true, {
+        open[current.value](true, {
           record: result,
           isUpdate: true,
           isView: true,
@@ -271,7 +273,7 @@ export default defineComponent({
      */
     async function handleEdit(record: Recordable) {
       ischect.value = true;
-      if(!record?.BUSSID) return;
+      if (!record?.BUSSID) return;
       // setTimeout(() => {
       //   openModal(true, {
       //     record,
@@ -285,7 +287,7 @@ export default defineComponent({
         if (res.dataVersionConf) {
           res.metadata.isnew = res.servicebase.isnew = res.dataVersionConf.active == 'Y' ? "1" : "0";
         }
-        const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {},{BUSSID:record?.BUSSID});
+        const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {}, { BUSSID: record?.BUSSID });
         if (record.bussid) res.bussid = record.BUSSID;
         openModal(true, {
           record: result,
@@ -379,13 +381,17 @@ export default defineComponent({
       ischect,
       sourceTypes,
       registerTable,
-      registerModal,
+      registerModalDR,
+      registerModalMR,
+      registerModalER,
+      registerModalSR,
       handleVliew,
       handleDetail,
       handleEdit,
       handleSuccess,
       RoleEnum,
       hasBatchDelete,
+      registerModal,
       handleDeleteOrBatchDelete,
       statusChange,
       batchExamine,

+ 2 - 4
src/views/resource/plat/item/child/DetailModal.vue

@@ -194,10 +194,9 @@
 
                 </div>
             </div>
-            <div class="public-set info-item">
+            <!-- <div class="public-set info-item">
                 <div class="info-title">共享设置</div>
                 <div class="form-box">
-                    <!-- 是否公开,是否共享 -->
                     <a-row>
                         <a-col :span="12">
                             <a-row>
@@ -216,7 +215,6 @@
                             </a-row>
                         </a-col>
                     </a-row>
-                    <!-- 外部申请,是否展示 -->
                     <a-row>
                         <a-col :span="12">
                             <a-row>
@@ -235,7 +233,7 @@
                         </a-col>
                     </a-row>
                 </div>
-            </div>
+            </div> -->
         </div>
     </a-modal>
 </template>

+ 7 - 2
src/views/resource/proxy/index.vue

@@ -14,7 +14,12 @@
             <a-button type="primary" @click="showModalBatch">IP管理</a-button>
           </Authority>
         </template>
-
+        <template #PUBLICCURL="{ record }">
+          {{ record.PUBLICCURL }}
+        </template>
+        <template #MAPINGURL="{ record }">
+          {{ record.MAPINGURL }}
+        </template>
         <template #action="{ record }">
           <TableAction :actions="[
             {
@@ -113,7 +118,7 @@ export default defineComponent({
       bordered: true,
       showIndexColumn: true,
       actionColumn: {
-        width: 200,
+        width: 50,
         title: '操作',
         dataIndex: 'action',
         slots: { customRender: 'action' },

+ 4 - 2
src/views/resource/proxy/map.data.ts

@@ -72,7 +72,7 @@ export const columns: BasicColumn[] = [
   {
     title: '资源类型',
     dataIndex: 'SERVICEID',
-    width: 90,
+    width: 70,
     // slots: { customRender: 'SERVICEID' },
     sorter: true,
     customRender: ({ record }) => {
@@ -83,16 +83,18 @@ export const columns: BasicColumn[] = [
   {
     title: '资源名称',
     dataIndex: 'SERVICENAME',
-    width: 160,
+    width: 120,
   },
   {
     title: '代理地址',
     dataIndex: 'PUBLICCURL',
+    slots: { customRender: 'PUBLICCURL' },
     width: 160,
   },
   {
     title: '真实地址',
     dataIndex: 'MAPINGURL',
+    slots: { customRender: 'MAPINGURL' },
     width: 160,
   },