2 Commits b04964b0e5 ... 813ba81784

Author SHA1 Message Date
  yangyuxuan 813ba81784 Merge remote-tracking branch 'origin/dev' into dev 1 week ago
  yangyuxuan 99dfe7c578 地图配置 1 week ago

+ 3 - 3
src/router/index.ts

@@ -94,10 +94,10 @@ export const constantRoutes: RouteRecordRaw[] = [
         meta: { title: '首页', icon: 'sy', affix: true }
       },
       // {
-      //   path: '/layerConfigurationTest',
-      //   component: () => import('@/views/globalMap/layerConfigurationTest.vue'),
+      //   path: '/topicPage',
+      //   component: () => import('@/views/globalMap/topicPage.vue'),
       //   name: 'Index22222',
-      //   meta: { title: 'layerConfigurationTest', icon: 'sy', affix: true }
+      //   meta: { title: 'topicPage', icon: 'sy', affix: true }
       // }
     ]
   },

+ 0 - 24
src/types/components.d.ts

@@ -24,24 +24,15 @@ declare module 'vue' {
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
     DrawMap: typeof import('./../components/Map/YztMap/DrawMap.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAnchor: typeof import('element-plus/es')['ElAnchor']
-    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxButton: typeof import('element-plus/es')['ElCheckboxButton']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -51,42 +42,28 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
-    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
-    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
@@ -104,7 +81,6 @@ declare module 'vue' {
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

+ 41 - 53
src/views/globalMap/layerConfigurationTest.vue

@@ -1,5 +1,11 @@
 <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">
@@ -14,7 +20,7 @@
               <el-col :span="6">
                 <el-form-item label="专题:" prop="status">
                   <el-select v-model="queryParams.topicName" placeholder="请选择" clearable>
-                    <el-option label="暂无数据" value="" />
+                    <el-option v-for="dict in topic_type" :key="dict.value" :label="dict.value">{{ dict.label }}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -54,7 +60,7 @@
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         :default-expand-all="isExpandAll"
       >
-        <el-table-column prop="menuName" align="center" label="菜单名称" :show-overflow-tooltip="true"> </el-table-column>
+        <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" />
@@ -116,7 +122,15 @@
             <el-col v-if="form.menuType !== 'F'" :span="24">
               <el-form-item label="菜单图标:" prop="icon">
                 <!-- 图标选择器 -->
-                <icon-select v-model="form.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">
@@ -137,28 +151,11 @@
                 <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>-->
-<!--                <template #label>-->
-<!--                  <span>-->
-<!--                    <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">-->
-<!--                      <el-icon>-->
-<!--                        <question-filled />-->
-<!--                      </el-icon> </el-tooltip-->
-<!--                    >是否外链:-->
-<!--                  </span>-->
-<!--                </template>-->
-<!--                <el-radio-group v-model="form.isFrame">-->
-<!--                  <el-radio label="0">是</el-radio>-->
-<!--                  <el-radio label="1">否</el-radio>-->
-<!--                </el-radio-group>-->
-<!--              </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">
                 <template #label>
                   <span>
-                    <el-tooltip content="访问的路由地址,如:`user`,如外网地址需内链访问则以`http(s)://`开头" placement="top">
+                    <el-tooltip content="选择新增内容的展示类型,是在地图内定位打点或者是地图侧边的弹出框" placement="top">
                       <el-icon>
                         <question-filled />
                       </el-icon>
@@ -217,38 +214,20 @@
                 </template>
               </el-form-item>
             </el-col>
-            <el-col v-if="form.menuType === 'C'" :span="12">
-              <el-form-item>
-                <template #label>
-                  <span>
-                    <el-tooltip content="选择是则会被`keep-alive`缓存,需要匹配组件的`name`和地址保持一致" placement="top">
-                      <el-icon>
-                        <question-filled />
-                      </el-icon>
-                    </el-tooltip>
-                    是否缓存:
-                  </span>
-                </template>
-                <el-radio-group v-model="form.isCache">
-                  <el-radio label="0">缓存</el-radio>
-                  <el-radio label="1">不缓存</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
             <el-col v-if="form.menuType !== 'F'" :span="12">
               <el-form-item>
                 <template #label>
                   <span>
-                    <el-tooltip content="选择隐藏则路由将不会出现在侧边栏,但仍然可以访问" placement="top">
+                    <el-tooltip content="选择不上架则不在地图中展示" placement="top">
                       <el-icon>
                         <question-filled />
                       </el-icon>
                     </el-tooltip>
-                    显示状态:
+                    上架状态:
                   </span>
                 </template>
                 <el-radio-group v-model="form.visible">
-                  <el-radio v-for="dict in sys_show_hide" :key="dict.value" :label="dict.value">{{ dict.label }} </el-radio>
+                  <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>
@@ -297,6 +276,11 @@ import {
 } 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';
 
 interface MenuOptionsType {
   menuId: number;
@@ -304,9 +288,9 @@ interface MenuOptionsType {
   children: MenuOptionsType[] | undefined;
 }
 
-import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
-import { addInformation, getTemplateList } from '@/api/informationissue/informationissue';
+const props = defineProps({
+  id: String
+});
 
 const templateOptions = ref([
   { value: 'template1', label: '图层分析一' },
@@ -321,9 +305,10 @@ const typeOptions = ref([
 ]);
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_show_hide, sys_normal_disable, topic_name, menu_type } = toRefs<any>(
-  proxy?.useDict('sys_show_hide', 'sys_normal_disable', 'topic_name', 'menu_type')
+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 menuList = ref<MenuVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -362,12 +347,12 @@ const data = reactive<PageData<MenuForm, MenuQuery>>({
     path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }]
   }
 });
-
+const emits = defineEmits(['close']);
 const menuTableRef = ref<ElTableInstance>();
 
 const { queryParams, form, rules } = toRefs<PageData<MenuForm, MenuQuery>>(data);
 /** 查询菜单列表 */
-const getList = async () => {
+const getList = async (id) => {
   loading.value = true;
   const res = await LayerlistMenu(queryParams.value);
   const data = proxy?.handleTree<MenuVO>(res.data, 'menuId');
@@ -397,7 +382,7 @@ const reset = () => {
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  getList();
+  getList(props.id);
 };
 /** 重置按钮操作 */
 const resetQuery = () => {
@@ -443,7 +428,7 @@ const submitForm = () => {
       form.value.menuId ? await updateLayerMenu(form.value) : await addLayerMenu(form.value);
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
-      await getList();
+      await getList(props.id);
     }
   });
 };
@@ -451,11 +436,14 @@ const submitForm = () => {
 const handleDelete = async (row: MenuVO) => {
   await proxy?.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?');
   await delLayerMenu(row.menuId);
-  await getList();
+  await getList(props.id);
   proxy?.$modal.msgSuccess('删除成功');
 };
+const goBack = () => {
+  emits('close');
+};
 
 onMounted(() => {
-  getList();
+  getList(props.id);
 });
 </script>

+ 140 - 0
src/views/globalMap/topicPage.vue

@@ -0,0 +1,140 @@
+<template>
+  <div  class="app-container" v-if="!showTopic">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch">
+        <el-form ref="queryFormRef" :model="queryParams">
+          <el-row :gutter="20">
+            <!-- 第一行 -->
+            <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.label">{{ dict.label }}</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </transition>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button v-hasPermi="['system:menu:add']" icon="Plus" type="primary" @click="handleAdd()">新增 </el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      ref="menuTableRef"
+      :data="topicList"
+    >
+      <el-table-column prop="topicNames" align="center" label="专题名称" :show-overflow-tooltip="true">
+        <template #default="scope">
+          <span class="link-text" @click="handleTopicClick(scope.row.id)">{{ scope.row.topicNames }}</span>
+        </template>
+      </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>
+<!--          <el-text v-hasPermi="['system:menu:add']" class="common-btn-text-primary" @click="handleAdd(scope.row)">新增</el-text>-->
+          <el-text v-hasPermi="['system:menu:remove']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+  <layer-configuration-test v-if="showTopic" @close="pageClose" :id="topicId" />
+</template>
+
+<script setup lang="ts">
+import { ComponentInternalInstance, getCurrentInstance, reactive, ref, toRefs } from 'vue';
+
+import { LayerlistMenu } from '@/api/globalMap/layerConfig';
+
+import { MenuForm, MenuQuery, MenuVO } from '@/api/globalMap/layerConfig/types';
+import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
+import { getDicts } from '@/api/system/dict/data';
+import LayerConfigurationTest from '@/views/globalMap/layerConfigurationTest.vue';
+const showSearch = ref(true);
+const topicList = ref([]);
+const queryFormRef = ref<ElFormInstance>();
+const topicId = ref();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_show_hide, sys_normal_disable, topic_name, menu_type, listing_status } = toRefs<any>(
+  proxy?.useDict('sys_show_hide', 'sys_normal_disable', 'topic_name', 'menu_type', 'listing_status')
+);
+const initFormData = {
+  path: '',
+  menuId: undefined,
+  parentId: 0,
+  menuName: '',
+  icon: '',
+  menuType: MenuTypeEnum.M,
+  orderNum: 1,
+  isFrame: '1',
+  isCache: '0',
+  visible: '0',
+  status: '0'
+};
+const data = reactive<PageData<MenuForm, MenuQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    menuName: undefined,
+    status: undefined
+  },
+  rules: {
+    menuName: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
+    orderNum: [{ required: true, message: '菜单顺序不能为空', trigger: 'blur' }],
+    path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }]
+  }
+});
+const menuTableRef = ref<ElTableInstance>();
+const { queryParams, form, rules } = toRefs<PageData<MenuForm, MenuQuery>>(data);
+const topic_type = ref([]);
+const showTopic = ref(false);
+
+
+/** 查询菜单列表 */
+const getList = async () => {
+  getDicts('topic_type').then((resp) => {
+    topic_type.value = resp.data.map(
+      (p): DictDataOption => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass })
+    );
+    let temp = [];
+    topic_type.value.forEach(item => {
+      temp.push(item.label);
+    })
+    // topicList.value = temp;
+    topicList.value = topic_type.value.map(item => ({
+      topicNames: item.label
+    }));
+  });
+};
+getList();
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+};
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+const handleTopicClick = (id) => {
+  showTopic.value = true;
+  topicId.value = id;
+}
+const pageClose = () => {
+  showTopic.value = false;
+}
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>