新增资源审核

src/api/resource/map.ts

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 11:20:48
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-08-16 18:22:52
+ * @LastEditTime: 2023-08-17 16:02:14
  * @FilePath: \xld-gis-admin\src\api\resource\map.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -86,7 +86,7 @@ export function list() {
 
 
 /**
- * @description:根据标签或者字典
+ * @description:根据标签获取字典
  */
  export function queryDicsByName(name) {
     const formData = new FormData();
@@ -131,12 +131,50 @@ export function list() {
     formData.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
     formData.append("methodName", "insert");
     formData.append("args[]", session.getItem('tokenV2'));
-    formData.append("args[]",`{"type":"MR","servicebase":${str}}`)
+    formData.append("args[]",str)
     return new Promise<void>((resolve, reject) => {
         defHttp.post({ url: Api.Login, params: formData, ...interfaceType })
             .then((r) => {
-                let result = r.result === '' ? [] : JSON.parse(r.result)
-                resolve(result);
+                resolve(r);
+            })
+    })
+}
+
+
+/**
+ * @description:修改地图资源
+ */
+ export function updateService(params) {
+    if(!params) return
+    const str = JSON.stringify(params)
+    const formData = new FormData();
+    formData.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
+    formData.append("methodName", "update");
+    formData.append("args[]", session.getItem('tokenV2'));
+    formData.append("args[]",str)
+    return new Promise<void>((resolve, reject) => {
+        defHttp.post({ url: Api.Login, params: formData, ...interfaceType })
+            .then((r) => {
+                resolve(r);
+            })
+    })
+}
+
+
+/**
+ * @description:删除地图资源
+ */
+ export function deleteService(param) {
+    if(!param) return
+    const formData = new FormData();
+    formData.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
+    formData.append("methodName", "delete");
+    formData.append("args[]", session.getItem('tokenV2'));
+    formData.append("args[]",param)
+    return new Promise<void>((resolve, reject) => {
+        defHttp.post({ url: Api.Login, params: formData, ...interfaceType })
+            .then((r) => {
+                resolve(r);
             })
     })
 }

src/mock/menu.json

@@ -482,11 +482,11 @@
                         "name": "数据审核",
                         "parentId": "c084fce9-9b70-4ae0-b094-7cfe30c87f52",
                         "children": [],
-                        "path": "/data/sh",
+                        "path": "/resource/examine",
                         "type": "SYSADMIN",
-                        "permission": "",
+                        "permission": "map:resource:examine",
                         "sort": 26,
-                        "component": "LAYOUT",
+                        "component": "/resource/examine/index",
                         "meta": {
                             "icon": "mdi:file-image-plus-outline",
                             "title": "数据审核",

src/mock/menu_get_ids.json

@@ -146,5 +146,6 @@
     "e2c0d301-e67c-46b5-a393-264b6e5a2440",
     "27e36b74-f516-4fea-bd92-c8630256758f",
     "ca60b93b-fc8e-487b-bbff-1831ccc6e518",
-    "4dd7d7af-aba5-4b55-98a8-599a2475149d"
+    "4dd7d7af-aba5-4b55-98a8-599a2475149d",
+    "6f625574-6061-4989-aeb1-a6a1eb8ed668"
 ]

src/mock/role_me_permissions.json

@@ -130,5 +130,6 @@
     "api:yt:organization:post",
     "sjglzx",
     "api:yt:schedule:update",
-    "api:yt:user:reset"
+    "api:yt:user:reset",
+    "map:resource:examine"
 ]

src/views/resource/examine/MapSourceModal.vue

@@ -0,0 +1,106 @@
+<!--
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-15 16:19:10
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-17 14:28:44
+ * @FilePath: \xld-gis-admin\src\views\resource\map\MapSourceModal.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <BasicModal
+    width="1200px"
+    v-bind="$attrs"
+    @register="registerModal"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
+    <div style="height: 60vh" class="res-form-container">
+      <a-tabs v-model:activeKey="activeKey" class="res-a-tabs">
+        <a-tab-pane key="1" tab="地图资源信息">
+          <!-- <BasicForm @register="registerForm"></BasicForm> -->
+          <source-detail ref="refSourceDetail" @RtnMain="RtnMain" :formData="formData" :isUpdate="isUpdate"></source-detail>
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="流程信息" force-render>
+          <div class="tab2"></div>
+        </a-tab-pane>
+      </a-tabs>
+    </div>
+  </BasicModal>
+</template>
+  <script lang="ts">
+import { defineComponent, ref, computed, unref, reactive, onMounted } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { formSchema } from './map.data';
+import { BasicTree } from '/@/components/Tree';
+import { PlusOutlined } from '@ant-design/icons-vue';
+import SourceDetail from './SourceDetail.vue';
+
+export default defineComponent({
+  name: 'AccountModal',
+  components: {
+    BasicModal,
+    BasicForm,
+    BasicTree,
+    PlusOutlined,
+    SourceDetail,
+    VNodes: (_, { attrs }) => {
+      return attrs.vnodes;
+    },
+  },
+  emits: ['success', 'register'],
+  setup(_, { emit }) {
+    const data = reactive({
+      activeKey: '2',
+    });
+    const refSourceDetail = ref(null);
+    let formData = ref(null)
+    const isUpdate = ref(true);
+    const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+      setModalProps({ confirmLoading: false });
+      isUpdate.value = !!data?.isUpdate;
+      if(isUpdate.value) formData.value = data.record
+    });
+    const getTitle = computed(() => (!unref(isUpdate) ? '新增地图资源' : '编辑地图资源'));
+
+    async function handleSubmit() {
+      refSourceDetail.value.submitForm();
+    }
+    const RtnMain = (status) => {
+      console.log('操作状态',status)
+      emit('success')
+    }
+
+    onMounted(() => {});
+    return {
+      ...ref(data),
+      registerModal,
+      handleSubmit,
+      getTitle,
+      refSourceDetail,
+      isUpdate,
+      formData,
+      RtnMain,
+    };
+  },
+});
+</script>
+  <style scoped lang="less">
+:deep(.vben-basic-tree) {
+  width: 100% !important;
+}
+
+:deep(.is-unflod) {
+  display: none !important;
+}
+
+:deep(.is-flod) {
+  display: none !important;
+}
+:deep(.res-form-container) {
+  .res-a-tabs {
+    margin-top: 61px !important;
+  }
+}
+</style>
+  

src/views/resource/examine/SourceDetail.vue

