diff --git a/src/assets/images/menu/saosao.png b/src/assets/images/menu/saosao.png new file mode 100644 index 00000000..27ebcce4 Binary files /dev/null and b/src/assets/images/menu/saosao.png differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index ecd96c12..e4f58ee3 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,8 +40,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 + // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 diff --git a/src/router/index.js b/src/router/index.js index 9c502de7..8e6ccdd6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,6 +4,8 @@ import VueRouter from 'vue-router' // import homeIntro from '../views/home/homeIntro.vue' //首页-系统简介页面 import homeLayout from '../views/homeTwo/homeLayout.vue' //首页 import homeIntro from '../views/homeTwo/homeIntro.vue' //首页-系统简介页面 +import zjsjLargeScreen from './largeScreen/zjsj.js' + Vue.use(VueRouter) var routes = [] const routes2 = [ @@ -1554,7 +1556,7 @@ const routes2 = [ path: 'AiAnalysis', name: '数据看板-AI数据分析', component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue') - }, + } // 湖里大屏模块路由配置 // { // path: 'projectHuli', @@ -1668,11 +1670,11 @@ const routes2 = [ // ] }, // 湖里金林湾大屏路由 - { - path: '/project/jlw', + { + path: '/project/jlw', name: '金陵湾', - component: resolve => require(['@/views/projectAdmin/jlw'], resolve), - children:[ + component: resolve => require(['@/views/projectAdmin/jlw'], resolve), + children: [ { path: 'home', name: '数据看板-项目概览', @@ -1716,10 +1718,13 @@ const routes2 = [ { path: 'zjsj', name: '中建四局-指挥中心', - component: () => import('@/views/projectAdmin/zjsj/commandCentre/index.vue') + component: () => import('@/views/projectAdmin/zjsj/command/index.vue') } - ] - }, + ] + }, + + // 中建四局大屏 + zjsjLargeScreen, { path: '/equipmentCenter/', diff --git a/src/router/largeScreen/zjsj.js b/src/router/largeScreen/zjsj.js new file mode 100644 index 00000000..73532843 --- /dev/null +++ b/src/router/largeScreen/zjsj.js @@ -0,0 +1,52 @@ +export default { + path: '/project/zjsj', + name: '中建四局大屏', + component: () => import('@/views/projectAdmin/zjsj'), + children: [ + { + path: 'command', + name: '指挥中心', + component: () => import('@/views/projectAdmin/zjsj/command') + }, + { + path: 'cim', + name: 'CIM+', + component: () => import('@/views/projectAdmin/zjsj/cim') + }, + { + path: 'sourse', + name: '资源管理', + component: () => import('@/views/projectAdmin/zjsj/sourse') + }, + { + path: 'progress', + name: '进度管理', + component: () => import('@/views/projectAdmin/zjsj/progress') + }, + { + path: 'security', + name: '安全管理', + component: () => import('@/views/projectAdmin/zjsj/security') + }, + { + path: 'quality', + name: '质量管理', + component: () => import('@/views/projectAdmin/zjsj/quality') + }, + { + path: 'carbon', + name: '双碳管理', + component: () => import('@/views/projectAdmin/zjsj/carbon') + }, + { + path: 'monitor', + name: '监控大屏', + component: () => import('@/views/projectAdmin/zjsj/monitor') + }, + { + path: 'govComp', + name: '政企联合', + component: () => import('@/views/projectAdmin/zjsj/govComp') + } + ] +} diff --git a/src/views/projectAdmin/zjsj/carbon/index.vue b/src/views/projectAdmin/zjsj/carbon/index.vue new file mode 100644 index 00000000..661e27b4 --- /dev/null +++ b/src/views/projectAdmin/zjsj/carbon/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/cim/index.vue b/src/views/projectAdmin/zjsj/cim/index.vue new file mode 100644 index 00000000..4512ed57 --- /dev/null +++ b/src/views/projectAdmin/zjsj/cim/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/commandCentre/center.vue b/src/views/projectAdmin/zjsj/command/center.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/center.vue rename to src/views/projectAdmin/zjsj/command/center.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/centerBOne.vue b/src/views/projectAdmin/zjsj/command/centerBOne.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/centerBOne.vue rename to src/views/projectAdmin/zjsj/command/centerBOne.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/centerBTwo.vue b/src/views/projectAdmin/zjsj/command/centerBTwo.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/centerBTwo.vue rename to src/views/projectAdmin/zjsj/command/centerBTwo.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/index.vue b/src/views/projectAdmin/zjsj/command/index.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/index.vue rename to src/views/projectAdmin/zjsj/command/index.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/leftFour.vue b/src/views/projectAdmin/zjsj/command/leftFour.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/leftFour.vue rename to src/views/projectAdmin/zjsj/command/leftFour.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/leftOne.vue b/src/views/projectAdmin/zjsj/command/leftOne.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/leftOne.vue rename to src/views/projectAdmin/zjsj/command/leftOne.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/leftThree.vue b/src/views/projectAdmin/zjsj/command/leftThree.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/leftThree.vue rename to src/views/projectAdmin/zjsj/command/leftThree.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/leftTwo.vue b/src/views/projectAdmin/zjsj/command/leftTwo.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/leftTwo.vue rename to src/views/projectAdmin/zjsj/command/leftTwo.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/rightFour.vue b/src/views/projectAdmin/zjsj/command/rightFour.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/rightFour.vue rename to src/views/projectAdmin/zjsj/command/rightFour.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/rightOne.vue b/src/views/projectAdmin/zjsj/command/rightOne.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/rightOne.vue rename to src/views/projectAdmin/zjsj/command/rightOne.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/rightThree.vue b/src/views/projectAdmin/zjsj/command/rightThree.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/rightThree.vue rename to src/views/projectAdmin/zjsj/command/rightThree.vue diff --git a/src/views/projectAdmin/zjsj/commandCentre/rightTwo.vue b/src/views/projectAdmin/zjsj/command/rightTwo.vue similarity index 100% rename from src/views/projectAdmin/zjsj/commandCentre/rightTwo.vue rename to src/views/projectAdmin/zjsj/command/rightTwo.vue diff --git a/src/views/projectAdmin/zjsj/govComp/index.vue b/src/views/projectAdmin/zjsj/govComp/index.vue new file mode 100644 index 00000000..fd265dfd --- /dev/null +++ b/src/views/projectAdmin/zjsj/govComp/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/index.vue b/src/views/projectAdmin/zjsj/index.vue index d1220e34..cabf93f0 100644 --- a/src/views/projectAdmin/zjsj/index.vue +++ b/src/views/projectAdmin/zjsj/index.vue @@ -1,26 +1,21 @@ - \ No newline at end of file + diff --git a/src/views/projectAdmin/zjsj/monitor/index.vue b/src/views/projectAdmin/zjsj/monitor/index.vue new file mode 100644 index 00000000..2a584b02 --- /dev/null +++ b/src/views/projectAdmin/zjsj/monitor/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/progress/index.vue b/src/views/projectAdmin/zjsj/progress/index.vue new file mode 100644 index 00000000..7e002e2a --- /dev/null +++ b/src/views/projectAdmin/zjsj/progress/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/quality/index.vue b/src/views/projectAdmin/zjsj/quality/index.vue new file mode 100644 index 00000000..8925a42e --- /dev/null +++ b/src/views/projectAdmin/zjsj/quality/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/security/index.vue b/src/views/projectAdmin/zjsj/security/index.vue new file mode 100644 index 00000000..ea4360ad --- /dev/null +++ b/src/views/projectAdmin/zjsj/security/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/projectAdmin/zjsj/sourse/index.vue b/src/views/projectAdmin/zjsj/sourse/index.vue new file mode 100644 index 00000000..f489e7f0 --- /dev/null +++ b/src/views/projectAdmin/zjsj/sourse/index.vue @@ -0,0 +1,9 @@ + + + + +