图层配置

src/api/globalMap/layerConfig/index.ts

@@ -14,7 +14,7 @@ export const listMenu = (query?: MenuQuery): AxiosPromise<MenuVO[]> => {
 // 查询图层 列表
 export const LayerlistMenu = (query?: MenuQuery): AxiosPromise<MenuVO[]> => {
   return request({
-    url: '/api/layerConfiguration/layer_list',
+    url: '/api/layerConfiguration/list',
     method: 'get',
     params: query
   });
@@ -31,7 +31,7 @@ export const getMenu = (menuId: string | number): AxiosPromise<MenuVO> => {
 // 查询图层详细
 export const getLayerMenu = (menuId: string | number): AxiosPromise<MenuVO> => {
   return request({
-    url: '/api/layerConfiguration/' + menuId,
+    url: '/api/layerConfiguration/info/' + menuId,
     method: 'get'
   });
 };
@@ -105,7 +105,15 @@ export const delMenu = (menuId: string | number) => {
 // 删除图层
 export const delLayerMenu = (menuId: string | number) => {
   return request({
-    url: '/api/layerConfiguration/' + menuId,
+    url: '/api/layerConfiguration/delete/' + menuId,
     method: 'delete'
   });
 };
+
+// 查询全域地图菜单类型
+export const getLayerMenuType = () => {
+  return request({
+    url: '/system/dict/data/type/layer_menu_type',
+    method: 'get'
+  });
+};

src/components/ImageUpload/index.vue

@@ -41,7 +41,6 @@
 
 <script setup lang="ts">
 import { listByIds, delOss } from '@/api/system/oss';
-import { OssVO } from '@/api/system/oss/types';
 import { propTypes } from '@/utils/propTypes';
 import { globalHeaders } from '@/utils/request';
 import { compressAccurately } from 'image-conversion';
@@ -79,7 +78,8 @@ const dialogImageUrl = ref('');
 const dialogVisible = ref(false);
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(baseUrl + '/resource/oss/upload'); // 上传的图片服务器地址
+const downLoadApi = '/api/file/get_img/get_img_by_id/';
+const uploadImgUrl = ref(baseUrl + '/api/file/upload/upload_img'); // 上传的图片服务器地址
 const headers = ref(globalHeaders());
 
 const fileList = ref<any[]>([]);
@@ -92,22 +92,13 @@ watch(
   async (val: string) => {
     if (val) {
       // 首先将值转为数组
-      let list: OssVO[] = [];
-      if (Array.isArray(val)) {
-        list = val as OssVO[];
-      } else {
-        const res = await listByIds(val);
-        list = res.data;
-      }
+      const list = Array.isArray(val) ? val : props.modelValue.split(',');
       // 然后将数组转为对象数组
       fileList.value = list.map((item) => {
         // 字符串回显处理 如果此处存的是url可直接回显 如果存的是id需要调用接口查出来
         let itemData;
         if (typeof item === 'string') {
-          itemData = { name: item, url: item };
-        } else {
-          // 此处name使用ossId 防止删除出现重名
-          itemData = { name: item.ossId, url: item.url, ossId: item.ossId };
+          itemData = { name: item, url: baseUrl + downLoadApi + item };
         }
         return itemData;
       });
@@ -166,7 +157,7 @@ const handleExceed = () => {
 // 上传成功回调
 const handleUploadSuccess = (res: any, file: UploadFile) => {
   if (res.code === 200) {
-    uploadList.value.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
+    uploadList.value.push({ name: res.data, url: baseUrl + downLoadApi + res.data });
     uploadedSuccessfully();
   } else {
     number.value--;
@@ -181,8 +172,6 @@ const handleUploadSuccess = (res: any, file: UploadFile) => {
 const handleDelete = (file: UploadFile): boolean => {
   const findex = fileList.value.map((f) => f.name).indexOf(file.name);
   if (findex > -1 && uploadList.value.length === number.value) {
-    let ossId = fileList.value[findex].ossId;
-    delOss(ossId);
     fileList.value.splice(findex, 1);
     emit('update:modelValue', listToString(fileList.value));
     return false;
@@ -218,8 +207,8 @@ const listToString = (list: any[], separator?: string) => {
   let strs = '';
   separator = separator || ',';
   for (let i in list) {
-    if (undefined !== list[i].ossId && list[i].url.indexOf('blob:') !== 0) {
-      strs += list[i].ossId + separator;
+    if (list[i].name) {
+      strs += list[i].name + separator;
     }
   }
   return strs != '' ? strs.substring(0, strs.length - 1) : '';

src/layout/components/Sidebar/Link.vue

@@ -28,7 +28,7 @@ const type = computed(() => {
 
 function linkProps() {
   if (isExt.value) {
-    if (props.to === 'http://19.155.220.218/#/considerable-web/overallSituation?type=insertM') {
+    if (props.to === 'https://yjzt.mmsyjj.cn/#/considerable-web/overallSituation?type=insertM') {
       return {
         href: props.to,
         target: '_blank',

src/views/globalMap/layerConfigurationTest.vue

@@ -1,11 +1,5 @@
 <template>
   <div class="app-container">
-    <el-form-item>
-      <div class="back-btn" @click="goBack">
-        <el-icon><Back /></el-icon>
-        返回上一级
-      </div>
-    </el-form-item>
     <div v-show="!dialog.visible">
       <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
         <div v-show="showSearch">
@@ -18,16 +12,16 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="专题：" prop="status">
-                  <el-select v-model="queryParams.topicName" placeholder="请选择" clearable>
-                    <el-option v-for="dict in topic_type" :key="dict.value" :label="dict.value">{{ dict.label }}</el-option>
+                <el-form-item label="专题：" prop="ZT">
+                  <el-select v-model="queryParams.ZT" placeholder="请选择" clearable>
+                    <el-option v-for="dict in topic_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="状态：" prop="status">
                   <el-select v-model="queryParams.status" placeholder="状态" clearable>
-                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    <el-option v-for="dict in listing_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -49,7 +43,6 @@
         <el-col :span="1.5">
           <el-button type="danger" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
         </el-col>
-        <!--      <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>-->
       </el-row>
 
       <el-table
@@ -63,24 +56,16 @@
         <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true"> </el-table-column>
         <el-table-column prop="menuType" label="菜单类型" align="center">
           <template #default="scope">
-            <dict-tag :options="menu_type" :value="scope.row.menuType" />
+            <dict-tag :options="menuTypeList" :value="scope.row.menuType" />
           </template>
         </el-table-column>
 
-        <el-table-column prop="component" label="上架状态" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="orderNum" label="排序"></el-table-column>
-<!--        <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>-->
-<!--        <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>-->
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="status" label="上架状态" :show-overflow-tooltip="true">
           <template #default="scope">
-            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+            <dict-tag :options="listing_status" :value="scope.row.status" />
           </template>
         </el-table-column>
-<!--        <el-table-column label="创建时间" align="center" prop="createTime">-->
-<!--          <template #default="scope">-->
-<!--            <span>{{ scope.row.createTime }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <el-table-column prop="orderNum" label="排序"></el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-text v-hasPermi="['system:menu:edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">修改</el-text>
@@ -99,7 +84,7 @@
         <div class="common-dialog-box">
           <el-form ref="menuFormRef" :model="form" :rules="rules" label-width="100px">
             <el-col :span="24">
-              <el-form-item style="width: 500px" label="上级菜单：">
+              <el-form-item style="width: 480px" label="上级菜单：" prop="parentId">
                 <el-tree-select
                   v-model="form.parentId"
                   :data="menuOptions"
@@ -111,38 +96,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="菜单类型：" prop="menuType">
-                <el-radio-group v-model="form.menuType">
-                  <el-radio value="M">目录</el-radio>
-                  <el-radio value="C">菜单</el-radio>
-<!--                  <el-radio value="F">按钮</el-radio>-->
-                </el-radio-group>
+              <el-form-item label="菜单类型：" prop="menuType" style="width: 480px">
+                <el-select v-model="form.menuType" placeholder="请选择">
+                  <el-option v-for="item in menuTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-if="form.menuType !== 'F'" :span="24">
+            <el-col v-if="['D', 'Z'].includes(form.menuType)" :span="24">
               <el-form-item label="菜单图标：" prop="icon">
-                <!-- 图标选择器 -->
-<!--                <icon-select v-model="form.icon" />-->
-                <FileUpload
-                  v-model="form.icon"
-                  :file-type="['jpg', 'jpeg', 'png']"
-                  :limit="1"
-                  :file-size="5"
-                  class="upload-box"
-                  @change="menuFormRef.validateField('fileList')"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="form.menuType !== 'F'" :span="24">
-              <el-form-item label="菜单模板：" prop="template">
-                <!-- 模板选择器 -->
-                <el-select v-model="form.layer_template" placeholder="请选择模板">
-                  <el-option v-for="item in templateOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-                </el-select>
+                <imageUpload v-model="form.icon" :limit="1" :file-size="10" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item style="width: 500px" label="菜单名称：" prop="menuName">
+              <el-form-item style="width: 480px" label="菜单名称：" prop="menuName">
                 <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
               </el-form-item>
             </el-col>
@@ -151,8 +117,8 @@
                 <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
               </el-form-item>
             </el-col>
-            <el-col v-if="form.menuType !== 'F'" :span="12">
-              <el-form-item v-if="form.menuType === 'C'" prop="path" style="width: 500px">
+            <el-col v-if="['T'].includes(form.menuType)" :span="12">
+              <el-form-item prop="path" style="width: 480px">
                 <template #label>
                   <span>
                     <el-tooltip content="选择新增内容的展示类型，是在地图内定位打点或者是地图侧边的弹出框" placement="top">
@@ -160,65 +126,26 @@
                         <question-filled />
                       </el-icon>
                     </el-tooltip>
-                    展示类型：
+                    模板：
                   </span>
                 </template>
                 <el-select v-model="form.path" placeholder="请选择模板">
-                  <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                  <el-option v-for="item in layer_configuration_template" :key="item.value" :label="item.label" :value="item.value"> </el-option>
                 </el-select>
-<!--                <el-input v-model="form.path" placeholder="请输入路由地址" />-->
-              </el-form-item>
-            </el-col>
-            <el-col v-if="form.menuType === 'C' && form.path === '2'" :span="12">
-              <el-form-item prop="component">
-                <template #label>
-                  <span>
-                    <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
-                      <el-icon>
-                        <question-filled />
-                      </el-icon>
-                    </el-tooltip>
-                    地图点位id：
-                  </span>
-                </template>
-                <el-input v-model="form.component" placeholder="请输入组件路径" />
               </el-form-item>
             </el-col>
-            <el-col v-if="form.menuType !== 'M'" :span="12">
-              <el-form-item>
-                <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
-                <template #label>
-                  <span>
-                    <el-tooltip content="控制器中定义的权限字符，如：@SaCheckPermission('system:user:list')" placement="top">
-                      <el-icon>
-                        <question-filled />
-                      </el-icon>
-                    </el-tooltip>
-                    权限字符：
-                  </span>
-                </template>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="form.menuType === 'C'" :span="12">
-              <el-form-item>
-                <el-input v-model="form.queryParam" placeholder="请输入路由参数" maxlength="255" />
-                <template #label>
-                  <span>
-                    <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
-                      <el-icon>
-                        <question-filled />
-                      </el-icon>
-                    </el-tooltip>
-                    路由参数：
-                  </span>
-                </template>
+            <el-col v-if="['T'].includes(form.menuType)" :span="12">
+              <el-form-item style="width: 480px" label="数据类型：" prop="component">
+                <el-select v-model="form.component" placeholder="请选择数据类型">
+                  <el-option v-for="item in point_type" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-if="form.menuType !== 'F'" :span="12">
-              <el-form-item>
+            <el-col :span="12">
+              <el-form-item style="width: 480px">
                 <template #label>
                   <span>
-                    <el-tooltip content="选择不上架则不在地图中展示" placement="top">
+                    <el-tooltip content="选择已下架则不在地图中展示" placement="top">
                       <el-icon>
                         <question-filled />
                       </el-icon>
@@ -226,30 +153,11 @@
                     上架状态：
                   </span>
                 </template>
-                <el-radio-group v-model="form.visible">
+                <el-radio-group v-model="form.status">
                   <el-radio v-for="dict in listing_status" :key="dict.value" :label="dict.value">{{ dict.label }} </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="12">-->
-<!--              <el-form-item>-->
-<!--                <template #label>-->
-<!--                  <span>-->
-<!--                    <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">-->
-<!--                      <el-icon>-->
-<!--                        <question-filled />-->
-<!--                      </el-icon>-->
-<!--                    </el-tooltip>-->
-<!--                    菜单状态：-->
-<!--                  </span>-->
-<!--                </template>-->
-<!--                <el-radio-group v-model="form.status">-->
-<!--                  <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">-->
-<!--                    {{ dict.label }}-->
-<!--                  </el-radio>-->
-<!--                </el-radio-group>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
           </el-form>
         </div>
         <div class="common-dialog-footer" style="display: flex; justify-content: center">
@@ -261,26 +169,9 @@
   </div>
 </template>
 
-<script setup name="Menu" lang="ts">
-import {
-  addMenu,
-  addLayerMenu,
-  delMenu,
-  delLayerMenu,
-  getMenu,
-  getLayerMenu,
-  listMenu,
-  LayerlistMenu,
-  updateMenu,
-  updateLayerMenu
-} from '@/api/globalMap/layerConfig';
-import { MenuForm, MenuQuery, MenuVO } from '@/api/globalMap/layerConfig/types';
-import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
-import { ref, onMounted, toRefs, ComponentInternalInstance, reactive, getCurrentInstance } from 'vue';
-import { ElMessage } from 'element-plus';
-import { addInformation, getTemplateList } from '@/api/informationissue/informationissue';
-import TopicPage from '@/views/globalMap/topicPage.vue';
-import { Back } from '@element-plus/icons-vue';
+<script setup name="LayerConfiguration" lang="ts">
+import { addLayerMenu, delLayerMenu, getLayerMenu, LayerlistMenu, updateLayerMenu, getLayerMenuType } from '@/api/globalMap/layerConfig';
+import { MenuVO } from '@/api/globalMap/layerConfig/types';
 
 interface MenuOptionsType {
   menuId: number;
@@ -288,25 +179,11 @@ interface MenuOptionsType {
   children: MenuOptionsType[] | undefined;
 }
 
-const props = defineProps({
-  id: String
-});
-
-const templateOptions = ref([
-  { value: 'template1', label: '图层分析一' },
-  { value: 'template2', label: '图层分析二' },
-  { value: 'template3', label: '图层分析三' }
-  // 更多模板选项...
-]);
-const typeOptions = ref([
-  { value: '1', label: '模块弹出框' },
-  { value: '2', label: '地图点位' }
-  // 更多模板选项...
-]);
-
+// 菜单类型
+const menuTypeList = ref([]);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_show_hide, sys_normal_disable, topic_name, menu_type, listing_status, topic_type } = toRefs<any>(
-  proxy?.useDict('sys_show_hide', 'sys_normal_disable', 'topic_name', 'menu_type', 'listing_status', 'topic_type')
+const { listing_status, topic_type, layer_configuration_template, point_type } = toRefs<any>(
+  proxy?.useDict('listing_status', 'topic_type', 'layer_configuration_template', 'point_type')
 );
 
 const menuList = ref<MenuVO[]>([]);
@@ -322,44 +199,46 @@ const dialog = reactive<DialogOption>({
 
 const queryFormRef = ref<ElFormInstance>();
 const menuFormRef = ref<ElFormInstance>();
-const initFormData = {
+
+const menuTableRef = ref<ElTableInstance>();
+const queryParams = reactive({
+  menuName: undefined,
+  status: undefined,
+  ZT: undefined
+});
+const form = ref({
   path: '',
   menuId: undefined,
   parentId: 0,
   menuName: '',
   icon: '',
-  menuType: MenuTypeEnum.M,
+  menuType: '',
   orderNum: 1,
-  isFrame: '1',
-  isCache: '0',
-  visible: '0',
   status: '0'
-};
-const data = reactive<PageData<MenuForm, MenuQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    menuName: undefined,
-    status: undefined
-  },
-  rules: {
+});
+const rules = computed(() => {
+  const newRules = {
+    parentId: [{ required: true, message: '请选择上级菜单', trigger: 'change' }],
+    menuType: [{ required: true, message: '请选择菜单类型', trigger: 'change' }],
     menuName: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
     orderNum: [{ required: true, message: '菜单顺序不能为空', trigger: 'blur' }],
-    path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }]
-  }
+    status: [{ required: true, message: '请选择上架状态', trigger: 'change' }]
+  };
+  return newRules;
 });
-const emits = defineEmits(['close']);
-const menuTableRef = ref<ElTableInstance>();
-
-const { queryParams, form, rules } = toRefs<PageData<MenuForm, MenuQuery>>(data);
 /** 查询菜单列表 */
-const getList = async (id) => {
+const getList = () => {
   loading.value = true;
-  const res = await LayerlistMenu(queryParams.value);
-  const data = proxy?.handleTree<MenuVO>(res.data, 'menuId');
-  if (data) {
-    menuList.value = data;
-  }
-  loading.value = false;
+  LayerlistMenu(queryParams)
+    .then((res) => {
+      const data = proxy?.handleTree<MenuVO>(res.data, 'menuId');
+      if (data) {
+        menuList.value = data;
+      }
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 /** 查询菜单下拉树结构 */
 const getTreeselect = async () => {
@@ -376,13 +255,12 @@ const cancel = () => {
 };
 /** 表单重置 */
 const reset = () => {
-  form.value = { ...initFormData };
   menuFormRef.value?.resetFields();
 };
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  getList(props.id);
+  getList();
 };
 /** 重置按钮操作 */
 const resetQuery = () => {
@@ -418,8 +296,8 @@ const handleUpdate = async (row: MenuVO) => {
     const { data } = await getLayerMenu(row.menuId);
     form.value = data;
   }
-  dialog.visible = true;
   dialog.title = '修改菜单';
+  dialog.visible = true;
 };
 /** 提交按钮 */
 const submitForm = () => {
@@ -428,7 +306,7 @@ const submitForm = () => {
       form.value.menuId ? await updateLayerMenu(form.value) : await addLayerMenu(form.value);
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
-      await getList(props.id);
+      await getList();
     }
   });
 };
@@ -436,14 +314,20 @@ const submitForm = () => {
 const handleDelete = async (row: MenuVO) => {
   await proxy?.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?');
   await delLayerMenu(row.menuId);
-  await getList(props.id);
+  await getList();
   proxy?.$modal.msgSuccess('删除成功');
 };
-const goBack = () => {
-  emits('close');
+const getTypeList = () => {
+  getLayerMenuType().then((res) => {
+    res.data.forEach((item) => {
+      item.label = item.dictLabel;
+      item.value = item.dictValue;
+    });
+    menuTypeList.value = res.data;
+  });
 };
-
 onMounted(() => {
-  getList(props.id);
+  getList();
+  getTypeList();
 });
 </script>