地图资源功能实现

src/api/resource/map.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-15 11:20:48
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-16 18:22:52
+ * @FilePath: \xld-gis-admin\src\api\resource\map.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import { defHttp } from '/@/utils/http/axios';
 import { session } from "/@/utils/Memory.js";
 import type { ErrorMessageMode } from '/#/axios';
@@ -22,12 +30,114 @@ export function list() {
     const formData = new FormData();
     formData.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
     formData.append("methodName", "getResourcePagedList");
-    formData.append("args[]", session.getItem('token'));
-    formData.append("args[]", '{ "type": "MR", "fields": { "DATA": ["serviceid", "servicename", "servicetype", "servicealiasname"], "METADATA": ["publisher ", "publishdate"] }, "pageIndex": 1, "pageSize": 4 }');
+    formData.append("args[]", session.getItem('tokenV2'));
+    formData.append("args[]", '{"type":"MR","fields":{"DATA":["serviceid","servicename","servicetype","servicealiasname"],"METADATA":["publisher ","publishdate"]},"pageIndex":1,"pageSize":10 }');
+    return new Promise<void>((resolve, reject) => {
+        defHttp.post({ url: Api.Login, params: formData, ...interfaceType })
+            .then((r) => {
+                let result = r.result === '' ? {} : JSON.parse(r.result)
+                if(result?.items){
+                    result.items.forEach((item,index) => {
+                        item['xh'] = index + 1
+                    })
+                }
+                resolve(result);
+            })
+    })
+}
+
+
+/**
+ * @description:获取资源类型字典
+ */
+ export function getServiceTypes() {
+    const formData = new FormData();
+    formData.append("interfaceName", "antu.space.provider.sservicebase.SServicebaseProvider");
+    formData.append("methodName", "getSServiceTypes");
+    formData.append("args[]", session.getItem('tokenV2'));
+    formData.append("args[]", '{"abbreviation":"MR","pid":"MapResource"}');
+    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);
+            })
+    })
+}
+
+
+/**
+ * @description:获取资源标签
+ */
+ export function queryServiceTags() {
+    const formData = new FormData();
+    formData.append("interfaceName", "antu.space.provider.tags.TagsProvider");
+    formData.append("methodName", "getAllByType");
+    formData.append("args[]", session.getItem('tokenV2'));
+    formData.append("args[]", '业务类型,服务专题,数据类型,年度');
+    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);
+            })
+    })
+}
+
+
+/**
+ * @description:根据标签或者字典
+ */
+ export function queryDicsByName(name) {
+    const formData = new FormData();
+    formData.append("interfaceName", "antu.space.provider.tags.TagsProvider");
+    formData.append("methodName", "getAllByType");
+    formData.append("args[]", session.getItem('tokenV2'));
+    formData.append("args[]", name);
     return new Promise<void>((resolve, reject) => {
         defHttp.post({ url: Api.Login, params: formData, ...interfaceType })
             .then((r) => {
-                resolve(JSON.parse(r.result));
+                let result = r.result === '' ? [] : JSON.parse(r.result)
+                resolve(result);
             })
     })
-}
+}
+
+
+/**
+ * @description:获取坐标系列表
+ */
+ export function queryCoors() {
+    const formData = new FormData();
+    formData.append("interfaceName", "antu.space.provider.geomname.GeomNameCDProvider");
+    formData.append("methodName", "getGeomNameList");
+    formData.append("args[]", session.getItem('tokenV2'));
+    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);
+            })
+    })
+}
+
+/**
+ * @description:新增地图资源
+ */
+ export function insertService(params) {
+    if(!params) return
+    const str = JSON.stringify(params)
+    const formData = new FormData();
+    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}}`)
+    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);
+            })
+    })
+}
+

src/views/resource/map/MapSourceModal.vue

@@ -0,0 +1,87 @@
+<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"></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);
+    const isUpdate = ref(true);
+    const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+      setModalProps({ confirmLoading: false });
+    });
+    const getTitle = computed(() => (!unref(isUpdate) ? '新增地图资源' : '编辑地图资源'));
+
+    async function handleSubmit() {
+      refSourceDetail.value.submitForm();
+    }
+    onMounted(async () => {});
+    return {
+      ...ref(data),
+      registerModal,
+      handleSubmit,
+      getTitle,
+      refSourceDetail,
+    };
+  },
+});
+</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/map/SourceDetail.vue

@@ -0,0 +1,435 @@
+<!--
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-15 22:08:21
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-16 18:09:33
+ * @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="name" label="资源名称" name="name" class="label-form-item">
+              <a-input v-model:value="formState.name" />
+            </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>
+          </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">
+                <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="restype" label="资源类型" name="restype" class="label-form-item">
+              <a-select v-model:value="formState.restype">
+                <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.ID">
+                  <a-select-option :value="tag.ID">{{ tag.GEOMNAME }}</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>
+          </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>
+          </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.sourcetable" />
+            </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="epsccode" label="EPSCCode" name="epsccode" class="label-form-item">
+              <a-input v-model:value="formState.epsccode" />
+            </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-switch
+                checked-children=""
+                un-checked-children=""
+                v-model:checked="formState.runstatus"
+              />
+            </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-switch
+                checked-children=""
+                un-checked-children=""
+                v-model:checked="formState.public"
+              />
+            </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-switch
+                checked-children=""
+                un-checked-children=""
+                v-model:checked="formState.share"
+              />
+            </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-switch
+                checked-children=""
+                un-checked-children=""
+                v-model:checked="formState.open"
+              />
+            </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,
+} 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 { getServiceTypes } from '/@/api/resource/map';
+import { serviceTypes,serviceTags,secrets,sysCoors,respDept,collectDept } from './map.data';
+
+const props = {
+  source: { type: Object, default: null },
+};
+interface FormState {
+  code: string;
+  name: string;
+  aliasname: string;
+  systag: string[];
+  description: string;
+  restype: string;
+  coordinate: string;
+  addr: string;
+  range: string;
+  source: string;
+  secrets: string;
+  sourcetable: string;
+  collect: string;
+  respUnit: string;
+  publishtime: string;
+  publisher: string;
+  updatetype: string;
+  updatetime: string;
+  epsccode: string;
+  runstatus: boolean;
+  public: boolean;
+  share: boolean;
+  open: boolean;
+  // date1: Moment | undefined;
+}
+export default defineComponent({
+  name: 'SourceDetail',
+  components: { BasicForm, UploadOutlined },
+  props,
+  setup(props, { emit }) {
+    const data = reactive({
+      detail: props.detail,
+      fileList: [],
+      serviceTags: serviceTags,
+      secrets:secrets,   //密级
+      sysCoors:sysCoors,  //坐标系
+      serviceTypes: serviceTypes,  //资源类型
+      respDept: respDept,  //责任科室
+      collectDept: collectDept, //保管部门
+    });
+    console.log('责任科室',respDept)
+    const formRef = ref();
+    const formState: UnwrapRef<FormState> = reactive({
+      code: '',
+      name: '',
+      aliasname: '',
+      systag: [],
+      description: '',
+      restype: '',
+      coordinate: '',
+      addr: '',
+      range: '',
+      source: '',
+      secrets: '',
+      sourcetable: '',
+      collect: '',
+      respUnit: '',
+      publishtime: '',
+      publisher: '',
+      updatetype: '',
+      updatetime: '',
+      epsccode: '',
+      runstatus: true,
+      public: false,
+      share: false,
+      open: false,
+      date1: undefined,
+    });
+    const rules = {
+      name: [
+        { required: true, message: '请填写资源名称', trigger: 'blur' },
+        { min: 3, max: 20, message: '长度必须在3到20个字符', trigger: 'blur' },
+      ],
+      aliasname: [
+        { 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' }],
+      coordinate: [{ required: true, message: '请选择坐标系', trigger: 'change' }],
+      addr: [{ required: true, message: 'Please input Activity name', 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();
+    const submitForm = () => {
+      formRef.value
+        .validate()
+        .then(() => {
+          console.log('values', formState, toRaw(formState));
+        })
+        .catch((error: ValidateErrorEntity<FormState>) => {
+          console.log('error', error);
+          createMessage.error('请完成必填信息！');
+        });
+    };
+    const resetForm = () => {
+      formRef.value.resetFields();
+    };
+
+
+    onMounted(() => {
+
+    });
+    return {
+      ...toRefs(data),
+      formRef,
+      rules,
+      formState,
+      submitForm,
+      resetForm,
+      createMessage,
+    };
+  },
+});
+</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/map/index.vue

@@ -1,49 +1,92 @@
 <template>
   <div>
-    <BasicTable :rowSelection="{ type: 'checkbox' }" @register="registerTable" :clickToRowSelect="false">
+    <BasicTable
+      :rowSelection="{ type: 'checkbox' }"
+      @register="registerTable"
+      :clickToRowSelect="false"
+    >
       <template #toolbar>
         <Authority>
-          <a-button type="primary" @click="handleCreate">新增角色</a-button>
+          <a-button type="primary" @click="handleCreate">新增地图</a-button>
         </Authority>
         <Authority>
-          <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
+          <Popconfirm
+            title="您确定要批量删除数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleDeleteOrBatchDelete(null)"
+          >
             <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
           </Popconfirm>
         </Authority>
       </template>
-      <template #status="{ record }">
+      <!-- <template #status="{ record }">
         <Switch :checked="record.status === 1" :loading="record.pendingStatus" checkedChildren="启用" unCheckedChildren="禁用"
           @change="(checked: boolean) => statusChange(checked, record)" />
-      </template>
+      </template> -->
       <template #action="{ record }">
-        <TableAction :actions="[
-          {
-            label: '编辑',
-            icon: 'clarity:note-edit-line',
-            onClick: handleEdit.bind(null, record),
-          },
-          {
-            label: '删除',
-            icon: 'ant-design:delete-outlined',
-            color: 'error',
-            ifShow: record.roleType != RoleEnum.SYS_ADMIN,
-            popConfirm: {
-              title: '是否确认删除',
-              confirm: handleDeleteOrBatchDelete.bind(null, 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),
             },
-          },
-        ]" />
+            {
+              label: '删除',
+              icon: '' /**ant-design:delete-outlined'*/,
+              color: 'error',
+              ifShow: record.roleType != RoleEnum.SYS_ADMIN,
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDeleteOrBatchDelete.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>
-    <RoleDrawer @register="registerDrawer" @success="handleSuccess" />
+    <!-- <MapDrawer @register="registerDrawer" @success="handleSuccess" /> -->
+    <MapSourceModal @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-import { defineComponent, nextTick } from 'vue';
+import { defineComponent, nextTick,onBeforeMount } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { delRole, getRoleListByPage, setRoleStatus } from '/@/api/system/system';
-import { useDrawer } from '/@/components/Drawer';
-import RoleDrawer from './MapDrawer.vue';
+// import { useDrawer } from '/@/components/Drawer';
+import { useModal } from '/@/components/Modal';
+import MapDrawer from './MapDrawer.vue';
+import MapSourceModal from './MapSourceModal.vue';
 import { columns, searchFormSchema } from './map.data';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { Authority } from '/@/components/Authority';
@@ -51,17 +94,16 @@ 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'
 
 export default defineComponent({
   name: 'RoleManagement',
-  components: { BasicTable, RoleDrawer, TableAction, Authority, Switch, Popconfirm },
+  components: { BasicTable, MapDrawer, MapSourceModal, TableAction, Authority, Switch, Popconfirm },
   setup() {
-    const [registerDrawer, { openDrawer }] = useDrawer();
-    function handleSuccess() {
-      reload();
-    }
+    //const [registerDrawer, { openDrawer }] = useDrawer();
+    const [registerModal, { openModal }] = useModal();
     const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
-      title: '角色列表',
+      title: '地图资源列表',
       api: list,
       columns,
       formConfig: {
@@ -80,6 +122,8 @@ export default defineComponent({
         fixed: 'right',
       },
     });
+    const moment = Moment
+    
     const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
       useBatchDelete(delRole, handleSuccess, setProps);
     selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
@@ -95,17 +139,28 @@ export default defineComponent({
     });
 
     function handleCreate() {
-      openDrawer(true, {
+      // openDrawer(true, {
+      //   isUpdate: false,
+      // });
+      openModal(true, {
         isUpdate: false,
       });
     }
 
     function handleEdit(record: Recordable) {
-      openDrawer(true, {
+      // openDrawer(true, {
+      //   record,
+      //   isUpdate: true,
+      // });
+      openModal(true, {
         record,
         isUpdate: true,
       });
-      console.log(record)
+      console.log(record);
+    }
+
+    function handleSuccess() {
+      reload();
     }
 
     const statusChange = async (checked, record) => {
@@ -130,10 +185,15 @@ export default defineComponent({
         reload();
       }
     };
+    onBeforeMount(async()=>{
+
+    })
 
     return {
+      moment,
       registerTable,
-      registerDrawer,
+      // registerDrawer,
+      registerModal,
       handleCreate,
       handleEdit,
       handleSuccess,

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

@@ -1,7 +1,43 @@
 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('保管单位')
+
+const checkStatus = [
+  { label: '未提交', value: 1 },
+  { label: '审核中', value: 2 },
+  { label: '审核不通过', value: 3 },
+  { label: '被驳回', value: 4 },
+  { label: '审核通过', value: 5 },
+]
 export enum KeysTypeEnum {
   DISABLED = 'disabled',
   ENABLED = 'enabled',
@@ -14,39 +50,90 @@ export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }
   [RoleEnum.CUSTOMER_USER]: { key: 'disabled_tenant_auth', keyType: KeysTypeEnum.DISABLED },
 };
 
+/**
+ * 列表显示信息
+*/
 export const columns: BasicColumn[] = [
   {
-    title: '角色名称',
-    dataIndex: 'groupName',
-    width: 200,
+    title: '序号',
+    dataIndex: 'xh',
+    width: 90,
   },
   {
-    title: '角色Code',
-    dataIndex: 'groupid',
-    width: 200,
+    title: '资源编号',
+    dataIndex: 'serviceid',
+    width: 120,
   },
   {
-    title: '类型',
-    dataIndex: 'groupType',
+    title: '资源名称',
+    dataIndex: 'servicename',
+    width: 160,
+  },
+  {
+    title: '坐标系名称',
+    dataIndex: 'crs',
     width: 120,
   },
-
   {
-    title: '备注',
-    dataIndex: 'memo',
-    width: 240,
+    title: '资源标签',
+    dataIndex: 'service',
+    width: 120,
   },
   {
-    title: '排序',
-    dataIndex: 'sort',
+    title: '发布人',
+    dataIndex: 'publisher',
+    width: 100,
+  },
+  {
+    title: '发布时间',
+    dataIndex: 'publishdate',
+    width: 180,
+    slots: { customRender: 'pdate' },
+  },
+  {
+    title: '当前环节',
+    dataIndex: 'curLink',
+    width: 90,
+  },
+  {
+    title: '当前处理人',
+    dataIndex: 'curHandler',
+    width: 100,
+  },
+  {
+    title: '审核状态',
+    dataIndex: 'status',
+    width: 110,
+    slots: { customRender: 'status' },
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'checkTime',
     width: 180,
   },
 ];
 
+/**
+ * 查询条件
+*/
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'roleName',
-    label: '角色名称',
+    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: {
@@ -54,19 +141,19 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'status',
-    label: '状态',
+    field: 'checkStatus',
+    label: '审核状态',
     component: 'Select',
     componentProps: {
-      options: [
-        { label: '启用', value: 1 },
-        { label: '停用', value: 0 },
-      ],
+      options: checkStatus,
     },
     colProps: { span: 6 },
   },
 ];
 
+/**
+ * 表单
+*/
 export const formSchema: FormSchema[] = [
   {
     field: 'groupName',