Merge branch 'master' of http://221.182.8.141:11666/sujunlin/xld-gis-admin

index.html

@@ -21,6 +21,14 @@
       color: #555555 !important;
     }
 
+    .vben-menu-dark.vben-menu-vertical .vben-menu-item:hover,
+    .vben-menu-dark.vben-menu-vertical .vben-menu-submenu-title:hover {
+      color: #fff;
+      background: url('./static/img/menuBg.jpg')no-repeat;
+      background-size: 170px 50px;
+      color: #377dff !important;
+    }
+
     #account:-webkit-autofill {
       -webkit-text-fill-color: white !important;
       background: transparent;

src/views/assembly/item/child/Search.vue

@@ -94,6 +94,7 @@ export default defineComponent({
 
         function handleChange(value: string) {
             console.log(value);
+            parentSetup.getDataList({ sqkzt: value, filterValue: key.value })
         }
 
         return {

src/views/dataAdmin/dataAdmin/fileResourceUpload/fileUploadData.js

@@ -372,38 +372,38 @@ export const accountFormSchema = [
     required: false,
     component: 'Input',
   },
-  {
-    field: 'vid',
-    label: '版本',
-    component: 'Select',
-    colProps: { span: 8 },
-    componentProps: {
-      maxTagCount: 10,
-      options: versionList,
-    },
-  },
-  {
-    field: 'versionNum',
-    label: '版本号',
-    component: 'Input',
-    colProps: { span: 8 },
-    componentProps: {
-      placeholder: '请输入版本号',
-    },
-  },
-  {
-    field: 'isnew',
-    label: "是否最新版本", //状态
-    component: 'RadioButtonGroup',
-    colProps: { span: 8 },
-    defaultValue: '0',
-    componentProps: {
-      options: [
-        { label: "是", value: '1' },
-        { label: "否", value: '0' },
-      ],
-    },
-  },
+  // {
+  //   field: 'vid',
+  //   label: '版本',
+  //   component: 'Select',
+  //   colProps: { span: 8 },
+  //   componentProps: {
+  //     maxTagCount: 10,
+  //     options: versionList,
+  //   },
+  // },
+  // {
+  //   field: 'versionNum',
+  //   label: '版本号',
+  //   component: 'Input',
+  //   colProps: { span: 8 },
+  //   componentProps: {
+  //     placeholder: '请输入版本号',
+  //   },
+  // },
+  // {
+  //   field: 'isnew',
+  //   label: "是否最新版本", //状态
+  //   component: 'RadioButtonGroup',
+  //   colProps: { span: 8 },
+  //   defaultValue: '0',
+  //   componentProps: {
+  //     options: [
+  //       { label: "是", value: '1' },
+  //       { label: "否", value: '0' },
+  //     ],
+  //   },
+  // },
 ]
 
 

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

src/views/dataAdmin/dataAdmin/sceneResourceUpload/sceneUploadData.js

@@ -441,57 +441,57 @@ export const accountFormSchema = [
   //   },
   // },
 
-  {
-    field: 'runtimestatus',
-    label: "运行状态", //状态
-    component: 'RadioButtonGroup',
-    colProps: { span: 12 },
-    defaultValue: 1,
-    componentProps: {
-      options: [
-        { label: "是", value: 1 }, //启用
-        { label: "否", value: 0 }, //禁用
-      ],
-    },
-  },
-  {
-    field: 'ispublic',
-    label: "是否公开", //状态
-    component: 'RadioButtonGroup',
-    colProps: { span: 8 },
-    defaultValue: '1',
-    componentProps: {
-      options: [
-        { label: "是", value: '1' }, //启用
-        { label: "否", value: '0' }, //禁用
-      ],
-    },
-  },
-  {
-    field: 'searched',
-    label: "是否共享", //状态
-    component: 'RadioButtonGroup',
-    colProps: { span: 8 },
-    defaultValue: '1',
-    componentProps: {
-      options: [
-        { label: "是", value: '1' }, //启用
-        { label: "否", value: '0' }, //禁用
-      ],
-    },
-  },
+  // {
+  //   field: 'runtimestatus',
+  //   label: "运行状态", //状态
+  //   component: 'RadioButtonGroup',
+  //   colProps: { span: 12 },
+  //   defaultValue: 1,
+  //   componentProps: {
+  //     options: [
+  //       { label: "是", value: 1 }, //启用
+  //       { label: "否", value: 0 }, //禁用
+  //     ],
+  //   },
+  // },
+  // {
+  //   field: 'ispublic',
+  //   label: "是否公开", //状态
+  //   component: 'RadioButtonGroup',
+  //   colProps: { span: 8 },
+  //   defaultValue: '1',
+  //   componentProps: {
+  //     options: [
+  //       { label: "是", value: '1' }, //启用
+  //       { label: "否", value: '0' }, //禁用
+  //     ],
+  //   },
+  // },
+  // {
+  //   field: 'searched',
+  //   label: "是否共享", //状态
+  //   component: 'RadioButtonGroup',
+  //   colProps: { span: 8 },
+  //   defaultValue: '1',
+  //   componentProps: {
+  //     options: [
+  //       { label: "是", value: '1' }, //启用
+  //       { label: "否", value: '0' }, //禁用
+  //     ],
+  //   },
+  // },
 
-  {
-    field: 'isShow',
-    label: "是否展示", //状态
-    component: 'RadioButtonGroup',
-    colProps: { span: 8 },
-    defaultValue: '1',
-    componentProps: {
-      options: [
-        { label: "是", value: '1' }, //启用
-        { label: "否", value: '0' }, //禁用
-      ],
-    },
-  },
+  // {
+  //   field: 'isShow',
+  //   label: "是否展示", //状态
+  //   component: 'RadioButtonGroup',
+  //   colProps: { span: 8 },
+  //   defaultValue: '1',
+  //   componentProps: {
+  //     options: [
+  //       { label: "是", value: '1' }, //启用
+  //       { label: "否", value: '0' }, //禁用
+  //     ],
+  //   },
+  // },
 ]

src/views/resource/examine/check.vue

@@ -1,14 +1,16 @@
 <template>
-  <div style="height: 80px;">
+  <BasicModal title="审核管理" @register="registerModal">
+    <div style="height: 80px;">
       <BasicForm @register="registerForm">
         <template #descinfo>
           <div class="basic-info-title">审核意见</div>
         </template>
       </BasicForm>
     </div>
+  </BasicModal>
 </template>
 <script lang="ts">
-import { defineComponent, ref, computed, unref, onMounted } from 'vue';
+import { defineComponent, ref, unref, onMounted } from 'vue';
 import { BasicModal, useModalInner } from '/@/components/Modal';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { accountFormSchema } from './map.data.ts';
@@ -18,7 +20,6 @@ import { TOption } from '/@/views/rule/linkedge/config/config.data';
 import { PlusOutlined } from '@ant-design/icons-vue';
 import { subminExamineResult } from '/@/api/resource/examine';
 import { session } from '/@/utils/Memory.js';
-import { object } from 'vue-types';
 
 export default defineComponent({
   name: 'AccountModal',

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-show="ischect && showAuditModal" @register="registerModalSH" @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: '地图资源审核列表',
@@ -193,6 +185,8 @@ export default defineComponent({
 
     const moment = Moment;
     const ischect = ref(true)
+    const showAuditModal = ref(false)
+
     const sourceTypes = ref([
       { SERVICETYPE: 'MR', name: '地图资源', SUM: 0 },
       { SERVICETYPE: 'ER', name: '场景资源', SUM: 0 },
@@ -209,7 +203,17 @@ export default defineComponent({
       //   return { disabled: false };
       // }
     };
-    const [registerModal, { openModal }] = useModal();
+    const [registerModalSH, { openModal: openModalSH }] = 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 +261,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 +275,9 @@ export default defineComponent({
      */
     async function handleEdit(record: Recordable) {
       ischect.value = true;
-      if(!record?.BUSSID) return;
+      showAuditModal.value = true;
+
+      if (!record?.BUSSID) return;
       // setTimeout(() => {
       //   openModal(true, {
       //     record,
@@ -285,9 +291,9 @@ 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, {
+        openModalSH(true, {
           record: result,
           isUpdate: true,
           isView: true,
@@ -379,13 +385,18 @@ export default defineComponent({
       ischect,
       sourceTypes,
       registerTable,
-      registerModal,
+      registerModalDR,
+      registerModalMR,
+      registerModalER,
+      registerModalSR,
       handleVliew,
       handleDetail,
       handleEdit,
       handleSuccess,
       RoleEnum,
       hasBatchDelete,
+      showAuditModal,
+      registerModalSH,
       handleDeleteOrBatchDelete,
       statusChange,
       batchExamine,

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>

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' },

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,
   },