发起人的：
-
+
-
+
=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步日志
+
+
+ 全部同步
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 同步
+
+
+
+
+
+
+
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步日志
+
+
+ 全部同步
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 同步
+
+
+
+
+
+
+
+ 网格
+
+
+
+
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步日志
+
+
+ 全部同步
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 同步
+
+
+
+
+
+
+
+ 网格
+
+
+
+
+
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
new file mode 100644
index 0000000..d7dbc40
--- /dev/null
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -0,0 +1,3 @@
+
+ 管线管理
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步日志
+
+
+ 全部同步
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 同步
+
+
+
+
+
+
+
+ 网格
+
+
+
+
+
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
new file mode 100644
index 0000000..d7dbc40
--- /dev/null
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -0,0 +1,3 @@
+
+ 管线管理
+
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index cc2059b..d6d9cf7 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -133,25 +133,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步日志
+
+
+ 全部同步
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 同步
+
+
+
+
+
+
+
+ 网格
+
+
+
+
+
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
new file mode 100644
index 0000000..d7dbc40
--- /dev/null
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -0,0 +1,3 @@
+
+ 管线管理
+
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index cc2059b..d6d9cf7 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -133,25 +133,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 70384ba..cde529c 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -204,7 +204,7 @@
-
+
=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步日志
+
+
+ 全部同步
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 同步
+
+
+
+
+
+
+
+ 网格
+
+
+
+
+
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
new file mode 100644
index 0000000..d7dbc40
--- /dev/null
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -0,0 +1,3 @@
+
+ 管线管理
+
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index cc2059b..d6d9cf7 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -133,25 +133,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 70384ba..cde529c 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -204,7 +204,7 @@
-
+
-
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步日志
+
+
+ 全部同步
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 同步
+
+
+
+
+
+
+
+ 网格
+
+
+
+
+
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
new file mode 100644
index 0000000..d7dbc40
--- /dev/null
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -0,0 +1,3 @@
+
+ 管线管理
+
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index cc2059b..d6d9cf7 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -133,25 +133,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 70384ba..cde529c 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -204,7 +204,7 @@
-
+
-
+
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index c0eaeea..a05d6bb 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -219,7 +219,7 @@
-
+
@@ -231,7 +231,7 @@
-
+
diff --git a/package.json b/package.json
index 08b7990..a321aa9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"typescript": "^4.8.4",
"unplugin-auto-import": "^0.11.4",
"unplugin-vue-components": "^0.22.9",
- "vite": "^3.2.3",
+ "vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09257d4..c39d5f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@
excludeLinksFromLockfile: false
dependencies:
+ '@amap/amap-jsapi-loader':
+ specifier: ^1.0.1
+ version: 1.0.1
'@element-plus/icons-vue':
specifier: ^2.0.10
version: 2.0.10(vue@3.2.44)
@@ -26,6 +29,9 @@
axios:
specifier: ^1.1.3
version: 1.1.3
+ circular-json:
+ specifier: ^0.5.9
+ version: 0.5.9
dayjs:
specifier: ^1.11.6
version: 1.11.6
@@ -33,8 +39,8 @@
specifier: ^5.4.1
version: 5.4.1
element-plus:
- specifier: ^2.2.26
- version: 2.2.26(vue@3.2.44)
+ specifier: ^2.7.6
+ version: 2.7.8(vue@3.2.44)
file-saver:
specifier: ^2.0.5
version: 2.0.5
@@ -126,10 +132,10 @@
version: 2.0.0
'@vitejs/plugin-vue':
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)(vue@3.2.44)
+ version: 3.2.0(vite@3.2.10)(vue@3.2.44)
'@vitejs/plugin-vue-jsx':
specifier: ^2.1.1
- version: 2.1.1(vite@3.2.3)(vue@3.2.44)
+ version: 2.1.1(vite@3.2.10)(vue@3.2.44)
autoprefixer:
specifier: ^10.4.13
version: 10.4.13(postcss@8.4.18)
@@ -197,41 +203,45 @@
specifier: ^0.22.9
version: 0.22.9(rollup@2.79.1)(vue@3.2.44)
vite:
- specifier: ^3.2.3
- version: 3.2.3(sass@1.56.1)
+ specifier: ^3.2.4
+ version: 3.2.10(sass@1.56.1)
vite-plugin-banner:
specifier: ^0.6.1
version: 0.6.1
vite-plugin-compression:
specifier: ^0.5.1
- version: 0.5.1(vite@3.2.3)
+ version: 0.5.1(vite@3.2.10)
vite-plugin-html:
specifier: ^3.2.0
- version: 3.2.0(vite@3.2.3)
+ version: 3.2.0(vite@3.2.10)
vite-plugin-mock:
specifier: ^2.9.6
- version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3)
+ version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10)
vite-plugin-pages:
specifier: ^0.27.1
- version: 0.27.1(vite@3.2.3)
+ version: 0.27.1(vite@3.2.10)
vite-plugin-spritesmith:
specifier: ^0.1.1
version: 0.1.1
vite-plugin-svg-icons:
specifier: ^2.0.1
- version: 2.0.1(vite@3.2.3)
+ version: 2.0.1(vite@3.2.10)
vite-plugin-vue-layouts:
specifier: ^0.6.0
- version: 0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44)
+ version: 0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44)
vite-plugin-vue-setup-extend:
specifier: ^0.4.0
- version: 0.4.0(vite@3.2.3)
+ version: 0.4.0(vite@3.2.10)
vue-tsc:
specifier: ^1.0.9
version: 1.0.9(typescript@4.8.4)
packages:
+ /@amap/amap-jsapi-loader@1.0.1:
+ resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
+ dev: false
+
/@ampproject/remapping@2.2.0:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@
发起人的：
-
+
-
+
import('@/views/home/ledger/index.vue'),
+ component: () => import('@/views/home/ledger/ledger/index.vue'),
name: 'LedgerManage',
meta: {
title: '台账管理',
icon: 'ep:key',
- sidebar: false,
- breadcrumb: false,
- activeMenu: '/ledger',
- auth: '/ledger',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ auth: '/ledger/manage',
},
},
+ {
+ path: 'sync',
+ component: () => import('@/views/home/ledger/ledger/components/syncRecord.vue'),
+ name: 'SyncRecord',
+ meta: {
+ title: '同步日志',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/ledger/manage',
+ },
+ },
+ {
+ path: 'pipelinem',
+ component: () => import('@/views/home/ledger/pipeline/index.vue'),
+ name: 'pipelineMange',
+ meta: {
+ title: '管线管理',
+ icon: 'ep:key',
+ sidebar: true,
+ breadcrumb: true,
+ activeMenu: '/ledger/pipelinem',
+ auth: '/ledger/pipeline',
+ },
+ },
+
],
},
{
diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts
index 77618c1..5c4b7a7 100644
--- a/src/router/modules/mobile.ts
+++ b/src/router/modules/mobile.ts
@@ -19,8 +19,8 @@
name: 'HomeIndex',
meta: {
title: '首页',
- isHeader: true, // 是否需要头部
- isBack: true, // 是否需要返回按钮
+ isHeader: false, // 是否需要头部
+ isBack: false, // 是否需要返回按钮
isHome: false, // 是否需要回到首页按钮
},
},
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 407b03d..319884e 100644
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -190,9 +190,9 @@
params.parentCode = currentSystem.code // 子系统code
}
// 判断本地存储
- if (localStorage.getItem('currentSys')) {
- params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
- }
+ // if (localStorage.getItem('currentSys')) {
+ // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code
+ // }
return new Promise((resolve) => {
getUserMenus(params).then((response) => {
const data = response.data
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 743e384..64af358 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -188,19 +188,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -209,7 +209,7 @@
-
+
+
+
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 37566c7..8eab8ad 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -164,19 +164,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -185,7 +185,7 @@
-
+
([
{ text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+ { text: '设备名称', value: 'deviceName', align: 'center', isRequired: true },
{ text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
{ text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
{ text: '监测对象', value: 'watchObjectName', align: 'center' },
@@ -26,7 +27,7 @@
{ text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
{ text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
- { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
+ { text: '安装日期', value: 'installDate', align: 'center', isRequired: true },
])
// 最终展示列
const columnsConfig = ref([])
@@ -117,15 +118,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +171,9 @@
-
+
-
+
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index de16332..1bb3d99 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -141,17 +141,17 @@
-
+
-
+
-
+
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 70f8f87..ca5d994 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -118,7 +118,7 @@
-
+
diff --git a/src/views/home/ledger/index.vue b/src/views/home/ledger/index.vue
deleted file mode 100644
index 52a70bf..0000000
--- a/src/views/home/ledger/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 台账管理
-
diff --git a/src/views/home/ledger/ledger/components/syncRecord.vue b/src/views/home/ledger/ledger/components/syncRecord.vue
new file mode 100644
index 0000000..a7c2cd4
--- /dev/null
+++ b/src/views/home/ledger/ledger/components/syncRecord.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步日志
+
+
+ 全部同步
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 同步
+
+
+
+
+
+
+
+ 网格
+
+
+
+
+
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
new file mode 100644
index 0000000..d7dbc40
--- /dev/null
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -0,0 +1,3 @@
+
+ 管线管理
+
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index cc2059b..d6d9cf7 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -133,25 +133,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 70384ba..cde529c 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -204,7 +204,7 @@
-
+
-
+
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index c0eaeea..a05d6bb 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -219,7 +219,7 @@
-
+
@@ -231,7 +231,7 @@
-
+
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..64b9571 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -202,7 +202,7 @@
-
+
=6.0.0'}
@@ -690,6 +700,14 @@
vue: 3.2.44
dev: false
+ /@element-plus/icons-vue@2.3.1(vue@3.2.44):
+ resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
+ peerDependencies:
+ vue: ^3.2.0
+ dependencies:
+ vue: 3.2.44
+ dev: false
+
/@esbuild-kit/cjs-loader@2.4.0:
resolution: {integrity: sha512-DBBCiHPgL2B/elUpvCDhNHXnlZQ9sfO2uyt1OJyAXKT41beQEFY4OxZ6gwS+ZesRCbZ6JV8M7GEyOPkjv8kdIw==}
dependencies:
@@ -1250,7 +1268,7 @@
nanoid: 3.3.4
dev: false
- /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue-jsx@2.1.1(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
@@ -1260,20 +1278,20 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2(@babel/core@7.19.6)
'@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.19.6)
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
transitivePeerDependencies:
- supports-color
dev: true
- /@vitejs/plugin-vue@3.2.0(vite@3.2.3)(vue@3.2.44):
+ /@vitejs/plugin-vue@3.2.0(vite@3.2.10)(vue@3.2.44):
resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
dev: true
@@ -2328,6 +2346,11 @@
resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
dev: true
+ /circular-json@0.5.9:
+ resolution: {integrity: sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==}
+ deprecated: CircularJSON is in maintenance only, flatted is its successor.
+ dev: false
+
/class-utils@0.3.6:
resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
engines: {node: '>=0.10.0'}
@@ -3013,13 +3036,13 @@
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true
- /element-plus@2.2.26(vue@3.2.44):
- resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==}
+ /element-plus@2.7.8(vue@3.2.44):
+ resolution: {integrity: sha512-h6dx2XihAbQaud0v+6O7Fy0b0G3YNplNVH7QnK3csTcvQd4y4raiyMRQpf9EKbRbTMdNrFsqAZrs9ok9DMcJHg==}
peerDependencies:
vue: ^3.2.0
dependencies:
'@ctrl/tinycolor': 3.4.1
- '@element-plus/icons-vue': 2.0.10(vue@3.2.44)
+ '@element-plus/icons-vue': 2.3.1(vue@3.2.44)
'@floating-ui/dom': 1.0.3
'@popperjs/core': /@sxzz/popperjs-es@2.11.7
'@types/lodash': 4.14.186
@@ -8207,7 +8230,7 @@
resolution: {integrity: sha512-E5abFbnqO21R1dCFwoRYAIcJArX3XAMZv1zV4uU9PcWQNt1PaWtj5SP1QcnbyXn2FhWSnvPkJp7yP16DeA/BzA==}
dev: true
- /vite-plugin-compression@0.5.1(vite@3.2.3):
+ /vite-plugin-compression@0.5.1(vite@3.2.10):
resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
peerDependencies:
vite: '>=2.0.0'
@@ -8215,12 +8238,12 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-html@3.2.0(vite@3.2.3):
+ /vite-plugin-html@3.2.0(vite@3.2.10):
resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==}
peerDependencies:
vite: '>=2.0.0'
@@ -8237,10 +8260,10 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.3):
+ /vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@3.2.10):
resolution: {integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -8257,13 +8280,13 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- rollup
- supports-color
dev: true
- /vite-plugin-pages@0.27.1(vite@3.2.3):
+ /vite-plugin-pages@0.27.1(vite@3.2.10):
resolution: {integrity: sha512-KXfeG9aQSNsSXBs1mPeeuC0rwkLti+MgoJ3GknrwRDNrdrojb9czcFAVlnoPNVdfuvTHcWdf5zqN7+vuvz2JZQ==}
peerDependencies:
'@vue/compiler-sfc': ^2.7.0 || ^3.0.0
@@ -8280,7 +8303,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8297,7 +8320,7 @@
spritesmith: 3.4.0
dev: true
- /vite-plugin-svg-icons@2.0.1(vite@3.2.3):
+ /vite-plugin-svg-icons@2.0.1(vite@3.2.10):
resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
peerDependencies:
vite: '>=2.0.0'
@@ -8310,12 +8333,12 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-layouts@0.6.0(vite@3.2.3)(vue-router@4.1.6)(vue@3.2.44):
+ /vite-plugin-vue-layouts@0.6.0(vite@3.2.10)(vue-router@4.1.6)(vue@3.2.44):
resolution: {integrity: sha512-7QX7o/NpCfs+hyXphwYfmPqAEQ6qd4uXsvI0VsovjGT2eCoEE5dMdP6L+uqqNWY4uqv7oCvtinecZmbzZv/9Rg==}
peerDependencies:
vite: ^2.5.0
@@ -8325,25 +8348,25 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
vue: 3.2.44
vue-router: 4.1.6(vue@3.2.44)
transitivePeerDependencies:
- supports-color
dev: true
- /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.3):
+ /vite-plugin-vue-setup-extend@0.4.0(vite@3.2.10):
resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
peerDependencies:
vite: '>=2.0.0'
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3(sass@1.56.1)
+ vite: 3.2.10(sass@1.56.1)
dev: true
- /vite@3.2.3(sass@1.56.1):
- resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
+ /vite@3.2.10(sass@1.56.1):
+ resolution: {integrity: sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
diff --git a/src/api/home/ledger/ledger.ts b/src/api/home/ledger/ledger.ts
new file mode 100644
index 0000000..7131b1e
--- /dev/null
+++ b/src/api/home/ledger/ledger.ts
@@ -0,0 +1,13 @@
+/**
+ * 台账管理--台账管理接口
+ */
+import request from '@/api/index'
+
+// 台账管理基础列表 -- 闸井和场站数据
+export function getWellListPage(data: any) {
+ return request({
+ url: `/system/busLedger/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 35f47cd..89cec22 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -346,7 +346,7 @@
:style="column.styleFilter ? column.styleFilter(scope.row) : ''"
>{{ column.filter(scope.row) }}
-
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..6ab0a23 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -228,7 +228,7 @@