Przeglądaj źródła

授权管理和应用管理

sujunling 2 lat temu
rodzic
commit
5cc3c0f569

+ 3 - 11
src/api/authorize/authorize.ts

@@ -65,20 +65,12 @@ export const allUser = (params: AccountParams) => {
  * @description:保存APP
  */
 export const save = (params) => {
-    var a = {
-        "system": { "id": "", "name": "test", "key": "test", "note": "ssssss" },
-        "userIds": "106083",
-        "clientSecretStr": "test",
-        "scope": "app",
-        "grantTypes": ["authorization_code"],
-        "autoapprove": true
-    }
     return new Promise<void>((resolve, reject) => {
         defHttp.post<AccountListGetResultModel>({ url: Api.Save, params }).then((r) => {
-            if (r.resp_code == 0 && r.datas && r.datas.records.length) {
-                resolve(r.datas.records);
+            if (r.resp_code == 0 && r.datas) {
+                resolve(r);
             } else {
-                resolve([]);
+                reject(r);
             }
         })
     })

+ 17 - 28
src/views/authorize/app/AppDrawer.vue

@@ -9,14 +9,12 @@ import { BasicForm, useForm } from '/@/components/Form/index';
 import { formSchema } from './app.data';
 import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
 import { v4 as uuidv4 } from 'uuid';
-// 加载菜单
-import { getMenuList } from '/@/api/sys/menu';
-
 import { save } from '/@/api/authorize/authorize';
 import { listToTree } from '/@/utils/menuUtil';
 
 import { useI18n } from '/@/hooks/web/useI18n';
 import { metaModel } from '/@/api/system/model/menuModel';
+import { message } from 'ant-design-vue';
 
 export default defineComponent({
   name: 'MenuDrawer',
@@ -45,33 +43,18 @@ export default defineComponent({
       //如果是编辑操作,设置页面数据
       if (unref(isUpdate)) {
         // // 动态设置 表单值
-        //
-        let menuObj: metaModel = Reflect.get(data.record, 'meta');
-        Reflect.set(data.record, 'menuType', menuObj.menuType); //meta.menuType
-        Reflect.set(data.record, 'title', menuObj.title); //meta.title
-        Reflect.set(data.record, 'icon', menuObj.icon); //meta.icon
-        Reflect.set(data.record, 'hideMenu', menuObj.hideMenu); //meta.hideMenu
-        Reflect.set(data.record, 'ignoreKeepAlive', menuObj.ignoreKeepAlive); //meta.ignoreKeepAlive
-        Reflect.set(data.record, 'isLink', menuObj.isLink); //meta.isLink
-        Reflect.set(data.record, 'status', menuObj.status); //meta.status
+        Reflect.set(data.record, 'name', data.record.NAME);
+        Reflect.set(data.record, 'note', data.record.NOTE);
         //为表单赋值
         setFieldsValue({
           ...data.record,
         });
-
         //编辑模式,菜单名称为不可用
         updateSchema({ field: 'title', componentProps: { disabled: false } });
       }
       if (isUpdate.value) {
-        menuId = Reflect.get(data.record, 'id');
+        menuId = Reflect.get(data.record, 'SYSID');
       }
-      //加载菜单
-      // let treeData = await getMenuList(1);
-      // treeData = listToTree(treeData);
-      // updateSchema({
-      //   field: 'parentId',
-      //   componentProps: { treeData },
-      // });
     });
 
     //得到页面标题
@@ -84,25 +67,31 @@ export default defineComponent({
         console.log(v);
         if (isUpdate.value) {
 
+        } else {
+          menuId = null;
         }
         console.log("1111:", v);
         var data = {
           "system": {
-            "id": "",
+            "id": menuId,
             "name": v.name,
             "key": v.name,
             "note": v.note
           },
           // "userIds": v.userid,
           "clientSecretStr": "test",
-          "scope": v.scope,
-          "grantTypes": [v.grantTypes],
-          "autoapprove": v.autoapprove
+          "scope": "app",//v.scope,
+          "grantTypes": ['authorization_code'],
+          "autoapprove": true//v.autoapprove
         }
         //保存
-        await save(data);
-        closeDrawer(); //关闭侧框
-        emit('success');
+        await save(data).then(r => {
+          closeDrawer(); //关闭侧框
+          emit('success');
+          message.success(r.resp_msg);
+        }).catch(e => {
+          message.error(e.resp_msg);
+        })
       } finally {
         setDrawerProps({ confirmLoading: false });
       }

+ 62 - 62
src/views/authorize/app/app.data.ts

@@ -98,68 +98,68 @@ export const formSchema: FormSchema[] = [
       placeholder: '请输入应用名称',
     },
   },
-  {
-    field: 'scope',
-    label: '密匙范围',
-    required: true,
-    component: 'RadioButtonGroup',
-    componentProps: {
-      options: [
-        {
-          label: '系统内部',
-          value: 'app'
-        },
-        {
-          label: '平台',
-          value: 'all'
-        }
-      ],
-    },
-  },
-  {
-    field: 'grantTypes',
-    label: '授权方式',
-    required: true,
-    component: 'RadioButtonGroup',
-    componentProps: {
-      options: [
-        {
-          label: '授权码',
-          value: 'authorization_code'
-        },
-        {
-          label: '密码',
-          value: 'password'
-        },
-        {
-          label: '客户端凭证',
-          value: 'client_credentials'
-        },
-        {
-          label: 'token刷新口令',
-          value: 'refresh_token'
-        }
-      ],
-    },
-  },
-  {
-    field: 'autoapprove',
-    label: '自动授权',
-    required: true,
-    component: 'RadioButtonGroup',
-    componentProps: {
-      options: [
-        {
-          label: '是',
-          value: true
-        },
-        {
-          label: '否',
-          value: false
-        }
-      ],
-    },
-  },
+  // {
+  //   field: 'scope',
+  //   label: '密匙范围',
+  //   required: true,
+  //   component: 'RadioButtonGroup',
+  //   componentProps: {
+  //     options: [
+  //       {
+  //         label: '系统内部',
+  //         value: 'app'
+  //       },
+  //       {
+  //         label: '平台',
+  //         value: 'all'
+  //       }
+  //     ],
+  //   },
+  // },
+  // {
+  //   field: 'grantTypes',
+  //   label: '授权方式',
+  //   required: true,
+  //   component: 'RadioButtonGroup',
+  //   componentProps: {
+  //     options: [
+  //       {
+  //         label: '授权码',
+  //         value: 'authorization_code'
+  //       },
+  //       {
+  //         label: '密码',
+  //         value: 'password'
+  //       },
+  //       {
+  //         label: '客户端凭证',
+  //         value: 'client_credentials'
+  //       },
+  //       {
+  //         label: 'token刷新口令',
+  //         value: 'refresh_token'
+  //       }
+  //     ],
+  //   },
+  // },
+  // {
+  //   field: 'autoapprove',
+  //   label: '自动授权',
+  //   required: true,
+  //   component: 'RadioButtonGroup',
+  //   componentProps: {
+  //     options: [
+  //       {
+  //         label: '是',
+  //         value: true
+  //       },
+  //       {
+  //         label: '否',
+  //         value: false
+  //       }
+  //     ],
+  //   },
+  // },
   // {
   //   field: 'userid',
   //   label: '系统用户',

+ 6 - 7
src/views/authorize/app/index.vue

@@ -11,12 +11,12 @@
       </template>
       <template #action="{ record }">
         <TableAction :actions="[
-          // {
-          //   label: '编辑',
-          //   tooltip: '编辑',
-          //   icon: 'clarity:note-edit-line',
-          //   onClick: handleEdit.bind(null, record),
-          // },
+          {
+            label: '编辑',
+            tooltip: '编辑',
+            icon: 'clarity:note-edit-line',
+            onClick: handleEdit.bind(null, record),
+          },
           {
             label: '删除',
             tooltip: '删除',
@@ -146,7 +146,6 @@ export default defineComponent({
     async function handleDelete(record: Recordable) {
       try {
         // let ids = isArray(record.departid) ? record.departid : [record.departid];
-        // debugger;
         await deleteApp({
           "systemId": record.SYSID,
           "systemKey": record.KEY,

+ 225 - 0
src/views/authorize/empower/MapDrawer.vue

@@ -0,0 +1,225 @@
+<template>
+  <BasicDrawer v-bind="$attrs" @register="registerDrawer" showFooter :title="getTitle" width="500px" @ok="handleSubmit">
+    <BasicForm @register="registerForm">
+      <template #menu>
+        <Spin :spinning="spinning"></Spin>
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+import { defineComponent, ref, computed, unref, nextTick } from 'vue';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { formSchema, KeysTypeEnum, RoleMenuDictEnum } from './map.data';
+import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+import { BasicTree, TreeItem } from '/@/components/Tree';
+import { useMessage } from '/@/hooks/web/useMessage';
+const { t } = useI18n(); //加载国际化
+// 加载菜单数据
+import { getMenuList } from '/@/api/sys/menu';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { MenuRecord } from '/@/api/sys/model/menuModel';
+import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { RoleEnum } from '/@/enums/roleEnum';
+import { Spin } from 'ant-design-vue';
+import { useUserStore } from '/@/store/modules/user';
+import { session } from '/@/utils/Memory';
+import { v4 as uuidv4 } from 'uuid';
+
+
+type TreeData = MenuRecord & TreeItem;
+
+export default defineComponent({
+  name: 'RoleDrawer',
+  components: { BasicDrawer, BasicForm, BasicTree, Spin },
+  emits: ['success', 'register'],
+  setup(_, { emit }) {
+    const isUpdate = ref<boolean>(true);
+    const treeData = ref<TreeData[]>([]);
+    const roleMenus = ref<string[]>([]);
+    const roleId = ref<string>('');
+    const checked = ref<string[]>([]); //需要选中的节点
+    const spinning = ref(false);
+    var nowRole = null;
+
+    const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+      labelWidth: 100,
+      schemas: formSchema,
+      showActionButtonGroup: false,
+    });
+
+    const transformName = (data: TreeData[]) => {
+      return data.map((item) => {
+        item.name = t(item.name);
+        if (item.children && item.children.length) {
+          item.children = transformName(item.children as unknown as TreeData[]);
+        }
+        return item;
+      });
+    };
+
+    const userStore = useUserStore();
+    const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+      resetFields();
+      roleId.value = '';
+      // 在打开弹窗时清除所有选择的菜单
+      isUpdate.value = data.isUpdate;
+      const roleType = data?.record?.roleType || userStore.getRoleList.at(0);
+
+      try {
+        spinning.value = true;
+        // 需要在setFieldsValue之前先填充treeData,否则Tree组件可能会报key not exist警告
+
+        if (!unref(treeData).length) {
+          // 获取全部的菜单
+          const menuListModel = await getMenuList();
+          treeData.value = transformName(menuListModel as unknown as TreeData[]);
+        }
+
+        const keys = await getPermissionByRole(roleType);
+        const { keyType } = RoleMenuDictEnum[roleType];
+        treeData.value = getPermissionTreeData(
+          unref(treeData) as unknown as TreeData[],
+          keys,
+          keyType
+        );
+        // 更新
+        if (unref(isUpdate)) {
+          checked.value = [];
+          roleId.value = data.record.id;
+          nowRole = data.record;
+          setFieldsValue(data.record);
+        } else {
+        }
+      } catch (error) {
+        throw error;
+      } finally {
+        spinning.value = false;
+      }
+    });
+
+    const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
+
+    async function handleSubmit() {
+      setDrawerProps({ confirmLoading: true });
+      const { createMessage } = useMessage();
+      try {
+        const values = await validate();
+        const req = {
+          groupName: values.groupName,
+          sort: values.sort
+        };
+        if (unref(isUpdate)) {
+          if (nowRole) {
+            req.updateuser = session.getItem("userInfo").EMPLOYEE.EMPLOYEE_ID;
+            req.groupid = nowRole.groupid;
+          }
+        } else {
+          req.groupid = uuidv4()
+        }
+        saveOrUpdateRoleInfoWithMenu(req).then(() => {
+          closeDrawer();
+          emit('success');
+          nowRole = null;
+          createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
+        });
+      } finally {
+        setTimeout(() => {
+          setDrawerProps({ confirmLoading: false });
+        }, 300);
+      }
+    }
+
+    const getPermissionByRole = async (roleType: RoleEnum) => {
+      try {
+        const { key } = RoleMenuDictEnum[roleType];
+        const res = await findDictItemByCode({ dictCode: key });
+        return res.map((item) => item.itemValue);
+      } catch (error) { }
+      return [];
+    };
+
+    const getPermissionTreeData = (
+      data: MenuRecord[],
+      permissionKeys: string[],
+      keysType: KeysTypeEnum
+    ) => {
+      const setDisabled = (data: MenuRecord[], flag: boolean) => {
+        return data.map((item) => {
+          item.name = t(item.name);
+          if (item.children && item.children.length) {
+            item.children = setDisabled(item.children, flag);
+          }
+          return {
+            ...item,
+            disabled: flag,
+            icon: item.meta.icon,
+          } as TreeData;
+        });
+      };
+
+      const permissionCompare = (
+        data: MenuRecord[],
+        permissionKeys: string[],
+        keysType: KeysTypeEnum
+      ) => {
+        return data.map((item) => {
+          item.name = t(item.name);
+          const findFlag = permissionKeys.includes(item.permission);
+          if (findFlag) item.isDictCompareDisabled = true;
+          const disabledFlag = keysType === KeysTypeEnum.DISABLED ? findFlag : !findFlag;
+          item.disabled = disabledFlag;
+
+          if (item.isDictCompareDisabled && item.children && item.children.length) {
+            setDisabled(item.children, disabledFlag);
+          } else {
+            if (item.children && item.children.length) {
+              item.children = permissionCompare(item.children, permissionKeys, keysType);
+              item.disabled = item.children.every((temp) => temp.disabled);
+            }
+          }
+          return {
+            ...item,
+            icon: item.meta.icon,
+          } as TreeData;
+        });
+      };
+
+      const result = permissionCompare(data, permissionKeys, keysType).map((item) => {
+        if (item.children && item.children.length) {
+          const rootDisabledFlag = item.children.every((temp) => temp.disabled);
+          item.disabled = rootDisabledFlag;
+        }
+        return item;
+      });
+
+      return result;
+    };
+
+    return {
+      spinning,
+      registerDrawer,
+      registerForm,
+      getTitle,
+      handleSubmit,
+      treeData,
+      roleMenus,
+    };
+  },
+});
+</script>
+
+<style scoped lang="less">
+:deep(.vben-basic-tree) {
+  width: 100% !important;
+}
+
+:deep(.is-unflod) {
+  display: none !important;
+}
+
+:deep(.is-flod) {
+  display: none !important;
+}
+</style>

+ 105 - 0
src/views/authorize/empower/MapSourceModal.vue

@@ -0,0 +1,105 @@
+<!--
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-15 16:19:10
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-28 13:57:55
+ * @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" :isView="isView"></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 { 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 }) {
+    let activeKey = '1';
+    const refSourceDetail = ref(null);
+    let formData = ref(null)
+    let isUpdate = ref(true);
+    let isView = ref(false)
+    const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+      setModalProps({ confirmLoading: false });
+      isUpdate.value = !!data?.isUpdate;
+      isView.value = !!data?.isView;
+      if(isUpdate.value) formData.value = data.record
+    });
+    const getTitle = computed(() => (!unref(isUpdate) ? '新增地图资源' : '编辑地图资源'));
+
+    async function handleSubmit() {
+      refSourceDetail.value.submitForm();
+    }
+    const RtnMain = (status) => {
+      emit('success')
+    }
+
+    onMounted(() => {});
+    return {
+      activeKey,
+      registerModal,
+      handleSubmit,
+      getTitle,
+      refSourceDetail,
+      isUpdate,
+      isView,
+      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>
+  

+ 633 - 0
src/views/authorize/empower/SourceDetail.vue

@@ -0,0 +1,633 @@
+<!--
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-15 22:08:21
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-28 14:26:58
+ * @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" :disabled="isView"/>
+            </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" :disabled="isView"/>
+            </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" :disabled="isView"/>
+            </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" :disabled="isView">
+                <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"
+              :disabled="isView"
+            >
+              <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" :disabled="isView">
+                <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" :disabled="isView">
+                <template v-for="tag in serviceTypes" :key="tag.value">
+                  <a-select-option :value="tag.value">{{ tag.label }}</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" :disabled="isView">
+                <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" :disabled="isView"/>
+            </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" :disabled="isView"/>
+            </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" :disabled="isView"/>
+            </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" :disabled="isView">
+                <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" :disabled="isView"/>
+            </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" :disabled="isView">
+                <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" :disabled="isView">
+                <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
+                :disabled="isView"
+              >
+                <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 :disabled="isView"/>
+            </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" :disabled="isView"/>
+            </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" :disabled="isView">
+                <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"
+                :disabled="isView"
+              />
+            </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"
+                :disabled="isView"
+              />
+            </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"
+                :disabled="isView"
+              />
+            </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"
+                :disabled="isView"
+              />
+            </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"
+                :disabled="isView"
+              />
+            </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, updateService } from '/@/api/resource/map';
+import {
+  serviceTypes,
+  serviceTags,
+  secrets,
+  sysCoors,
+  respDept,
+  collectDept,
+  EPSGCodes,
+} from '../../dataAdmin/dataAdmin/sysDic';
+import { session } from '/@/utils/Memory.js';
+const props = {
+  formData: { type: Object, default: ref(null) },
+  isUpdate: { type: Boolean, default: ref(false) },
+  isView: { 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,
+      isView: props.isView,
+      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;
+      }
+    );
+    watch(
+      () => props.isView,
+      (obj) => {
+        data.isView = obj;
+      }
+    );
+
+    const submitForm = () => {
+      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,
+    };
+  },
+});
+</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>
+  

+ 233 - 0
src/views/authorize/empower/index.vue

@@ -0,0 +1,233 @@
+<template>
+  <div>
+    <BasicTable
+      :rowSelection="{ type: 'checkbox' }"
+      @register="registerTable"
+      :clickToRowSelect="false"
+    >
+      <template #toolbar>
+        <Authority>
+          <a-button type="primary" @click="handleCreate">新增地图</a-button>
+        </Authority>
+        <Authority>
+          <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 }">
+        <Switch :checked="record.status === 1" :loading="record.pendingStatus" checkedChildren="启用" unCheckedChildren="禁用"
+          @change="(checked: boolean) => statusChange(checked, record)" />
+      </template> -->
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: '浏览',
+              icon: '' /**clarity:note-edit-line*/,
+              onClick: handleViewMap.bind(null, record),
+            },
+            {
+              label: '查看',
+              icon: '' /**clarity:note-edit-line*/,
+              onClick: handleView.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: handleDelete.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' : '#05B069' };`"
+        >
+          {{
+           record.status === 0 ? '待审核' : (record.status === 1 ? '审核通过' : (record.status === 2 ? '审核不通过' : ( record.status === 3 ? '被驳回' : '未提交' )))
+          }}
+        </Tag>
+      </template>
+    </BasicTable>
+    <!-- <MapDrawer @register="registerDrawer" @success="handleSuccess" /> -->
+    <MapSourceModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+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 { 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';
+import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { Switch, Popconfirm } from 'ant-design-vue';
+import { list,deleteService } from '/@/api/resource/map';
+import Moment from 'moment'
+
+export default defineComponent({
+  name: 'RoleManagement',
+  components: { BasicTable, MapDrawer, MapSourceModal, TableAction, Authority, Switch, Popconfirm },
+  setup() {
+    //const [registerDrawer, { openDrawer }] = useDrawer();
+    const [registerModal, { openModal }] = useModal();
+    const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
+      title: '地图资源列表',
+      api: list,
+      columns,
+      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,
+      },
+    });
+    const moment = Moment
+    const { createMessage } = useMessage();
+    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() {
+      openModal(true, {
+        isUpdate: false,
+      });
+    }
+
+    function handleView(record: Recordable) {
+      openModal(true, {
+        record,
+        isUpdate: true,
+        isView: true,
+      });
+    }
+
+    function handleEdit(record: Recordable) {
+      openModal(true, {
+        record,
+        isUpdate: true,
+      });
+    }
+
+    function handleViewMap(record: Recordable){
+      window.open(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${record.serviceid}`,'target',"")
+    }
+
+    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();
+    }
+
+    const statusChange = async (checked, record) => {
+      setProps({
+        loading: true,
+      });
+      setSelectedRowKeys([]);
+      resetSelectedRowKeys();
+      const newStatus = checked ? 1 : 0;
+      try {
+        await setRoleStatus(record.id, newStatus);
+        if (newStatus) {
+          createMessage.success(`启用成功`);
+        } else {
+          createMessage.success('禁用成功');
+        }
+      } finally {
+        setProps({
+          loading: false,
+        });
+        reload();
+      }
+    };
+    onBeforeMount(async()=>{
+
+    })
+
+    return {
+      moment,
+      createMessage,
+      registerTable,
+      // registerDrawer,
+      registerModal,
+      handleCreate,
+      handleViewMap,
+      handleEdit,
+      handleView,
+      handleDelete,
+      handleSuccess,
+      RoleEnum,
+      hasBatchDelete,
+      handleDeleteOrBatchDelete,
+      statusChange,
+    };
+  },
+});
+</script>

+ 147 - 0
src/views/authorize/empower/map.data.ts

@@ -0,0 +1,147 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { RoleEnum } from '/@/enums/roleEnum';
+// import { serviceTags,checkStatus } from '../sysDic'
+
+export 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: 'resTag',
+    label: '资源标签',
+    component: 'Select',
+    componentProps: {
+      options:
+        [
+          { 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',
+    width: 120,
+  },
+  {
+    title: '资源名称',
+    dataIndex: 'servicename',
+    width: 160,
+  },
+  {
+    title: '坐标系名称',
+    dataIndex: 'crs',
+    width: 120,
+  },
+  {
+    title: '资源标签',
+    dataIndex: 'service',
+    width: 120,
+  },
+  {
+    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 formSchema: FormSchema[] = [
+  {
+    field: 'groupName',
+    label: '角色名称',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入角色名称',
+    },
+  },
+  {
+    label: '排序',
+    field: 'sort',
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入排序',
+    },
+  }
+];

+ 2 - 3
src/views/dataAdmin/assembly/SourceDetail.vue

@@ -51,7 +51,7 @@
         </a-row>
       </div>
 
-      <div class="compontents">
+      <!-- <div class="compontents">
         <div class="title">描述信息</div>
         <a-row class="form-container">
 
@@ -63,7 +63,6 @@
 
           <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>
@@ -112,7 +111,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-      </div>
+      </div> -->
     </a-form>
   </div>
 </template>

+ 26 - 17
src/views/dataAdmin/assembly/index.vue

@@ -3,13 +3,13 @@
     <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>
+        <!-- <Authority>
           <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
             <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
           </Popconfirm>
-        </Authority>
+        </Authority> -->
       </template>
       <!-- <template #status="{ record }">
         <Switch :checked="record.status === 1" :loading="record.pendingStatus" checkedChildren="启用" unCheckedChildren="禁用"
@@ -31,22 +31,31 @@
             onClick: handleEdit.bind(null, record),
           },
           {
-            label: '编辑',
+            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: handleDelete.bind(null, record),
-            },
+            // ifShow: record.servicealiasname,
+            // ifShow: ((action) => action.servicealiasname),
+            ifShow: record.servicealiasname,
+            onClick: see.bind(null, record),
           },
-        ]" />
+        ]" :drop-down-actions="[
+  {
+    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: handleDelete.bind(null, record),
+    },
+  },
+]" />
       </template>
       <template #pdate="{ record }">
         <Tag :color="'red'">