Bladeren bron

Merge branch 'main' of http://221.182.8.141:2300/sujunling/xld-gis-admin

XiaXxxxxx 2 jaren geleden
bovenliggende
commit
de723196ba

+ 1 - 1
.env.development

@@ -11,7 +11,7 @@ VITE_GLOB_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://192.168.2.225/api"]]
 
 # 线上演示环境
-VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"]]
+VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"]]
                                                               
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]

+ 15 - 6
public/mapview.html

@@ -30,15 +30,24 @@
 <body>
     <script>
         window.onload = function () {
-            var arr = window.location.href.split("?")
+            var obj = JSON.parse(JSON.stringify(window.location.href));
+            var arr = obj.split("?")
             if (arr.length && arr[1]) {
-                const iframe = document.createElement('iframe');
-                iframe.style.width = '100vw';
-                iframe.style.height = '100vh';
-                iframe.src = arr[1];
-                document.body.appendChild(iframe);
+                if (arr[1].indexOf("onlineIde_") > -1) {
+                    creteIframe(`http://106.12.170.138:4001/examples/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
+                } else {
+                    creteIframe(arr[1])
+                }
             }
         }
+
+        function creteIframe(url) {
+            const iframe = document.createElement('iframe');
+            iframe.style.width = '100vw';
+            iframe.style.height = '100vh';
+            iframe.src = url;
+            document.body.appendChild(iframe);
+        }
     </script>
 </body>
 

+ 37 - 29
src/api/sys/menu.ts

@@ -6,6 +6,7 @@ import menu from '/@/mock/menu.json'
 import menu_get_ids from '/@/mock/menu_get_ids.json'
 import tool from '/@/utils/Tool';
 import { identity } from 'lodash-es';
+import { session } from '/@/utils/Memory';
 
 enum Api {
   BaseMenuUrl = '/menu',
@@ -17,7 +18,8 @@ enum Api {
   GetChildDepartment = '/user-center/department/getChildDepartment',
   // GetMenuTreeData = "/base-center/menu/getMenuTreeData",
   GetMenuTreeData = "/base-center/newmenu/getMenuTreeData",
-  DeleteMenuData = '/base-center/newmenu/deleteMenuData'
+  DeleteMenuData = '/base-center/newmenu/deleteMenuData',
+  DeleteMenuDataList = '/base-center/newmenu/deleteMenuDataList'
 }
 
 
@@ -64,41 +66,45 @@ export const structureList = () => {
  */
 
 export const getMenuList = (args?: number) => {
-  const userStore = useUserStore();
-  let url = Api.GetMenuList;
+  // const userStore = useUserStore();
+  // let url = Api.GetMenuList;
+  // try {
+  //   if (userStore.getRoleList.find((v) => v == RoleEnum.SYS_ADMIN)) {
+  //     url = Api.SysAdminMenuList;
+  //   }
+  //   return new Promise<void>((resolve, reject) => {
+  //     resolve(menu)
+  //   })
+  // } catch (e) { }
+
   try {
-    if (userStore.getRoleList.find((v) => v == RoleEnum.SYS_ADMIN)) {
-      url = Api.SysAdminMenuList;
-    }
     return new Promise<void>((resolve, reject) => {
-      resolve(menu)
+      return defHttp.post<getMenuListResultModel>({
+        url: Api.GetMenuTreeData,
+      }).then(r => {
+        session.setItem("menu_get_ids", menu_get_ids.concat(r.datas.map(i => i.id)))
+        var o = buildTree(r.datas)
+        resolve(o)
+      });
     })
-  } catch (e) { }
+  } catch (e) {
+
+  };
 };
 
 /**
  * @description: 获取新菜单列表
  */
-
-
-function moveProperties(obj) {
-  if (typeof obj !== 'object' || obj === null) {
-    return obj;
-  }
-  if (Array.isArray(obj)) {
-    return obj.map(moveProperties);
-  }
-  const newObj = {};
-  for (const key in obj) {
-    if (key === 'meta' && obj.meta) {
-      newObj.meta = JSON.parse(obj.meta);
-    } else if (key === 'children') {
-      newObj[key] = moveProperties(obj[key]);
-    } else {
-      newObj[key] = moveProperties(obj[key]);
+function buildTree(nodes, parentId = null) {
+  let tree = [];
+  for (let node of nodes) {
+    if (node.parentid === parentId) {
+      node.meta = JSON.parse(node.meta)
+      node.children = buildTree(nodes, node.id);
+      tree.push(node);
     }
   }
-  return newObj;
+  return tree;
 }
 export const menuList = (args?: number) => {
   try {
@@ -106,7 +112,8 @@ export const menuList = (args?: number) => {
       return defHttp.post<getMenuListResultModel>({
         url: Api.GetMenuTreeData,
       }).then(r => {
-        var o = moveProperties(r.datas)
+        session.setItem("menu_get_ids", menu_get_ids.concat(r.datas.map(i => i.id)))
+        var o = buildTree(r.datas)
         resolve(o)
       });
     })
@@ -138,13 +145,14 @@ export const getMenuList2 = (args?: number) => {
  * @description: 按钮的单个删除和数组删除
  */
 export const delMenu = (menuIds: string[]) => {
-  return defHttp.post({ url: Api.DeleteMenuData, data: { menus: menuIds.map(i => { return { id: i } }) } });
+  return defHttp.post({ url: Api.DeleteMenuDataList, data: menuIds.map(i => { return { id: i } }) });
 };
 
 export const getMenusIdsByRoleId = (roleId: string) => {
   const url = Api.GetMenuIdsByRoleId + roleId;
   // return defHttp.get<Array<string>>({ url });
   return new Promise<void>((resolve, reject) => {
-    resolve(menu_get_ids);
+    // resolve(menu_get_ids);
+    resolve(session.getItem("menu_get_ids"))
   })
 };

+ 17 - 17
src/mock/menu.json

@@ -56,7 +56,7 @@
                 "parentId": "27ec1926-8369-4cca-bf8e-dbd25d70c6bb",
                 "children": [
                     {
-                        "id": "a8ffa8c5-637e-472b-a9e6-b60cebe95714",
+                        "id": "a8ffa8c5-637e-472b-a9e6-b60cebe95794",
                         "createTime": "2021-09-10 20:47:55",
                         "updateTime": "2021-12-20 11:45:32",
                         "name": "routes.common.system.accountManagement",
@@ -582,25 +582,25 @@
                 "menuOut": "1"
             },
             {
-                "id": "aa827552-1277-4393-a9bf-1f57340d7d1b",
+                "id": "aa827552-1277-4393-a2bf-1f57340d7d1b",
                 "createTime": "2023-08-01 14:39:53",
-                "name": "服务管理",
+                "name": "组件管理",
                 "parentId": "dccbd1ba-f506-4837-ada1-6675261471e8",
                 "children": [
                     {
-                        "id": "1dba6f56-4186-4df3-a845-349ec848719d",
+                        "id": "1db46f56-4186-4df3-a845-349ec848719d",
                         "createTime": "2023-08-01 14:40:42",
-                        "name": "组件服务",
+                        "name": "组件资源上传",
                         "parentId": "aa827552-1277-4393-a9bf-1f57340d7d1b",
                         "children": [],
-                        "path": "/zj/server",
+                        "path": "/assembly/upload",
                         "type": "SYSADMIN",
-                        "permission": "",
+                        "permission": "assembly:upload",
                         "sort": 30,
-                        "component": "LAYOUT",
+                        "component": "/dataAdmin/assembly/index",
                         "meta": {
                             "icon": "mdi:feature-search",
-                            "title": "组件服务",
+                            "title": "组件资源上传",
                             "isLink": false,
                             "menuType": "0",
                             "hideMenu": false,
@@ -610,7 +610,7 @@
                         "menuOut": "1"
                     }
                 ],
-                "path": "/server/admin",
+                "path": "/assembly/admin",
                 "type": "SYSADMIN",
                 "permission": "",
                 "sort": 28,
@@ -940,7 +940,7 @@
                 "redirect": ""
             },
             {
-                "id": "aeaf0364-8a4b-4ced-8751-a652b6173fa4",
+                "id": "aeaf0364-8a4b-4ced-8751-a652b6173fa9",
                 "createTime": "2022-06-15 09:16:58",
                 "updateTime": "2022-06-16 14:17:05",
                 "name": "日志管理",
@@ -951,7 +951,7 @@
                         "createTime": "2022-06-16 09:37:41",
                         "updateTime": "2022-06-16 14:17:35",
                         "name": "操作日志",
-                        "parentId": "aeaf0364-8a4b-4ced-8751-a652b6173fa4",
+                        "parentId": "aeaf0364-8a4b-4ced-8751-a652b6173fa9",
                         "children": [],
                         "path": "/log/operate",
                         "type": "SYSADMIN",
@@ -973,7 +973,7 @@
                         "createTime": "2022-06-16 09:39:44",
                         "updateTime": "2022-06-16 09:44:01",
                         "name": "异常日志",
-                        "parentId": "aeaf0364-8a4b-4ced-8751-a652b6173fa4",
+                        "parentId": "aeaf0364-8a4b-4ced-8751-a652b6173fa9",
                         "children": [],
                         "path": "/log/exception",
                         "type": "SYSADMIN",
@@ -995,7 +995,7 @@
                         "createTime": "2022-06-16 09:41:08",
                         "updateTime": "2022-06-16 09:44:20",
                         "name": "登录日志",
-                        "parentId": "aeaf0364-8a4b-4ced-8751-a652b6173fa4",
+                        "parentId": "aeaf0364-8a4b-4ced-8751-a652b6173fa9",
                         "children": [],
                         "path": "/log/user",
                         "type": "SYSADMIN",
@@ -1063,7 +1063,7 @@
                         "redirect": ""
                     },
                     {
-                        "id": "a8ffa8c5-637e-473b-a9e6-b60cebe95715",
+                        "id": "a8ffa8c5-637e-473b-a9e6-b60cebe95719",
                         "createTime": "2021-09-10 20:46:55",
                         "updateTime": "2021-12-20 11:45:44",
                         "name": "routes.common.system.roleManagement",
@@ -1084,7 +1084,7 @@
                         "redirect": ""
                     },
                     {
-                        "id": "244dd88c-d414-4c38-85a0-86104d21b172",
+                        "id": "244dd88c-d414-4c38-85a0-86104d21b179",
                         "createTime": "2021-11-16 19:17:48",
                         "updateTime": "2021-12-20 11:46:16",
                         "name": "机构管理",
@@ -1183,7 +1183,7 @@
                 }
             },
             {
-                "id": "60d370b3-edf7-4e1d-bfef-4538cc04f1b2",
+                "id": "60d370b3-edf7-4e1d-bfef-4538cc04f1b9",
                 "createTime": "2023-08-01 12:01:32",
                 "name": "菜单管理",
                 "parentId": "27ec1926-8369-4cca-bf8e-dbd25d70c6bb",

+ 14 - 1
src/mock/menu_get_ids.json

@@ -8,9 +8,12 @@
     "db41fac4-ec4c-4e41-986e-44baca67ac38",
     "83326dff-9f55-4930-abea-09e61306c2d5",
     "502c9897-4abe-44ad-92cf-a74d402f7fe3",
+    "aa827552-1277-4393-a2bf-1f57340d7d1b",
     "4ce99298-d100-4479-ac61-3f6762ade2c4",
     "1dba6f56-4186-4df3-a845-349ec848719d",
     "60d370b3-edf7-4e1d-bfef-4538cc04f1b2",
+    "1db46f56-4186-4df3-a845-349ec848719d",
+    "1dba6f56-4186-4df3-a845-349ec848719d",
     "50843259-c2de-442a-9da2-9a17f161a970",
     "d748df94-bf81-4a9a-8918-56a07e6ce61e",
     "4196ae37-9026-4761-bd99-495ffff085b8",
@@ -87,11 +90,13 @@
     "51671de9-a483-40d1-a3de-103e9b12c7fd",
     "c188d9aa-37dc-4950-8ee9-45acd62c35ba",
     "afadbe81-1794-402b-ab78-2e4e9a71c16e",
+    "244dd88c-d414-4c38-85a0-86104d21b179",
     "caa740f2-4c27-4110-a91f-74a241764247",
     "389dcb41-cefa-41b8-9731-4de69cb768b8",
     "a8ffa8c5-637e-476b-a9e6-b60cebe95718",
     "112a8167-4404-4d65-9516-75134325c837",
     "e13ba561-da27-4aed-8363-76c197c03070",
+    "a8ffa8c5-637e-473b-a9e6-b60cebe95719",
     "f982e381-83a5-4ac5-ae1a-2f11120b4741",
     "acb6d5f9-b9b9-46d7-a345-b76dab31bed8",
     "a8ffa8c5-637e-472b-a9e6-b60cebe95714",
@@ -131,13 +136,18 @@
     "a0ffa8c5-637e-472b-a9e6-b60cebe85474",
     "b2b3ac36-5fb7-457a-9513-6476b0840ce5",
     "9a536eaa-bd76-42a4-8e71-878817fe2988",
+    "794f34af-121e-445c-a3ed-f108728820a4",
+    "6419ed11-1b75-4259-b3cc-268ce64ba89b",
     "cb6efd47-dec4-4ebd-b725-97521e6b322a",
+    "71e6727e-85d2-48bb-bf24-9f764d2329aa",
     "fbfca6a4-04ac-4cd8-a1b6-414f1a86c4ef",
     "ba8af8d0-94b8-402d-9758-a419b07a508c",
     "a607b02a-dcc1-4fd8-a6fa-3ba53ddfee2c",
     "afd1b019-f49d-4c2b-a907-5bfa6af73cf1",
     "0aa0f6ff-9ae1-48ff-b0c3-d4da06897148",
+    "121b3f77-4d7c-4284-88a7-0c15b7efda09",
     "e7cef092-98d5-46f5-b59b-13875d88b22b",
+    "60d370b3-edf7-4e1d-bfef-4538cc04f1b9",
     "21ce82be-8f10-4e6b-9068-f880c31be5e2",
     "244dd88c-d414-4c38-85a0-86104d21b172",
     "244ddwec-d414-4c38-85a0-86104d21b172",
@@ -151,5 +161,8 @@
     "6f625574-6061-4989-aeb1-a6a1eb8ed668",
     "7e0c2dfc-a6d1-4855-914f-51d70f6d291b",
     "619676b7-2496-4d8d-a2b7-65f6553a8a9b",
-    "8e979a41-8533-44d1-9b09-2216f2af8761"
+    "8e979a41-8533-44d1-9b09-2216f2af8761",
+    "076773b7-8fb9-4644-b8e2-f766a98204c8",
+    "4e9ba800-49ba-4daa-93de-750f612fb578",
+    "1c06d167-7f56-4782-8f76-1953f9cd9db6"
 ]

+ 2 - 0
src/mock/role_me_permissions.json

@@ -7,6 +7,7 @@
     "assembly:server",
     "resource:centre",
     "systemAdmin:system:menu",
+    "assembly:upload",
     "api:dataresource:mapupload:maploadDelete",
     "api:basinHydropower:projectInfo:projectInfoAudit",
     "alertTemplateManagement:manage:view",
@@ -17,6 +18,7 @@
     "disasterTemplateManagement:manage:view",
     "system:menu:view",
     "map:upload:view",
+    "component:upload",
     "system:zhiwei:view",
     "system:tag:view",
     "map:resource:centre",

+ 4 - 4
src/views/assembly/item/AssemblyData.vue

@@ -7,7 +7,7 @@
           <div><img :src="i.src" alt="" srcset=""></div>
           <b>{{ i.name }}</b>
           <p>
-            <span>浏览</span>
+            <span><a :href="[`../../mapview.html?${i.href}`]" target="_blank" rel="noopener noreferrer">浏览</a></span>
             <span>详情</span>
             <span>加入库</span>
             <span>已入库</span>
@@ -61,9 +61,9 @@ export default defineComponent({
 
 
     var list = [
-      { src: 'http://106.12.170.138:4001/examples/img/Earth.jpg', name: '地图加载', has: false },
-      { src: 'http://106.12.170.138:4001/examples/img/Earth.jpg', name: '地图加载', has: false },
-      { src: 'http://106.12.170.138:4001/examples/img/Earth.jpg', name: '地图加载', has: false }
+      { src: 'http://106.12.170.138:4001/examples/img/Earth.jpg', name: '地图加载', has: false, href: "onlineIde_a1_Hello_World_01" },
+      { src: 'http://106.12.170.138:4001/examples/img/Earth.jpg', name: '地图加载', has: false, href: "onlineIde_a1_Hello_World_01" },
+      { src: 'http://106.12.170.138:4001/examples/img/Earth.jpg', name: '地图加载', has: false, href: "onlineIde_a1_Hello_World_01" }
     ]
 
     return {

+ 225 - 0
src/views/dataAdmin/assembly/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/dataAdmin/assembly/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-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"
+    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) => {
+      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>
+  

+ 617 - 0
src/views/dataAdmin/assembly/SourceDetail.vue

@@ -0,0 +1,617 @@
+<!--
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2023-08-15 22:08:21
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-08-17 15:59:13
+ * @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, updateService } 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) {
+                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>
+  

+ 223 - 0
src/views/dataAdmin/assembly/index.vue

@@ -0,0 +1,223 @@
+<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: 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: 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' : '' };`"
+        >
+          {{
+           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',
+      },
+    });
+    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() {
+      // openDrawer(true, {
+      //   isUpdate: false,
+      // });
+      openModal(true, {
+        isUpdate: false,
+      });
+    }
+
+    function handleEdit(record: Recordable) {
+      // openDrawer(true, {
+      //   record,
+      //   isUpdate: true,
+      // });
+      openModal(true, {
+        record,
+        isUpdate: true,
+      });
+    }
+
+    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,
+      handleEdit,
+      handleDelete,
+      handleSuccess,
+      RoleEnum,
+      hasBatchDelete,
+      handleDeleteOrBatchDelete,
+      statusChange,
+    };
+  },
+});
+</script>

