import('@/views/resource/grid/index.vue'),
- name: 'grid2',
- meta: { title: '网格化地图', icon: '' },
- },
+ // {
+ // path: '/sub-government-affairs-service/grid',
+ // component: () => import('@/views/resource/grid/index.vue'),
+ // name: 'grid2',
+ // meta: { title: '网格化地图', icon: '' },
+ // },
],
},
...annualplanRouters,
diff --git a/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue b/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue
new file mode 100644
index 0000000..52dd42d
--- /dev/null
+++ b/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue
@@ -0,0 +1,375 @@
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/resource/grid/AddGridMember.vue b/sub-government-affairs-service/src/views/resource/grid/AddGridMember.vue
new file mode 100644
index 0000000..52dd42d
--- /dev/null
+++ b/sub-government-affairs-service/src/views/resource/grid/AddGridMember.vue
@@ -0,0 +1,375 @@
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/resource/grid/GridManagement.vue b/sub-government-affairs-service/src/views/resource/grid/GridManagement.vue
new file mode 100644
index 0000000..62d6e21
--- /dev/null
+++ b/sub-government-affairs-service/src/views/resource/grid/GridManagement.vue
@@ -0,0 +1,15 @@
+
+
+
网格化管理
+
+
+
+
+
+
diff --git a/sub-operation-service/package.json b/sub-operation-service/package.json
index 00434ae..cd6ecb0 100644
--- a/sub-operation-service/package.json
+++ b/sub-operation-service/package.json
@@ -31,6 +31,7 @@
"hls.js": "^1.6.2",
"js-base64": "^3.7.6",
"lodash": "^4.17.21",
+ "marked": "^15.0.12",
"moment": "^2.30.1",
"nprogress": "^0.2.0",
"path-browserify": "^1.0.1",
diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js
index c8c480b..571aa99 100644
--- a/sub-operation-service/src/router/index.js
+++ b/sub-operation-service/src/router/index.js
@@ -7,6 +7,7 @@
*/
import { createRouter, createWebHistory } from 'vue-router';
import Layout from '@/layouts/index.vue';
+import BrandLayout from '@/views/brand/index.vue';
import Views from '@/layouts/Views.vue';
import userCentre from '@/layouts/userCentre.vue';
@@ -236,43 +237,38 @@ export const constantRoutes = [
meta: { title: '公共品牌' },
children: [
{
- path: 'apply',
- component: () => import('@/views/brand/index.vue'),
+ path: '',
+ component: BrandLayout,
+ redirect: '/sub-operation-service/brand/apply',
children: [
{
- path: '',
- component: () => import('@/views/brand/components/ApplyList.vue'),
+ path: 'apply',
name: 'brandApplyList',
+ component: () => import('@/views/brand/components/ApplyList.vue'),
meta: { title: '使用申请' },
},
{
- path: ':id',
- component: () => import('@/views/brand/components/ApplyDetail.vue'),
+ path: 'apply/:id',
name: 'brandApplyDetail',
+ component: () => import('@/views/brand/components/ApplyDetail.vue'),
meta: { title: '产品申请' },
},
- ],
- },
- {
- path: 'auth',
- component: () => import('@/views/brand/index.vue'),
- children: [
{
- path: '',
- component: () => import('@/views/brand/components/Auth.vue'),
+ path: 'auth/record',
name: 'brandAuth',
- meta: { title: '授权管理' },
+ component: () => import('@/views/brand/components/Auth.vue'),
+ meta: { title: '授权记录' },
},
- ],
- },
- {
- path: 'monitor',
- component: () => import('@/views/brand/index.vue'),
- children: [
{
- path: '',
- component: () => import('@/views/brand/components/Monitor.vue'),
+ path: 'auth/system',
+ name: 'brandSystem',
+ component: () => import('@/views/brand/components/BrandSystem.vue'),
+ meta: { title: '品牌制度' },
+ },
+ {
+ path: 'monitor',
name: 'brandMonitor',
+ component: () => import('@/views/brand/components/Monitor.vue'),
meta: { title: '使用监管' },
},
],
diff --git a/sub-operation-service/src/views/brand/components/Auth.vue b/sub-operation-service/src/views/brand/components/Auth.vue
index 82ad282..3a84398 100644
--- a/sub-operation-service/src/views/brand/components/Auth.vue
+++ b/sub-operation-service/src/views/brand/components/Auth.vue
@@ -63,7 +63,7 @@