From 895ba2f255e05b780c52fc1667c045c495b129b8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 20 Dec 2023 10:58:52 +0800
Subject: [PATCH] 菜单调整
---
src/views/cGovernance/taskECall.vue | 0
src/views/wel/index.vue | 17 +++++++-
src/views/cGovernance/gridPatrolRecord.vue | 0
vue.config.js | 35 +++++++++--------
src/views/grid/gridman.vue | 15 ++++---
public/img/jsc.png | 0
src/views/cGovernance/gridWorkLog.vue | 0
src/views/cGovernance/punchCard.vue | 0
8 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/public/img/jsc.png b/public/img/jsc.png
new file mode 100644
index 0000000..93586ea
--- /dev/null
+++ b/public/img/jsc.png
Binary files differ
diff --git a/src/views/grid/gridPatrolRecord/index.vue b/src/views/cGovernance/gridPatrolRecord.vue
similarity index 100%
rename from src/views/grid/gridPatrolRecord/index.vue
rename to src/views/cGovernance/gridPatrolRecord.vue
diff --git a/src/views/grid/gridWorkLog/index.vue b/src/views/cGovernance/gridWorkLog.vue
similarity index 100%
rename from src/views/grid/gridWorkLog/index.vue
rename to src/views/cGovernance/gridWorkLog.vue
diff --git a/src/views/punch_card/index.vue b/src/views/cGovernance/punchCard.vue
similarity index 100%
rename from src/views/punch_card/index.vue
rename to src/views/cGovernance/punchCard.vue
diff --git a/src/views/task/eCall/index.vue b/src/views/cGovernance/taskECall.vue
similarity index 100%
rename from src/views/task/eCall/index.vue
rename to src/views/cGovernance/taskECall.vue
diff --git a/src/views/grid/gridman.vue b/src/views/grid/gridman.vue
index 56ab9da..f1e3dd2 100644
--- a/src/views/grid/gridman.vue
+++ b/src/views/grid/gridman.vue
@@ -58,6 +58,7 @@
label: "name",
value: "id"
},
+ cascaderItem: ["gridId"],
rules: [
{
required: true,
@@ -66,18 +67,19 @@
},
],
},
+
{
label: "网格名称",
prop: "gridId",
- searchSpan: 4,
- search: true,
+ hide: true,
type: "tree",
- dicUrl: "/api/blade-grid/grid/getGridTree",
- defaultExpandedKeys: ["361102003"],
+ cell: true,
props: {
- label: "name",
- value: "id"
+ label: "gridName",
+ value: "id",
},
+ dicUrl:
+ "/api/blade-grid/grid/getGridList?communityCode={{communityCode}}",
rules: [
{
required: true,
@@ -86,6 +88,7 @@
},
],
},
+
{
label: "网格员",
prop: "gridmanName",
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 9ffc176..081373a 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -20,6 +20,9 @@
<div class="outS" @click="down5">
<div class="down5"><span>走访日志</span></div>
</div>
+ <div class="outS" @click="down6">
+ <div class="down6"><span>驾驶舱</span></div>
+ </div>
</div>
</div>
</template>
@@ -47,6 +50,9 @@
down5 () {
this.$router.push({ path: "/grid/gridWorkLog/index" })
},
+ down6 () {
+ window.open('http://srgdjczzxtpt.com:2181/databoard/dashboard')
+ },
},
mouted () { },
}
@@ -62,7 +68,7 @@
// border: 1px solid #000;
.homeL-up {
width: 100%;
- height: 70%;
+ height: 74%;
// border: 1px solid rgb(39, 164, 185);
display: flex;
align-items: center;
@@ -98,7 +104,7 @@
align-items: center;
.outS {
- width: 20%;
+ width: calc(100% / 6);
height: 94.6%;
display: flex;
justify-content: center;
@@ -108,7 +114,8 @@
.down2,
.down3,
.down4,
- .down5 {
+ .down5,
+ .down6 {
width: 96%;
height: 100%;
background-repeat: no-repeat;
@@ -156,6 +163,10 @@
.down5 {
background-image: url("../../../public/img/tongji.png");
}
+
+ .down6 {
+ background-image: url("../../../public/img/jsc.png");
+ }
}
}
</style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 531d332..55e7df4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,36 +6,37 @@
chainWebpack: (config) => {
//忽略的打包文件
config.externals({
- 'vue': 'Vue',
- 'vue-router': 'VueRouter',
- 'vuex': 'Vuex',
- 'axios': 'axios',
- 'element-ui': 'ELEMENT',
+ vue: "Vue",
+ "vue-router": "VueRouter",
+ vuex: "Vuex",
+ axios: "axios",
+ "element-ui": "ELEMENT",
});
- const entry = config.entry('app');
- entry.add('babel-polyfill').end();
- entry.add('classlist-polyfill').end();
- entry.add('@/mock').end();
+ const entry = config.entry("app");
+ entry.add("babel-polyfill").end();
+ entry.add("classlist-polyfill").end();
+ entry.add("@/mock").end();
},
css: {
- extract: { ignoreOrder: true }
+ extract: { ignoreOrder: true },
},
//开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
devServer: {
port: 1888,
proxy: {
- '/api': {
+ "/api": {
//本地服务接口地址
- target: 'http://localhost:9528',
+ target: "https://srgdjczzxtpt.com:2080/api",
+ // target: "http://z4042833u6.wicp.vip",
// target: 'http://192.168.0.102:9528',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.cn/api',
changeOrigin: true,
ws: true,
pathRewrite: {
- '^/api': '/'
- }
- }
- }
- }
+ "^/api": "/",
+ },
+ },
+ },
+ },
};
--
Gitblit v1.9.3