diff --git a/public/css/largeScreenLayout.css b/public/css/largeScreenLayout.css index c179257..58cf609 100644 --- a/public/css/largeScreenLayout.css +++ b/public/css/largeScreenLayout.css @@ -49,6 +49,12 @@ height: 970px; background: url("../images/one/3x1.png") no-repeat center/100% 100%; } +.screen-one-3-1.no-border{ + background: none; +} +.screen-one-3-1.no-lable .module-title{ + display: none; +} .screen-one-3-2{ height: 970px; background: url("../images/one/3x2.png") no-repeat center/100% 100%; diff --git a/public/css/largeScreenStyle.css b/public/css/largeScreenStyle.css index 847608f..29c6920 100644 --- a/public/css/largeScreenStyle.css +++ b/public/css/largeScreenStyle.css @@ -3345,7 +3345,7 @@ table{ height: 35px; background: #142c6a; color: #738fb4; - width: 110px; + width: 120px; border: 0; outline: 0; cursor: pointer; diff --git a/src/components/header.vue b/src/components/header.vue index 8840511..18231f3 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -6,11 +6,49 @@
项目概况
-
项目详情
-
安全管理
+
项目详情
+
+
安全管理
+
+
+
+
+ + +
+ + +
+
+
+
+ +
+
质量管理
+
+
+
+
+ + +
+
+
+
+
进度管理
-
视频管理
diff --git a/src/components/module/module-one-3-1.js b/src/components/module/module-one-3-1.js index a017d97..b487d3f 100644 --- a/src/components/module/module-one-3-1.js +++ b/src/components/module/module-one-3-1.js @@ -1,8 +1,8 @@ import Vue from 'vue' Vue.component('module-one-3-1', { template:` -
-
+
+
{{label}}
@@ -11,6 +11,10 @@ Vue.component('module-one-3-1', { props: { label:{ type:String + }, + cls:{ + type:String, + default:"" } }, diff --git a/src/pages/quality/concreteStrength.vue b/src/pages/quality/concreteStrength.vue new file mode 100644 index 0000000..a8c01ba --- /dev/null +++ b/src/pages/quality/concreteStrength.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/pages/quality/standardCuringRoom.vue b/src/pages/quality/standardCuringRoom.vue new file mode 100644 index 0000000..06af90d --- /dev/null +++ b/src/pages/quality/standardCuringRoom.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/pages/safe/distributionBox.vue b/src/pages/safe/distributionBox.vue new file mode 100644 index 0000000..9a02b55 --- /dev/null +++ b/src/pages/safe/distributionBox.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/pages/safe/dumbwaiter.vue b/src/pages/safe/dumbwaiter.vue new file mode 100644 index 0000000..6d95bcf --- /dev/null +++ b/src/pages/safe/dumbwaiter.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/pages/safe/excavation.vue b/src/pages/safe/excavation.vue new file mode 100644 index 0000000..e0d7c8f --- /dev/null +++ b/src/pages/safe/excavation.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/pages/safe/personnelPosition.vue b/src/pages/safe/personnelPosition.vue new file mode 100644 index 0000000..cb75cba --- /dev/null +++ b/src/pages/safe/personnelPosition.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/pages/safe/towerCrane.vue b/src/pages/safe/towerCrane.vue new file mode 100644 index 0000000..8eb8c07 --- /dev/null +++ b/src/pages/safe/towerCrane.vue @@ -0,0 +1,473 @@ + + + + diff --git a/src/router/index.js b/src/router/index.js index 8b46cdb..4a9d2b9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -24,6 +24,16 @@ const routes = [ path: '/quality', name: 'quality', component: () => import(/* webpackChunkName: "quality" */ '../pages/projectQuality.vue') + } , + { + path: '/concreteStrength', + name: 'concreteStrength', + component: () => import(/* webpackChunkName: "concreteStrength" */ '../pages/quality/concreteStrength.vue') + } , + { + path: '/standardCuringRoom', + name: 'standardCuringRoom', + component: () => import(/* webpackChunkName: "standardCuringRoom" */ '../pages/quality/standardCuringRoom.vue') } , { @@ -31,6 +41,26 @@ const routes = [ name: 'safety', component: () => import(/* webpackChunkName: "safety" */ '../pages/projectSafety.vue') } + , { + path: '/distributionBox', + name: 'distributionBox', + component: () => import(/* webpackChunkName: "distributionBox" */ '../pages/safe/distributionBox.vue') + } + , { + path: '/dumbwaiter', + name: 'dumbwaiter', + component: () => import(/* webpackChunkName: "dumbwaiter" */ '../pages/safe/dumbwaiter.vue') + } + , { + path: '/excavation', + name: 'excavation', + component: () => import(/* webpackChunkName: "excavation" */ '../pages/safe/excavation.vue') + } + , { + path: '/towerCrane', + name: 'towerCrane', + component: () => import(/* webpackChunkName: "towerCrane" */ '../pages/safe/towerCrane.vue') + } , { path: '/video', diff --git a/vue.config.js b/vue.config.js index 01ca082..bd63956 100644 --- a/vue.config.js +++ b/vue.config.js @@ -37,8 +37,8 @@ module.exports = defineConfig({ } }, '/jhapi':{ - //target: `http://62.234.3.186/jhapi/`, - target: `http://127.0.0.1:8090/jhapi/`, + target: `http://62.234.3.186/jhapi/`, + //target: `http://127.0.0.1:8090/jhapi/`, changeOrigin: true, pathRewrite: { '^/jhapi':'/'