@@ -0,0 +1,610 @@
+<!--
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-15 22:08:21
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-17 15:24:30
+ * @FilePath: \xld-gis-admin\src\views\resource\map\SourceDetail.vue
+ * @Description: 地图资源明细界面
+-->
+<template>
+  <div class="source-detail">
+    <a-form ref="formRef" :model="formState" :rules="rules" style="width: 100%">
+      <div class="compontents">
+        <div class="title">基本信息</div>
+        <a-row class="form-container">
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="code" label="资源编码" name="code" class="label-form-item">
+              <a-input v-model:value="formState.code" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" class="form-col">
+            <a-form-item
+              ref="servicename"
+              label="资源名称"
+              name="servicename"
+              class="label-form-item"
+            >
+              <a-input v-model:value="formState.servicename" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="12" class="form-col">
+            <a-form-item
+              ref="servicealiasname"
+              label="资源别名"
+              name="servicealiasname"
+              class="label-form-item"
+            >
+              <a-input v-model:value="formState.servicealiasname" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="keywords" label="资源标签" name="keywords" class="label-form-item">
+              <a-select v-model:value="formState.keywords" mode="multiple">
+                <template v-for="tag in serviceTags" :key="tag.code">
+                  <a-select-option :value="tag.value">{{ tag.label }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="24" class="form-col">
+            <a-form-item
+              ref="description"
+              label="资源描述"
+              name="description"
+              class="label-form-item"
+            >
+              <a-textarea v-model:value="formState.description" :rows="2" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="24" class="form-col">
+            <a-form-item ref="thumbnail" label="缩略图" name="thumbnail" class="label-form-item">
+              <a-upload action="" v-model:file-list="fileList">
+                <a-button style="background-color: #0671dd; color: #fff; border-radius: 4px">
+                  <upload-outlined></upload-outlined>
+                  文件上传
+                </a-button>
+              </a-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </div>
+
+      <div class="compontents">
+        <div class="title">描述信息</div>
+        <a-row class="form-container">
+          <a-col :span="12" class="form-col">
+            <a-form-item
+              ref="servicetype"
+              label="资源类型"
+              name="servicetype"
+              class="label-form-item"
+            >
+              <a-select v-model:value="formState.servicetype">
+                <template v-for="tag in serviceTypes" :key="tag.id">
+                  <a-select-option :value="tag.id">{{ tag.name }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="coordinate" label="坐标系" name="coordinate" class="label-form-item">
+              <a-select v-model:value="formState.coordinate">
+                <template v-for="tag in sysCoors" :key="tag.GEOMNAME">
+                  <a-select-option :value="tag.GEOMNAME">{{ tag.GEOMTITLE }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24" class="form-col">
+            <a-form-item ref="mapingurl" label="服务地址" name="mapingurl" class="label-form-item">
+              <a-input v-model:value="formState.mapingurl" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="dataScope" label="数据范围" name="dataScope" class="label-form-item">
+              <a-input v-model:value="formState.dataScope" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="source" label="数据来源" name="source" class="label-form-item">
+              <a-input v-model:value="formState.source" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="restype" label="密级" name="secrets" class="label-form-item">
+              <a-select v-model:value="formState.secrets">
+                <template v-for="tag in secrets" :key="tag.code">
+                  <a-select-option :value="tag.code">{{ tag.name }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+          </a-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" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="collect" label="保管单位" name="collect" class="label-form-item">
+              <a-select v-model:value="formState.collect">
+                <template v-for="tag in collectDept" :key="tag.code">
+                  <a-select-option :value="tag.code">{{ tag.name }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="respUnit" label="责任处室" name="respUnit" class="label-form-item">
+              <a-select v-model:value="formState.respUnit">
+                <template v-for="tag in respDept" :key="tag.code">
+                  <a-select-option :value="tag.code">{{ tag.name }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="source" label="发布日期" name="source" class="label-form-item">
+              <!-- <a-input v-model:value="formState.publishtime" disabled /> -->
+              <a-date-picker
+                v-model:value="formState.publishtime"
+                format="YYYY-MM-DD hh:mm:ss"
+                style="width: 100%"
+                disabled
+                show-time
+              >
+                <template #renderExtraFooter>extra footer</template>
+              </a-date-picker>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="source" label="发布者" name="source" class="label-form-item">
+              <a-input v-model:value="formState.publisher" disabled />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="12" class="form-col">
+            <a-form-item
+              ref="updatetype"
+              label="更新方式"
+              name="updatetype"
+              class="label-form-item"
+            >
+              <a-input v-model:value="formState.updateType" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" class="form-col">
+            <a-form-item
+              ref="updatetime"
+              label="更新时间"
+              name="updatetime"
+              class="label-form-item"
+            >
+              <a-date-picker
+                v-model:value="formState.updatetime"
+                format="YYYY-MM-DD hh:mm:ss"
+                style="width: 100%"
+                disabled
+                show-time
+              >
+                <template #renderExtraFooter>extra footer</template>
+              </a-date-picker>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" class="form-col">
+            <a-form-item ref="epsgcode" label="EPSGCode" name="epsgcode" class="label-form-item">
+              <a-select v-model:value="formState.epsgcode">
+                <template v-for="tag in EPSGCodes" :key="tag.code">
+                  <a-select-option :value="tag.code">{{ tag.name }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="12" 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"
+              />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="6" 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"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6" 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"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6" 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"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6" 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"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </div>
+    </a-form>
+  </div>
+</template>
+<script lang="ts">
+import {
+  defineComponent,
+  ref,
+  toRefs,
+  toRaw,
+  unref,
+  computed,
+  unref,
+  nextTick,
+  reactive,
+  UnwrapRef,
+  onMounted,
+  watch,
+} from 'vue';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { UploadOutlined } from '@ant-design/icons-vue';
+import { ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
+import { useMessage } from '/@/hooks/web/useMessage';
+const { t } = useI18n(); //加载国际化
+// 加载菜单数据
+import { useI18n } from '/@/hooks/web/useI18n';
+import Moment from 'moment';
+import { insertService } from '/@/api/resource/map';
+import {
+  serviceTypes,
+  serviceTags,
+  secrets,
+  sysCoors,
+  respDept,
+  collectDept,
+  EPSGCodes,
+} from './map.data';
+import { session } from '/@/utils/Memory.js';
+const props = {
+  formData: { type: Object, default: ref(null) },
+  isUpdate: { type: Boolean, default: ref(false) },
+};
+interface FormState {
+  code: string;
+  servicename: string;
+  servicealiasname: string;
+  keywords: string[];
+  description: string;
+  servicetype: string;
+  coordinate: string;
+  mapingurl: string;
+  dataScope: string;
+  source: string;
+  secrets: string;
+  formdatabase: string;
+  collect: string;
+  respUnit: string;
+  publishtime: string;
+  publisher: string;
+  updateType: string;
+  updatetime: string;
+  epsgcode: string;
+  runtimestatus: boolean;
+  public: boolean;
+  share: boolean;
+  searched: boolean;
+  externalApply: boolean;
+  date1: undefined;
+}
+export default defineComponent({
+  name: 'SourceDetail',
+  components: { BasicForm, UploadOutlined },
+  props,
+  setup(props, { emit }) {
+    const data = reactive({
+      detail: props.formData,
+      isUpdate: props.isUpdate,
+      fileList: [],
+      serviceTags: serviceTags,
+      secrets: secrets, //密级
+      sysCoors: sysCoors, //坐标系
+      serviceTypes: serviceTypes, //资源类型
+      respDept: respDept, //责任科室
+      collectDept: collectDept, //保管部门
+      EPSGCodes: EPSGCodes, //EPSGCode
+    });
+    const formRef = ref();
+    const formState: UnwrapRef<FormState> = reactive({
+      code: '',
+      servicename: '',
+      servicealiasname: '',
+      keywords: [],
+      description: '',
+      servicetype: '',
+      coordinate: '',
+      mapingurl: '',
+      dataScope: '',
+      source: '',
+      secrets: '',
+      formdatabase: '',
+      collect: '',
+      respUnit: '',
+      publishtime: '',
+      publisher: '',
+      updateType: '',
+      updatetime: '',
+      epsgcode: '',
+      runtimestatus: true,
+      public: true,
+      share: true,
+      searched: true,
+      externalApply: true,
+      date1: undefined,
+    });
+    const moment = Moment;
+    const rules = {
+      servicename: [
+        { required: true, message: '请填写资源名称', trigger: 'blur' },
+        { min: 3, max: 20, message: '长度必须在3到20个字符', trigger: 'blur' },
+      ],
+      servicealiasname: [
+        { required: true, message: '请输入资源别名', trigger: 'blur' },
+        { min: 3, max: 20, message: '长度必须在3到20个字符', trigger: 'blur' },
+      ],
+      systag: [{ required: true, message: '请选择系统标签', trigger: 'change' }],
+      servicetype: [{ required: true, message: '请选择资源类型', trigger: 'change' }],
+      coordinate: [{ required: true, message: '请选择坐标系', trigger: 'change' }],
+      mapingurl: [{ required: true, message: '请输入服务地址', trigger: 'blur' }],
+
+      date1: [{ required: true, message: 'Please pick a date', trigger: 'change', type: 'object' }],
+      type: [
+        {
+          type: 'array',
+          required: true,
+          message: 'Please select at least one activity type',
+          trigger: 'change',
+        },
+      ],
+      resource: [{ required: true, message: 'Please select activity resource', trigger: 'change' }],
+      desc: [{ required: true, message: 'Please input activity form', trigger: 'blur' }],
+    };
+    const { createMessage } = useMessage();
+    watch(
+      () => props.formData,
+      (obj) => {
+        data.detail = obj;
+        if (data.isUpdate) setFormData();
+      }
+    );
+    watch(
+      () => props.isUpdate,
+      (obj) => {
+        data.isUpdate = obj;
+      }
+    );
+    const submitForm = () => {
+      try {
+        formRef.value
+          .validate()
+          .then(async () => {
+            //console.log('values', formState, toRaw(formState));
+            const params = setSubmitForm();
+            if (params) {
+              if (data.isUpdate) {
+              } else {
+                const res = await insertService(params);
+                if (res && res?.status !== '-1') {
+                  createMessage.success('新增地图资源成功！');
+                  resetForm();
+                  emit('RtnMain', true);
+                } else createMessage.error('新增地图资源失败！,失败原因：' + res?.message, 1);
+              }
+            }
+          })
+          .catch((error: ValidateErrorEntity<FormState>) => {
+            createMessage.error('请完成必填信息！', 1);
+            console.log('error', error);
+          });
+      } catch (ex) {
+        console.log(ex);
+      }
+    };
+    const resetForm = () => {
+      formRef.value.resetFields();
+    };
+
+    /**
+     * 设置提交数据
+     */
+    const setSubmitForm = () => {
+      const userinfo = session.getItem('userInfo');
+      const collect = collectDept.find((item) => item.code === formState.collect);
+      const rboffices = respDept.find((item) => item.code === formState.respUnit);
+      const secretlevels = secrets.find((item) => item.code === formState.secrets);
+      const coor = sysCoors.find((item) => item.GEOMNAME === formState.coordinate);
+      const EPSGCode = EPSGCodes.find((item) => item.code === formState.epsgcode);
+      return {
+        type: 'MR',
+        servicebase: {
+          publisher: userinfo?.EMPLOYEE?.NAME, //'系统管理员',
+          username: userinfo?.EMPLOYEE?.NAME, //'系统管理员',
+          userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //'27AF004A-8BDN-885T-30FU-89DE3388762B',
+          servicealiasname: formState.servicealiasname, //资源别名
+          description: formState.description, //资源描述
+          ispublic: formState.public ? '1' : '0', //是否公开
+          searched: formState.searched ? '1' : '0', //是否展示
+          servicetype: formState.servicetype, //资源类型
+          externalApply: formState.externalApply ? '1' : '0', //外部申请
+          runtimestatus: formState.runtimestatus ? '1' : '0', //运行状态
+          servicename: formState.servicename, //资源名
+          mapingurl: formState.mapingurl, //服务地址
+          otherService: '',
+        },
+        metadata: {
+          mapingurl: formState.mapingurl, //服务地址
+          name: formState.servicename, //资源名
+          servicealiasname: formState.servicealiasname, //资源别名
+          thumbnail: '',
+          description: formState.description,
+          keywords: formState.keywords.toString(),
+          servicetype: formState.servicetype, //资源类型
+          dataScope: formState.dataScope, //数据范围
+          updateType: formState.updateType, //更新方式
+          source: formState.source, //数据来源
+          formdatabase: formState.formdatabase, //数据表
+          rboffice: rboffices ? rboffices.codeName : '', //责任单位
+          keepingunit: collect ? collect.codeName : '', //保管单位
+          secretlevel: secretlevels ? secretlevels.codeName : '',
+          crs: coor ? coor.GEOMNAME : '',
+          epsgCode: EPSGCode ? EPSGCode.codeName : '',
+          workSpace: '',
+          runtimestatus: formState.runtimestatus ? '1' : '0', //运行状态
+          ishistory: '0',
+          shsqlc: 'ggdata',
+          urlInfo: '',
+          otherService: '',
+          bz: '',
+          ispublic: formState.public ? '1' : '0', //是否公开
+          searched: formState.searched ? '1' : '0', //是否展示
+          externalApply: formState.externalApply ? '1' : '0', //外部申请
+          isShow: formState.share ? '1' : '0',
+          publisher: userinfo?.EMPLOYEE?.NAME, //'系统管理员',
+          username: userinfo?.EMPLOYEE?.NAME, //'系统管理员',
+          userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //'27AF004A-8BDN-885T-30FU-89DE3388762B',
+        },
+        sourcetraces: [],
+        dataVersionConf: {},
+      };
+    };
+    /**
+     * 设置表单数据
+     */
+    const setFormData = () => {
+      console.log('表单数据请看', data.detail);
+      console.log('服务类型', serviceTypes);
+      console.log('服务标签', serviceTags);
+      console.log('密级', secrets);
+      console.log('坐标系', sysCoors);
+      console.log('责任科室', respDept);
+      console.log('保管部门', collectDept);
+      console.log('EPSGCodes', EPSGCodes);
+      formState.public = data.detail.ispublic === '1' ? true : false;
+      formState.servicename = data.detail?.servicename;
+      formState.publishtime = data.detail?.publishdate
+        ? moment(data.detail?.publishdate).format('YYYY-MM-DD HH:mm:ss')
+        : '';
+      formState.publisher = data.detail?.publisher;
+      formState.runtimestatus = data.detail.runtimestatus === 0 ? false : true;
+      formState.servicealiasname = data.detail?.servicealiasname;
+      formState.code = data.detail?.serviceid;
+      formState.servicetype = data.detail?.servicetype;
+      formState.updatetime = data.detail?.updatedate
+        ? moment(data.detail?.updatedate).format('YYYY-MM-DD HH:mm:ss')
+        : '';
+      formState.servicetype = data.detail?.servicetype;
+      formState.coordinate = data.detail?.crs;
+      formState.searched = data.detail.searched === 0 ? false : true;
+    };
+
+    onMounted(() => {
+      resetForm();
+    });
+    return {
+      ...toRefs(data),
+      formRef,
+      moment,
+      rules,
+      formState,
+      submitForm,
+      resetForm,
+      createMessage,
+      setSubmitForm,
+      setFormData,
+    };
+  },
+});
+</script>
+  
+  <style scoped lang="less">
+.source-detail {
+  height: 100%;
+  width: 100%;
+  padding: 0 20px;
+  .compontents {
+    width: 100%;
+    height: auto;
+    .title {
+      height: 19px;
+      line-height: 18px;
+      padding-left: 6px;
+      margin-bottom: 20px;
+      border-left: 3px solid #0671dd;
+      font-family: Source Han Sans CN;
+      font-size: 16px;
+      font-weight: 350;
+      letter-spacing: 0px;
+    }
+    .form-container {
+      width: 100%;
+      height: auto;
+      .form-col {
+        height: 100%;
+      }
+      .form-col-left {
+        padding-right: 20px;
+      }
+    }
+  }
+}
+.label-form-item {
+  :deep(.ant-form-item-label) {
+    width: 90px;
+  }
+  :deep(.ant-form-item-control) {
+    width: calc(100% - 90px);
+  }
+}
+</style>
+  

src/views/resource/examine/index.vue

@@ -0,0 +1,256 @@
+<template>
+  <div class="examine-container">
+    <div class="left-container">
+      <template v-for="source in sourceTypes" :key="source.name">
+        <div class="soure-item-row" :class="{active:current===source.name}" @click="current = source.name">
+          {{ `${source.name}(${source.num})` }}
+        </div>
+      </template>
+    </div>
+    <div class="right-container">
+      <BasicTable
+        :rowSelection="{ type: 'checkbox' }"
+        @register="registerTable"
+      >
+        <template #toolbar>
+          <Authority>
+            <a-button type="primary" @click="batchExamine" :disabled="hasBatchDelete">批量审核</a-button>
+          </Authority>
+        </template>
+
+        <template #action="{ record }">
+          <TableAction
+            :actions="[
+              {
+                label: '浏览',
+                icon: '' /**clarity:note-edit-line*/,
+                onClick: handleEdit.bind(null, record),
+              },
+              {
+                label: '详情',
+                icon: '' /**clarity:note-edit-line*/,
+                onClick: handleEdit.bind(null, record),
+              },
+              {
+                label: '审核',
+                icon: '' /**clarity:note-edit-line*/,
+                color: 'warning',
+                onClick: handleEdit.bind(null, record),
+              },
+            ]"
+          />
+        </template>
+        <template #pdate="{ record }">
+          <Tag :color="'red'">
+            {{ record.publishdate ? moment(record.publishdate).format('YYYY-MM-DD HH:mm:ss') : '' }}
+          </Tag>
+        </template>
+        <template #status="{ record }">
+          <Tag :style="`color:${record.status === 3 || record.status === 3 ? 'red' : ''};`">
+            {{
+              record.status === 0
+                ? '待审核'
+                : record.status === 1
+                ? '审核通过'
+                : record.status === 2
+                ? '审核不通过'
+                : record.status === 3
+                ? '被驳回'
+                : '未提交'
+            }}
+          </Tag>
+        </template>
+      </BasicTable>
+      <MapSourceModal @register="registerModal" @success="handleSuccess" />
+    </div>
+  </div>
+</template>
+<script lang="ts">
+import { defineComponent, nextTick, onBeforeMount, reactive, ref, toRef } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { delRole, getRoleListByPage, setRoleStatus } from '/@/api/system/system';
+// import { useDrawer } from '/@/components/Drawer';
+import { useModal } from '/@/components/Modal';
+import MapSourceModal from './MapSourceModal.vue';
+import { columns, searchFormSchema } from './map.data';
+import { RoleEnum } from '/@/enums/roleEnum';
+import { Authority } from '/@/components/Authority';
+import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { Switch, Popconfirm } from 'ant-design-vue';
+import { list } from '/@/api/resource/map';
+import Moment from 'moment';
+import { active } from 'sortablejs';
+
+export default defineComponent({
+  name: 'RoleManagement',
+  components: { BasicTable, MapSourceModal, TableAction, Authority, Switch, Popconfirm },
+  setup() {
+    let current=ref('地图资源');
+    //const [registerDrawer, { openDrawer }] = useDrawer();
+    const [registerModal, { openModal }] = useModal();
+    const [registerTable, { setProps, reload, getSelectRowKeys, getRowSelection, getSelectRows,setSelectedRowKeys, }] = useTable({
+      title: '地图资源列表',
+      api: list,   //求接口
+      //dataSource: dataSources, //表格的数据
+      columns,
+      rowKey: 'serviceid',
+      formConfig: {
+        labelWidth: 100,
+        schemas: searchFormSchema,
+      },
+      useSearchForm: true,
+      showTableSetting: true,
+      bordered: true,
+      showIndexColumn: true,
+      actionColumn: {
+        width: 200,
+        title: '操作',
+        dataIndex: 'action',
+        slots: { customRender: 'action' },
+        fixed: 'right',
+      },
+      pagination: {
+        hideOnSinglePage: false,
+      },
+      clickToRowSelect: true, //点击当前行多选框不选中,默认是true
+      rowSelection: { type: 'checkbox' },   //是否有多选功能
+    });
+    const moment = Moment;
+   
+    const sourceTypes = ref([
+      { name: '地图资源', num: 4 },
+      { name: '场景资源', num: 5 },
+      { name: '文件资源', num: 10 },
+      { name: '组件资源', num: 2 },
+    ]);
+    const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
+      useBatchDelete(delRole, handleSuccess, setProps);
+    selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+      // Demo:status为1的选择框禁用
+      if (record.status === 1) {
+        return { disabled: true };
+      } else {
+        return { disabled: false };
+      }
+    };
+    nextTick(() => {
+      setProps(selectionOptions);
+    });
+
+    function handleCreate() {
+      // openDrawer(true, {
+      //   isUpdate: false,
+      // });
+      openModal(true, {
+        isUpdate: false,
+      });
+    }
+
+    function handleEdit(record: Recordable) {
+      // openDrawer(true, {
+      //   record,
+      //   isUpdate: true,
+      // });
+      openModal(true, {
+        record,
+        isUpdate: true,
+      });
+    }
+
+    function handleSuccess() {
+      openModal(false, {
+        isUpdate: false,
+      });
+      reload();
+    }
+
+    const statusChange = async (checked, record) => {
+      setProps({
+        loading: true,
+      });
+      setSelectedRowKeys([]);
+      resetSelectedRowKeys();
+      const newStatus = checked ? 1 : 0;
+      const { createMessage } = useMessage();
+      try {
+        await setRoleStatus(record.id, newStatus);
+        if (newStatus) {
+          createMessage.success(`启用成功`);
+        } else {
+          createMessage.success('禁用成功');
+        }
+      } finally {
+        setProps({
+          loading: false,
+        });
+        reload();
+      }
+    };
+    const batchExamine = () => {
+      const row = getSelectRows()
+      const ids = getSelectRowKeys()
+      const sle = getRowSelection()
+      console.log('获取行',row)
+      console.log('获取id',ids)
+      console.log('获取se',sle)
+    };
+
+
+    onBeforeMount(async () => {});
+
+    return {
+      current,
+      moment,
+      sourceTypes,
+      registerTable,
+      registerModal,
+      handleCreate,
+      handleEdit,
+      handleSuccess,
+      RoleEnum,
+      hasBatchDelete,
+      handleDeleteOrBatchDelete,
+      statusChange,
+      batchExamine,
+    };
+  },
+});
+</script>
+<style scoped lang="less">
+.examine-container {
+  display: flex;
+  height: 100%;
+  width: 100%;
+  .left-container {
+    width: 240px;
+    height: calc(100% - 32px);
+    margin: 16px 0 16px 10px;
+    padding: 10px 20px;
+    background-color: #fff;
+    border-radius: 2px;
+    .soure-item-row {
+      height: 34px;
+      width: 100%;
+      margin:20px 0;
+      line-height: 34px;
+      text-align: center;;
+      font-size: 14px;
+      font-weight: normal;
+      letter-spacing: 0px;
+      color: #333333;
+      background: #EFF0F5;
+      border-radius:2px;
+    }
+    .active{
+      background: #0671DD;
+      color: #fff;
+    }
+  }
+  .right-container {
+    width: calc(100% - 260px);
+    height: 100%;
+  }
+}
+</style>
+

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

@@ -0,0 +1,165 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { RoleEnum } from '/@/enums/roleEnum';
+import { getServiceTypes,queryServiceTags,queryDicsByName,queryCoors } from '/@/api/resource/map';
+
+const resTag = await queryServiceTags()
+let listTag = []
+resTag.map(item => {
+  listTag.push({
+    label: item.name,
+    value: item.code
+  })
+})
+/**
+ * 密级字典
+*/
+export const secrets = await queryDicsByName('密级')
+/**
+ * 服务标签
+*/
+export const serviceTags = listTag;
+/**
+ * 坐标系列表
+*/
+export const sysCoors = await queryCoors()
+/**
+ * 服务类型
+*/
+export const serviceTypes = await getServiceTypes()
+/**
+ * 责任处室
+*/
+export const respDept = await queryDicsByName('责任处室')
+/**
+ * 保管单位
+*/
+export const collectDept = await queryDicsByName('保管单位')
+/**
+ * EPSG code
+*/
+export const EPSGCodes = await queryDicsByName('EPSG code')
+
+
+const checkStatus = [
+  { label: '未提交', value: 1 },
+  { label: '审核中', value: 2 },
+  { label: '审核不通过', value: 3 },
+  { label: '被驳回', value: 4 },
+  { label: '审核通过', value: 5 },
+]
+export enum KeysTypeEnum {
+  DISABLED = 'disabled',
+  ENABLED = 'enabled',
+}
+
+export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }> = {
+  [RoleEnum.PLATFORM_ADMIN]: { key: 'enabled_platform_admin_auth', keyType: KeysTypeEnum.ENABLED },
+  [RoleEnum.SYS_ADMIN]: { key: 'enabled_sysadmin_auth', keyType: KeysTypeEnum.ENABLED },
+  [RoleEnum.TENANT_ADMIN]: { key: 'disabled_tenant_auth', keyType: KeysTypeEnum.DISABLED },
+  [RoleEnum.CUSTOMER_USER]: { key: 'disabled_tenant_auth', keyType: KeysTypeEnum.DISABLED },
+};
+
+/**
+ * 查询条件
+*/
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'keywork',
+    label: '关键字',
+    component: 'Input',
+    colProps: { span: 5 },
+    componentProps: {
+      maxLength: 255,
+    },
+  },
+  {
+    field: 'checkStatus',
+    label: '审核状态',
+    component: 'Select',
+    componentProps: {
+      options: checkStatus,
+    },
+    colProps: { span: 5 },
+  },
+];
+
+
+/**
+ * 列表显示信息
+*/
+export const columns: BasicColumn[] = [
+  {
+    title: '资源类型',
+    dataIndex: 'servicetype',
+    width: 120,
+  },
+  {
+    title: '资源名称',
+    dataIndex: 'servicename',
+    width: 160,
+  },
+  {
+    title: '发布时间',
+    dataIndex: 'publishdate',
+    width: 180,
+    slots: { customRender: 'pdate' },
+  },
+  {
+    title: '发布人',
+    dataIndex: 'publisher',
+    width: 100,
+  },
+  
+  {
+    title: '当前环节',
+    dataIndex: 'curLink',
+    width: 90,
+  },
+  {
+    title: '当前处理人',
+    dataIndex: 'curHandler',
+    width: 100,
+  },
+  {
+    title: '审核状态',
+    dataIndex: 'status',
+    width: 110,
+    slots: { customRender: 'status' },
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'checkTime',
+    width: 180,
+  },
+  {
+    title: '审核意见',
+    dataIndex: 'examine',
+    width: 180,
+  },
+];
+
+/**
+ * 表单
+*/
+export const formSchema: FormSchema[] = [
+  {
+    field: 'groupName',
+    label: '角色名称',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入角色名称',
+    },
+  },
+  {
+    label: '排序',
+    field: 'sort',
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入排序',
+    },
+  }
+];

src/views/resource/map/MapSourceModal.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-15 16:19:10
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-17 15:54:02
+ * @FilePath: \xld-gis-admin\src\views\resource\map\MapSourceModal.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <BasicModal
     width="1200px"
@@ -10,7 +18,7 @@
       <a-tabs v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="地图资源信息">
           <!-- <BasicForm @register="registerForm"></BasicForm> -->
-          <source-detail ref="refSourceDetail"></source-detail>
+          <source-detail ref="refSourceDetail" @RtnMain="RtnMain" :formData="formData" :isUpdate="isUpdate"></source-detail>
         </a-tab-pane>
         <a-tab-pane key="2" tab="流程信息" force-render>
           <div class="tab2"></div>
@@ -46,22 +54,32 @@ export default defineComponent({
       activeKey: '2',
     });
     const refSourceDetail = ref(null);
+    let formData = ref(null)
     const isUpdate = ref(true);
     const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
       setModalProps({ confirmLoading: false });
+      isUpdate.value = !!data?.isUpdate;
+      if(isUpdate.value) formData.value = data.record
     });
     const getTitle = computed(() => (!unref(isUpdate) ? '新增地图资源' : '编辑地图资源'));
 
     async function handleSubmit() {
       refSourceDetail.value.submitForm();
     }