+ 179 - 0
src/views/dataAdmin/assembly/map.data.ts

@@ -0,0 +1,179 @@
+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: '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',
+    width: 120,
+  },
+  {
+    title: '资源名称',
+    dataIndex: 'servicename',
+    width: 160,
+  },
+  {
+    title: '资源标签',
+    dataIndex: 'service',
+    width: 120,
+  },
+  {
+    title: '发布人',
+    dataIndex: 'publisher',
+    width: 100,
+  },
+  {
+    title: '发布时间',
+    dataIndex: 'publishdate',
+    width: 180,
+    slots: { customRender: 'pdate' },
+  },
+  {
+    title: '审核状态',
+    dataIndex: 'status',
+    width: 110,
+    slots: { customRender: 'status' },
+  },
+  {
+    title: '审核人',
+    dataIndex: 'curHandler',
+    width: 100,
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'checkTime',
+    width: 100,
+  },
+  // {
+  //   title: '当前环节',
+  //   dataIndex: 'curLink',
+  //   width: 90,
+  // },
+];
+
+
+
+/**
+ * 表单
+*/
+export const formSchema: FormSchema[] = [
+  {
+    field: 'groupName',
+    label: '角色名称',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入角色名称',
+    },
+  },
+  {
+    label: '排序',
+    field: 'sort',
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入排序',
+    },
+  }
+];

