diff --git a/main/src/components/custom-table-operate/index.vue b/main/src/components/custom-table-operate/index.vue
index 3d7c4f8..152175d 100644
--- a/main/src/components/custom-table-operate/index.vue
+++ b/main/src/components/custom-table-operate/index.vue
@@ -40,7 +40,7 @@ const formatterIcon = (row) => {
&__more {
padding: 20px 5px;
font-size: 20px;
- color: $color-primary;
+ color: var(--el-color-primary);
cursor: pointer;
}
.el-button {
diff --git a/main/src/components/custom-table-tree/index.vue b/main/src/components/custom-table-tree/index.vue
index b891761..e9125ec 100644
--- a/main/src/components/custom-table-tree/index.vue
+++ b/main/src/components/custom-table-tree/index.vue
@@ -27,7 +27,7 @@ import { reactive, ref, watch } from 'vue';
const props = defineProps({
title: { type: String, default: '' },
- shadow: { type: Boolean, default: true },
+ shadow: { type: Boolean, default: false },
filter: { type: Boolean, default: false },
data: { type: Array, default: () => [] },
option: {
diff --git a/sub-government-affairs-service/package.json b/sub-government-affairs-service/package.json
index f8c45b6..9206f9e 100644
--- a/sub-government-affairs-service/package.json
+++ b/sub-government-affairs-service/package.json
@@ -30,6 +30,7 @@
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
"screenfull": "^6.0.2",
+ "splitpanes": "^4.0.3",
"vue": "^3.3.11",
"vue-router": "^4.2.5"
},
diff --git a/sub-government-affairs-service/src/main.js b/sub-government-affairs-service/src/main.js
index e4318cb..67a5008 100644
--- a/sub-government-affairs-service/src/main.js
+++ b/sub-government-affairs-service/src/main.js
@@ -19,10 +19,12 @@ import { registerDirective } from './directives';
import { registerGlobalComponents } from './plugins/globalComponents';
import { registerElIcons } from './plugins/icon';
import { registerMicroApps } from './plugins/micro';
+import { registerSplitpanes } from './plugins/splitpanes';
const app = createApp(App);
app.use(pinia).use(router).use(ElementPlus).use(Avue);
registerGlobalComponents(app);
registerElIcons(app);
+registerSplitpanes(app);
registerDirective(app);
registerMicroApps(app);
diff --git a/sub-government-affairs-service/src/plugins/splitpanes.js b/sub-government-affairs-service/src/plugins/splitpanes.js
new file mode 100644
index 0000000..dca3790
--- /dev/null
+++ b/sub-government-affairs-service/src/plugins/splitpanes.js
@@ -0,0 +1,7 @@
+import { Splitpanes, Pane } from 'splitpanes';
+import 'splitpanes/dist/splitpanes.css';
+
+export const registerSplitpanes = (app) => {
+ app.component('Splitpanes', Splitpanes);
+ app.component('Pane', Pane);
+};
diff --git a/sub-government-affairs-service/src/router/modules/trace.js b/sub-government-affairs-service/src/router/modules/trace.js
index f745b80..df876cb 100644
--- a/sub-government-affairs-service/src/router/modules/trace.js
+++ b/sub-government-affairs-service/src/router/modules/trace.js
@@ -9,12 +9,6 @@ export default [
redirect: '/sub-government-affairs-service/trace-home',
meta: { title: '溯源管理', icon: 'Document' },
children: [
- {
- path: '/sub-government-affairs-service/trace-index',
- name: 'trace-index',
- component: () => import('@/views/trace/statistic/index.vue'),
- meta: { title: '溯源首页', icon: 'Document' },
- },
{
path: '/sub-government-affairs-service/record',
name: 'record',
@@ -78,6 +72,12 @@ export default [
},
],
},
+ {
+ path: '/sub-government-affairs-service/trace-statistic',
+ name: 'trace-statistic',
+ component: () => import('@/views/trace/statistic/index.vue'),
+ meta: { title: '溯源统计', icon: 'Document' },
+ },
],
},
];
diff --git a/sub-government-affairs-service/src/styles/style.scss b/sub-government-affairs-service/src/styles/style.scss
index 5ee6df3..07d6b97 100644
--- a/sub-government-affairs-service/src/styles/style.scss
+++ b/sub-government-affairs-service/src/styles/style.scss
@@ -15,3 +15,7 @@
height: auto;
max-height: calc(100vh - 130px);
}
+
+.splitpanes.default-theme .splitpanes__pane {
+ background-color: #fff !important;
+}
diff --git a/sub-government-affairs-service/src/utils/index.js b/sub-government-affairs-service/src/utils/index.js
index 8563816..fb825cc 100644
--- a/sub-government-affairs-service/src/utils/index.js
+++ b/sub-government-affairs-service/src/utils/index.js
@@ -3,7 +3,7 @@
* @Author: zenghua.wang
* @Date: 2022-02-23 21:12:37
* @LastEditors: zenghua.wang
- * @LastEditTime: 2025-02-11 17:18:36
+ * @LastEditTime: 2025-03-24 10:05:36
*/
import lodash from 'lodash';
import dayjs from 'dayjs';
@@ -123,6 +123,26 @@ export const setDicLabel = (dicData, value) => {
}
return label;
};
+/**
+ * @Title 将tree数据结构打平
+ * @param {*} tree
+ * @returns
+ */
+export const flattenTree = (tree) => {
+ const result = [];
+ function traverse(node) {
+ result.push(node);
+ if (node.children && node.children.length > 0) {
+ node.children.forEach((child) => traverse(child));
+ }
+ }
+ if (Array.isArray(tree)) {
+ tree.forEach((item) => traverse(item));
+ } else {
+ traverse(tree);
+ }
+ return result;
+};
/**
* @Title 数组交集
* @param {*} arr1
diff --git a/sub-government-affairs-service/src/views/dict/component/landCassification/index-bak.vue b/sub-government-affairs-service/src/views/dict/component/landCassification/index-bak.vue
new file mode 100644
index 0000000..a788ddc
--- /dev/null
+++ b/sub-government-affairs-service/src/views/dict/component/landCassification/index-bak.vue
@@ -0,0 +1,421 @@
+
+
+
+
+
+
+
+
+ {{ data.label }}
+
+
+
+
+
+
+
+ 新增
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/dict/component/landCassification/index.vue b/sub-government-affairs-service/src/views/dict/component/landCassification/index.vue
index 54b1255..37fd670 100644
--- a/sub-government-affairs-service/src/views/dict/component/landCassification/index.vue
+++ b/sub-government-affairs-service/src/views/dict/component/landCassification/index.vue
@@ -1,107 +1,96 @@
-
-
-
-
-
-
-
- {{ data.label }}
-
-
-
-
-
-
-
- 新增
- 导出
-
+
+
+
+
+
+
+
+
+ {{ data.landType }}
+
+
+
+
+
+
+
+
+
+ 导出
+
-
-
-
-
-
-
-
-
+
+ 启用
+ 禁用
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/sub-government-affairs-service/src/views/dict/component/region/index.vue b/sub-government-affairs-service/src/views/dict/component/region/index.vue
index bf5c372..aabebdc 100644
--- a/sub-government-affairs-service/src/views/dict/component/region/index.vue
+++ b/sub-government-affairs-service/src/views/dict/component/region/index.vue
@@ -1,53 +1,49 @@
-
-
-
-
-
-
-
-
-
-
- 新增
- 导出
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+ 导出
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue
index 7d854a7..02cfdce 100644
--- a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue
@@ -30,14 +30,14 @@
导出
导入
-
+