-    onMounted(async () => {});
+    const RtnMain = (status) => {
+      emit('success')
+    }
+
+    onMounted(() => {});
     return {
       ...ref(data),
       registerModal,
       handleSubmit,
       getTitle,
       refSourceDetail,
+      isUpdate,
+      formData,
+      RtnMain,
     };
   },
 });

src/views/resource/map/SourceDetail.vue

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 22:08:21
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-08-16 18:09:33
+ * @LastEditTime: 2023-08-17 15:59:13
  * @FilePath: \xld-gis-admin\src\views\resource\map\SourceDetail.vue
  * @Description: 地图资源明细界面
 -->
@@ -18,20 +18,30 @@
             </a-form-item>
           </a-col>
           <a-col :span="12" class="form-col">
-            <a-form-item ref="name" label="资源名称" name="name" class="label-form-item">
-              <a-input v-model:value="formState.name" />
+            <a-form-item
+              ref="servicename"
+              label="资源名称"
+              name="servicename"
+              class="label-form-item"
+            >
+              <a-input v-model:value="formState.servicename" />
             </a-form-item>
           </a-col>
 
           <a-col :span="12" class="form-col">
-            <a-form-item ref="aliasname" label="资源别名" name="aliasname" class="label-form-item">
-              <a-input v-model:value="formState.aliasname" />
+            <a-form-item
+              ref="servicealiasname"
+              label="资源别名"
+              name="servicealiasname"
+              class="label-form-item"
+            >
+              <a-input v-model:value="formState.servicealiasname" />
             </a-form-item>
           </a-col>
 
           <a-col :span="12" class="form-col">