+ 1 - 1
src/views/systemAdmin/system/menu/MenuDrawer.vue

@@ -76,7 +76,7 @@
         let treeData = await getMenuList(1);
         treeData = listToTree(treeData);
         updateSchema({
-          field: 'parentId',
+          field: 'parentid',
           componentProps: { treeData },
         });
       });

+ 36 - 14
src/views/systemAdmin/system/menu/menu.data.ts

@@ -143,34 +143,56 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'parentId',
-    label: t('routes.common.system.menuEditPagesParentMenu'), //上级菜单
-    component: 'TreeSelect',
-    // componentProps: {
-    //   replaceFields: {
-    //     title: 'menuName',
-    //     key: 'id',
-    //     value: 'id',
-    //   },
-    //   getPopupContainer: () => document.body,
-    // },
+    field: 'parentid',
+    component: 'ApiTreeSelect',
+    label: '上级菜单',
     componentProps: {
-      placeholder: '请选择角色',
       replaceFields: {
         title: 'menuName',
         key: 'id',
         value: 'id',
       },
+      placeholder: '请你的选择上级菜单,没有则不选',
       api: async () => {
+        // debugger;
         var data = await menuList();
-        console.log(data);
+        console.log("请你的选择上级菜单:", data);
         return data;
       },
       onChange(value) {
-        parentId.value = value;
+        parentid.value = value;
       },
     },
   },
+  // {
+  //   field: 'parentid',
+  //   label: t('routes.common.system.menuEditPagesParentMenu'), //上级菜单
+  //   component: 'TreeSelect',
+  //   // componentProps: {
+  //   //   replaceFields: {
+  //   //     title: 'menuName',
+  //   //     key: 'id',
+  //   //     value: 'id',
+  //   //   },
+  //   //   getPopupContainer: () => document.body,
+  //   // },
+  //   componentProps: {
+  //     placeholder: '请你的选择上级菜单,没有则不选',
+  //     replaceFields: {
+  //       title: 'menuName',
+  //       key: 'id',
+  //       value: 'id',
+  //     },
+  //     api: async () => {
+  //       var data = await menuList();
+  //       console.log("请你的选择上级菜单:", data);
+  //       return data;
+  //     },
+  //     onChange(value) {
+  //       parentid.value = value;
+  //     },
+  //   },
+  // },
 
   {
     field: 'sort',