diff --git a/dist.zip b/dist.zip index 53d467f0..a2cc8bb0 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/assets/images/projectImg/logo.png b/src/assets/images/projectImg/logo.png new file mode 100644 index 00000000..162e62ef Binary files /dev/null and b/src/assets/images/projectImg/logo.png differ diff --git a/src/assets/images/projectImg/title2.png b/src/assets/images/projectImg/title2.png new file mode 100644 index 00000000..f6475959 Binary files /dev/null and b/src/assets/images/projectImg/title2.png differ diff --git a/src/views/projectAdmin/jlw/CIM/index.vue b/src/views/projectAdmin/jlw/CIM/index.vue index 0d99eb6b..9542b1e6 100644 --- a/src/views/projectAdmin/jlw/CIM/index.vue +++ b/src/views/projectAdmin/jlw/CIM/index.vue @@ -96,6 +96,7 @@ export default { .container { width: 100%; height: 100%; +<<<<<<< HEAD display: flex; justify-content: space-between; .charts { @@ -107,6 +108,26 @@ export default { .chart { height: 32%; } +======= + background-color: #07162b; + background-image: url('~@/assets/images/projectImg/Bimbgc.png'); +} +.topBox { + height: 20%; +} +.leftBox { + position: relative; + width: 25%; + height: 100%; + margin-right: 15px; + .leftTop { + height: 33%; + margin-bottom: 15px; + } + .leftCenter { + height: 33%; + margin-bottom: 15px; +>>>>>>> dev-xiaole } .bim { padding: 8px; diff --git a/src/views/projectAdmin/jlw/digitalSite/index.vue b/src/views/projectAdmin/jlw/digitalSite/index.vue index 0f35ace5..fd61f529 100644 --- a/src/views/projectAdmin/jlw/digitalSite/index.vue +++ b/src/views/projectAdmin/jlw/digitalSite/index.vue @@ -222,7 +222,6 @@ export default { width: 25%; height: 100%; margin-right: 15px; - margin-left: 15px; .leftTop { height: 35%; margin-bottom: 15px; diff --git a/src/views/projectAdmin/jlw/envirManage/index.vue b/src/views/projectAdmin/jlw/envirManage/index.vue index 3c6cabf7..5a2e17c3 100644 --- a/src/views/projectAdmin/jlw/envirManage/index.vue +++ b/src/views/projectAdmin/jlw/envirManage/index.vue @@ -86,7 +86,6 @@ export default { width: 25%; height: 100%; margin-right: 15px; - margin-left: 15px; .leftTop { height: 35%; margin-bottom: 15px; diff --git a/src/views/projectAdmin/jlw/index.vue b/src/views/projectAdmin/jlw/index.vue index 1338f7df..3395f5bf 100644 --- a/src/views/projectAdmin/jlw/index.vue +++ b/src/views/projectAdmin/jlw/index.vue @@ -2,26 +2,30 @@
-
- {{currentDate}} - {{currentWeek}} - {{currentTime}} +
+ +
多云 32℃
+
-
+

{{'金林湾项目监管平台'}}

-
- - 多云 32℃ - + +
+
+ {{currentDate}} + {{currentWeek}} + {{currentTime}} + +
-