-            <a-form-item ref="systag" label="资源标签" name="systag" class="label-form-item">
-              <a-select v-model:value="formState.systag">
+            <a-form-item ref="keywords" label="资源标签" name="keywords" class="label-form-item">
+              <a-select v-model:value="formState.keywords" mode="multiple">
                 <template v-for="tag in serviceTags" :key="tag.code">
                   <a-select-option :value="tag.value">{{ tag.label }}</a-select-option>
                 </template>
@@ -63,13 +73,17 @@
         </a-row>
       </div>
 
-
       <div class="compontents">
         <div class="title">描述信息</div>
         <a-row class="form-container">
           <a-col :span="12" class="form-col">
-            <a-form-item ref="restype" label="资源类型" name="restype" class="label-form-item">
-              <a-select v-model:value="formState.restype">
+            <a-form-item
+              ref="servicetype"
+              label="资源类型"
+              name="servicetype"
+              class="label-form-item"
+            >
+              <a-select v-model:value="formState.servicetype">
                 <template v-for="tag in serviceTypes" :key="tag.id">
                   <a-select-option :value="tag.id">{{ tag.name }}</a-select-option>
                 </template>
@@ -80,20 +94,20 @@
           <a-col :span="12" class="form-col">
             <a-form-item ref="coordinate" label="坐标系" name="coordinate" class="label-form-item">
               <a-select v-model:value="formState.coordinate">
-                <template v-for="tag in sysCoors" :key="tag.ID">
-                  <a-select-option :value="tag.ID">{{ tag.GEOMNAME }}</a-select-option>
+                <template v-for="tag in sysCoors" :key="tag.GEOMNAME">
+                  <a-select-option :value="tag.GEOMNAME">{{ tag.GEOMTITLE }}</a-select-option>
                 </template>
               </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="24" class="form-col">
-            <a-form-item ref="addr" label="服务地址" name="addr" class="label-form-item">
-              <a-input v-model:value="formState.addr" />
+            <a-form-item ref="mapingurl" label="服务地址" name="mapingurl" class="label-form-item">
+              <a-input v-model:value="formState.mapingurl" />
             </a-form-item>
           </a-col>
           <a-col :span="12" class="form-col">
-            <a-form-item ref="range" label="数据范围" name="range" class="label-form-item">
-              <a-input v-model:value="formState.range" />
+            <a-form-item ref="dataScope" label="数据范围" name="dataScope" class="label-form-item">
+              <a-input v-model:value="formState.dataScope" />
             </a-form-item>
           </a-col>
           <a-col :span="12" class="form-col">
@@ -118,7 +132,7 @@
               name="sourcetable"
               class="label-form-item"
             >
-              <a-input v-model:value="formState.sourcetable" />
+              <a-input v-model:value="formState.formdatabase" />
             </a-form-item>
           </a-col>
 
@@ -167,7 +181,7 @@
               name="updatetype"
               class="label-form-item"
             >
-              <a-input v-model:value="formState.updatetype" />
+              <a-input v-model:value="formState.updateType" />
             </a-form-item>
           </a-col>
           <a-col :span="12" class="form-col">
@@ -189,23 +203,32 @@
             </a-form-item>
           </a-col>
           <a-col :span="12" class="form-col">
-            <a-form-item ref="epsccode" label="EPSCCode" name="epsccode" class="label-form-item">
-              <a-input v-model:value="formState.epsccode" />
+            <a-form-item ref="epsgcode" label="EPSGCode" name="epsgcode" class="label-form-item">
+              <a-select v-model:value="formState.epsgcode">
+                <template v-for="tag in EPSGCodes" :key="tag.code">
+                  <a-select-option :value="tag.code">{{ tag.name }}</a-select-option>
+                </template>
+              </a-select>
             </a-form-item>
           </a-col>
 
           <a-col :span="12" class="form-col">
-            <a-form-item ref="epsccode" label="运行状态" name="epsccode" class="label-form-item">
+            <a-form-item
+              ref="runtimestatus"
+              label="运行状态"
+              name="runtimestatus"
+              class="label-form-item"
+            >
               <a-switch
                 checked-children=""
                 un-checked-children=""
-                v-model:checked="formState.runstatus"
+                v-model:checked="formState.runtimestatus"
               />
             </a-form-item>
           </a-col>
 
-          <a-col :span="8" class="form-col">
-            <a-form-item ref="epsccode" label="是否公开" name="epsccode" class="label-form-item">
+          <a-col :span="6" class="form-col">
+            <a-form-item ref="public" label="是否公开" name="public" class="label-form-item">
               <a-switch
                 checked-children=""
                 un-checked-children=""
@@ -213,8 +236,8 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="8" class="form-col">
-            <a-form-item ref="epsccode" label="是否共享" name="epsccode" class="label-form-item">
+          <a-col :span="6" class="form-col">
+            <a-form-item ref="share" label="是否共享" name="share" class="label-form-item">
               <a-switch
                 checked-children=""
                 un-checked-children=""
@@ -222,12 +245,26 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="8" class="form-col">
-            <a-form-item ref="epsccode" label="是否展开" name="epsccode" class="label-form-item">
+          <a-col :span="6" 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.open"
+                v-model:checked="formState.externalApply"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6" 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"
               />
             </a-form-item>
           </a-col>
@@ -249,6 +286,7 @@ import {
   reactive,
   UnwrapRef,
   onMounted,
+  watch,
 } from 'vue';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { UploadOutlined } from '@ant-design/icons-vue';
@@ -257,38 +295,48 @@ import { useMessage } from '/@/hooks/web/useMessage';
 const { t } = useI18n(); //加载国际化
 // 加载菜单数据
 import { useI18n } from '/@/hooks/web/useI18n';
-import { Moment } from 'moment';
-import { getServiceTypes } from '/@/api/resource/map';
-import { serviceTypes,serviceTags,secrets,sysCoors,respDept,collectDept } from './map.data';
-
+import Moment from 'moment';
+import { insertService, updateService } from '/@/api/resource/map';
+import {
+  serviceTypes,
+  serviceTags,
+  secrets,
+  sysCoors,
+  respDept,
+  collectDept,
+  EPSGCodes,
+} from './map.data';
+import { session } from '/@/utils/Memory.js';
 const props = {
-  source: { type: Object, default: null },
+  formData: { type: Object, default: ref(null) },
+  isUpdate: { type: Boolean, default: ref(false) },
 };
 interface FormState {
   code: string;
-  name: string;
-  aliasname: string;
-  systag: string[];
+  servicename: string;
+  servicealiasname: string;
+  keywords: string[];
   description: string;
-  restype: string;
+  servicetype: string;
   coordinate: string;
-  addr: string;
-  range: string;
+  mapingurl: string;
+  dataScope: string;
   source: string;
   secrets: string;
-  sourcetable: string;
+  formdatabase: string;
   collect: string;
   respUnit: string;
   publishtime: string;
   publisher: string;
-  updatetype: string;
+  updateType: string;
   updatetime: string;
-  epsccode: string;
-  runstatus: boolean;
+  epsgcode: string;
+  runtimestatus: boolean;
   public: boolean;
   share: boolean;
-  open: boolean;
-  // date1: Moment | undefined;
+  searched: boolean;
+  externalApply: boolean;
+  date1: undefined;
 }
 export default defineComponent({
   name: 'SourceDetail',
@@ -296,56 +344,59 @@ export default defineComponent({
   props,
   setup(props, { emit }) {
     const data = reactive({
-      detail: props.detail,
+      detail: props.formData,
+      isUpdate: props.isUpdate,
       fileList: [],
       serviceTags: serviceTags,
-      secrets:secrets,   //密级
-      sysCoors:sysCoors,  //坐标系
-      serviceTypes: serviceTypes,  //资源类型
-      respDept: respDept,  //责任科室
+      secrets: secrets, //密级
+      sysCoors: sysCoors, //坐标系
+      serviceTypes: serviceTypes, //资源类型
+      respDept: respDept, //责任科室
       collectDept: collectDept, //保管部门
+      EPSGCodes: EPSGCodes, //EPSGCode
     });
-    console.log('责任科室',respDept)
     const formRef = ref();
     const formState: UnwrapRef<FormState> = reactive({
       code: '',
-      name: '',
-      aliasname: '',
-      systag: [],
+      servicename: '',
+      servicealiasname: '',
+      keywords: [],
       description: '',
-      restype: '',
+      servicetype: '',
       coordinate: '',
-      addr: '',
-      range: '',
+      mapingurl: '',
+      dataScope: '',
       source: '',
       secrets: '',
-      sourcetable: '',
+      formdatabase: '',
       collect: '',
       respUnit: '',
       publishtime: '',
       publisher: '',
-      updatetype: '',
+      updateType: '',
       updatetime: '',
-      epsccode: '',
-      runstatus: true,
-      public: false,
-      share: false,
-      open: false,
+      epsgcode: '',
+      runtimestatus: true,
+      public: true,
+      share: true,
+      searched: true,
+      externalApply: true,
       date1: undefined,
     });
+    const moment = Moment;
     const rules = {
-      name: [
+      servicename: [
         { required: true, message: '请填写资源名称', trigger: 'blur' },
         { min: 3, max: 20, message: '长度必须在3到20个字符', trigger: 'blur' },
       ],
-      aliasname: [
+      servicealiasname: [
         { required: true, message: '请输入资源别名', trigger: 'blur' },
         { min: 3, max: 20, message: '长度必须在3到20个字符', trigger: 'blur' },
       ],
       systag: [{ required: true, message: '请选择系统标签', trigger: 'change' }],
-      restype: [{ required: true, message: '请选择资源类型', trigger: 'change' }],
+      servicetype: [{ required: true, message: '请选择资源类型', trigger: 'change' }],
       coordinate: [{ required: true, message: '请选择坐标系', trigger: 'change' }],
-      addr: [{ required: true, message: 'Please input Activity name', trigger: 'blur' }],
+      mapingurl: [{ required: true, message: '请输入服务地址', trigger: 'blur' }],
 
       date1: [{ required: true, message: 'Please pick a date', trigger: 'change', type: 'object' }],
       type: [
@@ -360,33 +411,164 @@ export default defineComponent({
       desc: [{ required: true, message: 'Please input activity form', trigger: 'blur' }],
     };
     const { createMessage } = useMessage();
+    watch(
+      () => props.formData,
+      (obj) => {
+        data.detail = obj;
+        if (data.isUpdate) setFormData();
+      }
+    );
+    watch(
+      () => props.isUpdate,
+      (obj) => {
+        data.isUpdate = obj;
+      }
+    );
     const submitForm = () => {
-      formRef.value
-        .validate()
-        .then(() => {
-          console.log('values', formState, toRaw(formState));
-        })
-        .catch((error: ValidateErrorEntity<FormState>) => {
-          console.log('error', error);
-          createMessage.error('请完成必填信息！');
-        });
+      try {
+        formRef.value
+          .validate()
+          .then(async () => {
+            //console.log('values', formState, toRaw(formState));
+            const params = setSubmitForm();
+            if (params) {
+              if (data.isUpdate) {
+                params['serviceid'] = data.detail.serviceid;
+                const res = await updateService(params);
+                if (res && res?.status !== '-1') {
+                  createMessage.success('修改地图资源成功！');
+                  resetForm();
+                  emit('RtnMain', true);
+                } else createMessage.error('修改地图资源失败！,失败原因：' + res?.message, 1);
+              } else {
+                const res = await insertService(params);
+                if (res && res?.status !== '-1') {
+                  createMessage.success('新增地图资源成功！');
+                  resetForm();
+                  emit('RtnMain', true);
+                } else createMessage.error('新增地图资源失败！,失败原因：' + res?.message, 1);
+              }
+            }
+          })
+          .catch((error: ValidateErrorEntity<FormState>) => {
+            createMessage.error('请完成必填信息！', 1);
+            console.log('error', error);
+          });
+      } catch (ex) {
+        console.log(ex);
+      }
     };
     const resetForm = () => {
       formRef.value.resetFields();
     };
 
+    /**
+     * 设置提交数据
+     */
+    const setSubmitForm = () => {
+      const userinfo = session.getItem('userInfo');
+      const collect = collectDept.find((item) => item.code === formState.collect);
+      const rboffices = respDept.find((item) => item.code === formState.respUnit);
+      const secretlevels = secrets.find((item) => item.code === formState.secrets);
+      const coor = sysCoors.find((item) => item.GEOMNAME === formState.coordinate);
+      const EPSGCode = EPSGCodes.find((item) => item.code === formState.epsgcode);
+      return {
+        type: 'MR',
+        servicebase: {
+          publisher: userinfo?.EMPLOYEE?.NAME, //'系统管理员',
+          username: userinfo?.EMPLOYEE?.NAME, //'系统管理员',
+          userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //'27AF004A-8BDN-885T-30FU-89DE3388762B',
+          servicealiasname: formState.servicealiasname, //资源别名
+          description: formState.description, //资源描述
+          ispublic: formState.public ? '1' : '0', //是否公开
+          searched: formState.searched ? '1' : '0', //是否展示
+          servicetype: formState.servicetype, //资源类型
+          externalApply: formState.externalApply ? '1' : '0', //外部申请
+          runtimestatus: formState.runtimestatus ? '1' : '0', //运行状态
+          servicename: formState.servicename, //资源名
+          mapingurl: formState.mapingurl, //服务地址
+          otherService: '',
+        },
+        metadata: {
+          mapingurl: formState.mapingurl, //服务地址
+          name: formState.servicename, //资源名
+          servicealiasname: formState.servicealiasname, //资源别名
+          thumbnail: '',
+          description: formState.description,
+          keywords: formState.keywords.toString(),
+          servicetype: formState.servicetype, //资源类型
+          dataScope: formState.dataScope, //数据范围
+          updateType: formState.updateType, //更新方式
+          source: formState.source, //数据来源
+          formdatabase: formState.formdatabase, //数据表
+          rboffice: rboffices ? rboffices.codeName : '', //责任单位
+          keepingunit: collect ? collect.codeName : '', //保管单位
+          secretlevel: secretlevels ? secretlevels.codeName : '',
+          crs: coor ? coor.GEOMNAME : '',
+          epsgCode: EPSGCode ? EPSGCode.codeName : '',
+          workSpace: '',
+          runtimestatus: formState.runtimestatus ? '1' : '0', //运行状态
+          ishistory: '0',
+          shsqlc: 'ggdata',
+          urlInfo: '',
+          otherService: '',
+          bz: '',
+          ispublic: formState.public ? '1' : '0', //是否公开
+          searched: formState.searched ? '1' : '0', //是否展示
+          externalApply: formState.externalApply ? '1' : '0', //外部申请
+          isShow: formState.share ? '1' : '0',
+          publisher: userinfo?.EMPLOYEE?.NAME, //'系统管理员',
+          username: userinfo?.EMPLOYEE?.NAME, //'系统管理员',
+          userid: userinfo?.EMPLOYEE?.EMPLOYEE_ID, //'27AF004A-8BDN-885T-30FU-89DE3388762B',
+        },
+        sourcetraces: [],
+        dataVersionConf: {},
+      };
+    };
+    /**
+     * 设置表单数据
+     */
+    const setFormData = () => {
+      console.log('表单数据请看', data.detail);
+      console.log('服务类型', serviceTypes);
+      console.log('服务标签', serviceTags);
+      console.log('密级', secrets);
+      console.log('坐标系', sysCoors);
+      console.log('责任科室', respDept);
+      console.log('保管部门', collectDept);
+      console.log('EPSGCodes', EPSGCodes);
+      formState.public = data.detail.ispublic === '1' ? true : false;
+      formState.servicename = data.detail?.servicename;
+      formState.publishtime = data.detail?.publishdate
+        ? moment(data.detail?.publishdate).format('YYYY-MM-DD HH:mm:ss')
+        : '';
+      formState.publisher = data.detail?.publisher;
+      formState.runtimestatus = data.detail.runtimestatus === 0 ? false : true;
+      formState.servicealiasname = data.detail?.servicealiasname;
+      formState.code = data.detail?.serviceid;
+      formState.servicetype = data.detail?.servicetype;
+      formState.updatetime = data.detail?.updatedate
+        ? moment(data.detail?.updatedate).format('YYYY-MM-DD HH:mm:ss')
+        : '';
+      formState.servicetype = data.detail?.servicetype;
+      formState.coordinate = data.detail?.crs;
+      formState.searched = data.detail.searched === 0 ? false : true;
+    };
 
     onMounted(() => {
-
+      resetForm();
     });
     return {
       ...toRefs(data),
       formRef,
+      moment,
       rules,
       formState,
       submitForm,
       resetForm,
       createMessage,
+      setSubmitForm,
+      setFormData,
     };
   },
 });

src/views/resource/map/index.vue

@@ -50,7 +50,7 @@
               ifShow: record.roleType != RoleEnum.SYS_ADMIN,
               popConfirm: {
                 title: '是否确认删除',
-                confirm: handleDeleteOrBatchDelete.bind(null, record),
+                confirm: handleDelete.bind(null, record),
               },
             },
           ]"
@@ -93,7 +93,7 @@ import { Authority } from '/@/components/Authority';
 import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { Switch, Popconfirm } from 'ant-design-vue';
-import { list } from '/@/api/resource/map';
+import { list,deleteService } from '/@/api/resource/map';
 import Moment from 'moment'
 
 export default defineComponent({
@@ -107,13 +107,13 @@ export default defineComponent({
       api: list,
       columns,
       formConfig: {
-        labelWidth: 120,
+        labelWidth: 100,
         schemas: searchFormSchema,
       },
       useSearchForm: true,
       showTableSetting: true,
       bordered: true,
-      showIndexColumn: false,
+      showIndexColumn: true,
       actionColumn: {
         width: 200,
         title: '操作',
@@ -123,7 +123,7 @@ export default defineComponent({
       },
     });
     const moment = Moment
-    
+    const { createMessage } = useMessage();
     const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
       useBatchDelete(delRole, handleSuccess, setProps);
     selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
@@ -156,10 +156,25 @@ export default defineComponent({
         record,
         isUpdate: true,
       });
-      console.log(record);
+    }
+
+    const handleDelete = async(record: Recordable) => {
+      if(record?.serviceid){
+        const res = await deleteService(record?.serviceid)
+        if(res?.status !== '-1'){
+          reload();
+          createMessage.success('删除成功！',1)
+        }
+        else{
+          createMessage.error('删除失败！失败原因：'+res?.message,1)
+        }
+      }
     }
 
     function handleSuccess() {
+      openModal(false, {
+        isUpdate: false,
+      });
       reload();
     }
 
@@ -170,7 +185,6 @@ export default defineComponent({
       setSelectedRowKeys([]);
       resetSelectedRowKeys();
       const newStatus = checked ? 1 : 0;
-      const { createMessage } = useMessage();
       try {
         await setRoleStatus(record.id, newStatus);
         if (newStatus) {
@@ -191,11 +205,13 @@ export default defineComponent({
 
     return {
       moment,
+      createMessage,
       registerTable,
       // registerDrawer,
       registerModal,
       handleCreate,
       handleEdit,
+      handleDelete,
       handleSuccess,
       RoleEnum,
       hasBatchDelete,

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

@@ -27,9 +27,19 @@ export const sysCoors = await queryCoors()
  * 服务类型
 */
 export const serviceTypes = await getServiceTypes()
-
+/**
+ * 责任处室
+*/
 export const respDept = await queryDicsByName('责任处室')
+/**
+ * 保管单位
+*/
 export const collectDept = await queryDicsByName('保管单位')
+/**
+ * EPSG code
+*/
+export const EPSGCodes = await queryDicsByName('EPSG code')
+
 
 const checkStatus = [
   { label: '未提交', value: 1 },
@@ -51,14 +61,47 @@ export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }
 };
 
 /**
- * 列表显示信息
+ * 查询条件
 */
-export const columns: BasicColumn[] = [
+export const searchFormSchema: FormSchema[] = [
   {
-    title: '序号',
-    dataIndex: 'xh',
-    width: 90,
+    field: 'resTag',
+    label: '资源标签',
+    component: 'Select',
+    componentProps: {
+      options: serviceTags,
+      // [
+      //   { label: '标签1', value: 1 },
+      //   { label: '标签2', value: 2 },
+      //   { label: '标签3', value: 3 },
+      // ],
+    },
+    colProps: { span: 5 },
+  },
+  {
+    field: 'resName',
+    label: '资源名称',
+    component: 'Input',
+    colProps: { span: 5 },
+    componentProps: {
+      maxLength: 255,
+    },
   },
+  {
+    field: 'checkStatus',
+    label: '审核状态',
+    component: 'Select',
+    componentProps: {
+      options: checkStatus,
+    },
+    colProps: { span: 5 },
+  },
+];
+
+/**
+ * 列表显示信息
+*/
+export const columns: BasicColumn[] = [
   {
     title: '资源编号',
     dataIndex: 'serviceid',
@@ -113,43 +156,7 @@ export const columns: BasicColumn[] = [
   },
 ];
 
-/**
- * 查询条件
-*/
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'resTag',
-    label: '资源标签',
-    component: 'Select',
-    componentProps: {
-      options: serviceTags,
-      // [
-      //   { label: '标签1', value: 1 },
-      //   { label: '标签2', value: 2 },
-      //   { label: '标签3', value: 3 },
-      // ],
-    },
-    colProps: { span: 6 },
-  },
-  {
-    field: 'resName',
-    label: '资源名称',
-    component: 'Input',
-    colProps: { span: 6 },
-    componentProps: {
-      maxLength: 255,
-    },
-  },
-  {
-    field: 'checkStatus',
-    label: '审核状态',
-    component: 'Select',
-    componentProps: {
-      options: checkStatus,
-    },
-    colProps: { span: 6 },
-  },
-];
+
 
 /**
  * 表单