diff --git a/package-lock.json b/package-lock.json
index 14ab19d8..283e8190 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,6 +33,7 @@
"style-resources-loader": "^1.3.3",
"stylus-loader": "^3.0.2",
"vue": "^2.6.11",
+ "vue-awesome-swiper": "4.0",
"vue-color": "^2.8.1",
"vue-count-to": "^1.0.13",
"vue-cropper": "^0.5.5",
@@ -6663,6 +6664,15 @@
"resolved": "https://registry.npmmirror.com/dom-to-image/-/dom-to-image-2.6.0.tgz",
"integrity": "sha512-Dt0QdaHmLpjURjU7Tnu3AgYSF2LuOmksSGsUcE6ItvJoCWTBEmiMXcqBdNSAm9+QbbwD7JMoVsuuKX6ZVQv1qA=="
},
+ "node_modules/dom7": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmmirror.com/dom7/-/dom7-2.1.5.tgz",
+ "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
+ "peer": true,
+ "dependencies": {
+ "ssr-window": "^2.0.0"
+ }
+ },
"node_modules/domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -15267,6 +15277,12 @@
"node": ">=0.10.0"
}
},
+ "node_modules/ssr-window": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-2.0.0.tgz",
+ "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==",
+ "peer": true
+ },
"node_modules/ssri": {
"version": "6.0.1",
"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
@@ -15727,6 +15743,20 @@
"node": ">=4.0.0"
}
},
+ "node_modules/swiper": {
+ "version": "5.4.5",
+ "resolved": "https://registry.npmmirror.com/swiper/-/swiper-5.4.5.tgz",
+ "integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==",
+ "hasInstallScript": true,
+ "peer": true,
+ "dependencies": {
+ "dom7": "^2.1.5",
+ "ssr-window": "^2.0.0"
+ },
+ "engines": {
+ "node": ">= 4.7.0"
+ }
+ },
"node_modules/tapable": {
"version": "1.1.3",
"resolved": "https://registry.npmmirror.com/tapable/-/tapable-1.1.3.tgz",
@@ -16854,6 +16884,18 @@
"version": "2.6.11",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
},
+ "node_modules/vue-awesome-swiper": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmmirror.com/vue-awesome-swiper/-/vue-awesome-swiper-4.0.4.tgz",
+ "integrity": "sha512-yzp93S1DBucR16ouzKn7QBQojqGX6yHPEuVIioYp4U4Eyk0rxe0RRVQcUnZXi05bM5MwCvCKXtgaY31N5tTi7g==",
+ "engines": {
+ "node": ">=8"
+ },
+ "peerDependencies": {
+ "swiper": "^5.2.0",
+ "vue": "^2.6.10"
+ }
+ },
"node_modules/vue-cli-plugin-element": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/vue-cli-plugin-element/-/vue-cli-plugin-element-1.0.1.tgz",
@@ -25449,6 +25491,15 @@
"resolved": "https://registry.npmmirror.com/dom-to-image/-/dom-to-image-2.6.0.tgz",
"integrity": "sha512-Dt0QdaHmLpjURjU7Tnu3AgYSF2LuOmksSGsUcE6ItvJoCWTBEmiMXcqBdNSAm9+QbbwD7JMoVsuuKX6ZVQv1qA=="
},
+ "dom7": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmmirror.com/dom7/-/dom7-2.1.5.tgz",
+ "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
+ "peer": true,
+ "requires": {
+ "ssr-window": "^2.0.0"
+ }
+ },
"domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -32399,6 +32450,12 @@
"tweetnacl": "~0.14.0"
}
},
+ "ssr-window": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-2.0.0.tgz",
+ "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==",
+ "peer": true
+ },
"ssri": {
"version": "6.0.1",
"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
@@ -32772,6 +32829,16 @@
"util.promisify": "~1.0.0"
}
},
+ "swiper": {
+ "version": "5.4.5",
+ "resolved": "https://registry.npmmirror.com/swiper/-/swiper-5.4.5.tgz",
+ "integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==",
+ "peer": true,
+ "requires": {
+ "dom7": "^2.1.5",
+ "ssr-window": "^2.0.0"
+ }
+ },
"tapable": {
"version": "1.1.3",
"resolved": "https://registry.npmmirror.com/tapable/-/tapable-1.1.3.tgz",
@@ -33630,6 +33697,12 @@
"version": "2.6.11",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
},
+ "vue-awesome-swiper": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmmirror.com/vue-awesome-swiper/-/vue-awesome-swiper-4.0.4.tgz",
+ "integrity": "sha512-yzp93S1DBucR16ouzKn7QBQojqGX6yHPEuVIioYp4U4Eyk0rxe0RRVQcUnZXi05bM5MwCvCKXtgaY31N5tTi7g==",
+ "requires": {}
+ },
"vue-cli-plugin-element": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/vue-cli-plugin-element/-/vue-cli-plugin-element-1.0.1.tgz",
diff --git a/package.json b/package.json
index 4842dd4b..6d7fb766 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
"style-resources-loader": "^1.3.3",
"stylus-loader": "^3.0.2",
"vue": "^2.6.11",
+ "vue-awesome-swiper": "4.0",
"vue-color": "^2.8.1",
"vue-count-to": "^1.0.13",
"vue-cropper": "^0.5.5",
diff --git a/src/pages/index/index.js b/src/pages/index/index.js
index b39c64f1..fc8717e1 100644
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@@ -24,7 +24,9 @@ import { autoLogin } from '@/assets/js/api/autoLogin-xingXuan'
import { decode, encode } from 'js-base64'
import { loginApi, companyLoginApi, projectLoginApi } from '@/assets/js/api/loginSign'
import SlideVerify from 'vue-monoplasty-slide-verify'; //滑动验证
+import VueAwesomeSwiper from 'vue-awesome-swiper';
Vue.use(SlideVerify);
+Vue.use(VueAwesomeSwiper);
// 全局组件挂载
Vue.component('Pagination', Pagination)
diff --git a/src/views/projectAdmin/fourEngin/assets/images/command-center/auto1.png b/src/views/projectAdmin/fourEngin/assets/images/command-center/auto1.png
new file mode 100644
index 00000000..e6574968
Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/command-center/auto1.png differ
diff --git a/src/views/projectAdmin/fourEngin/assets/images/command-center/auto2.png b/src/views/projectAdmin/fourEngin/assets/images/command-center/auto2.png
new file mode 100644
index 00000000..e1b756c1
Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/command-center/auto2.png differ
diff --git a/src/views/projectAdmin/fourEngin/assets/images/command-center/auto3.png b/src/views/projectAdmin/fourEngin/assets/images/command-center/auto3.png
new file mode 100644
index 00000000..5e7f8891
Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/command-center/auto3.png differ
diff --git a/src/views/projectAdmin/fourEngin/command/center.vue b/src/views/projectAdmin/fourEngin/command/center.vue
index 65268e19..d9a25d4d 100644
--- a/src/views/projectAdmin/fourEngin/command/center.vue
+++ b/src/views/projectAdmin/fourEngin/command/center.vue
@@ -20,13 +20,16 @@
+
+
+
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
index 8a7ddf7d..91f11338 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
@@ -36,7 +36,7 @@ export default {
flex-shrink: 0;
flex-direction: column;
align-items: center;
- width: 190px;
+ width: 185px;
color: #fff;
.progress-item-dot {
@@ -51,7 +51,7 @@ export default {
top: 4px;
transform: translateX(-99%);
display: block;
- width: 190px;
+ width: 185px;
height: 2px;
background: #fff;
}
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
index fe6bc85a..2fe19b2f 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
@@ -1,26 +1,23 @@
-
-
diff --git a/src/views/projectAdmin/fourEngin/command/rightFour.vue b/src/views/projectAdmin/fourEngin/command/rightFour.vue
index f15a8fb4..7283e395 100644
--- a/src/views/projectAdmin/fourEngin/command/rightFour.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightFour.vue
@@ -9,20 +9,23 @@
@click="handelItemClick(index)"
>{{ item }}
-
-
-
- {{ item.name }}
- {{ item.content }}
-
-
-
+
+
+ 中国建筑钢筋样板工程
+ 中国建筑深基坑挖掘沉降观测工程
+ 中国建筑混凝土强度检测工程
+
+
+
+
+
@@ -57,22 +72,19 @@ export default {
box-sizing: border-box;
display: flex;
flex-direction: column;
-
padding-top: 10px;
width: 100%;
height: 100%;
.top {
display: flex;
-
- margin-bottom: 10px;
+ margin: 5px 0px 20px 15px;
width: 100%;
height: 27px;
.top-item {
display: grid;
place-items: center;
-
width: 64px;
height: 100%;
margin-right: 5px;
@@ -83,70 +95,30 @@ export default {
}
}
}
-
- .bottom.list {
- width: 100%;
- height: calc(100% - 27px);
-
- display: flex;
- flex-direction: column;
- color: #fff;
-
- .list-item {
+ .swiper{
+ .swiper1{
+ height: 80%;
+ width: 96%;
position: relative;
- display: flex;
- box-sizing: border-box;
- border-left: 4px solid #66d3d8;
- margin-bottom: 5px;
- padding: 7px 0;
- width: 100%;
- background-image: linear-gradient(to right, #3b7589, #182337);
- font-size: 14px;
- font-weight: 500;
- cursor: pointer;
- transition: all 0.3s;
- white-space: nowrap;
-
- &:hover {
- padding: 20px 0;
- &::before {
- content: '';
- position: absolute;
- top: 50%;
- left: 8px;
- display: inline-block;
- transform: translate(0, -50%);
- width: 6.6px;
- height: 11.6px;
- background-image: url('../assets/images/command-center/triangle.png');
- background-size: 100% 100%;
- transition: all .3s;
- }
- }
-
- &:hover .value {
- color: #c2805f;
- }
-
- &:last-child {
- margin-bottom: 0;
- }
-
- .label,
- .value {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-
- .label {
- box-sizing: border-box;
+
+ p{
width: 100%;
- padding-left: 20px;
+ height: 25px;
+ line-height: 25px;
+ position: absolute;
+ background-color: rgba(0,0,0,0.55);
}
-
- .value {
- width: 60%;
+ ::v-deep .swiper-pagination-bullet-active{
+ background: #fff;
+ }
+ ::v-deep .swiper-button-prev:after{
+ color:#fff;
+ font-size: 5px;
+
+ }
+ ::v-deep .swiper-button-next:after{
+ color:#fff;
+ font-size: 5px;
}
}
}
diff --git a/src/views/projectAdmin/fourEngin/command/rightThree.vue b/src/views/projectAdmin/fourEngin/command/rightThree.vue
index dfda693e..3718e4bc 100644
--- a/src/views/projectAdmin/fourEngin/command/rightThree.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightThree.vue
@@ -1,38 +1,11 @@
-
+
-
-
-
-
![]()
-
-
-
{{ item.value }}
-
{{ item.unit }}
-
-
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
- {{ item.value }}
- {{ item.unit }}
-
-
-
+
+
{{item.time}}
+
+ {{item.value}}
+
@@ -44,44 +17,23 @@ export default {
components: { Card },
data() {
return {
- // 左边的列表
- leftList: {
- 'PM2.5': { label: 'PM2.5', value: 68, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm25.png') },
- 'PM10': { label: 'PM10', value: 36, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm10.png') },
- '噪音': { label: '噪音', value: 13, unit: '%dB', image: require('../assets/images/command-center/icon-noise.png') }
- },
- // 右边的列表
- rightList: {
- temperature: { label: '温度', value: 22, unit: '℃', image: require('../assets/images/command-center/icon-temperature.png') },
- humidity: { label: '湿度', value: 16, unit: 'RH', image: require('../assets/images/command-center/icon-humidity.png') },
- windSpeed: {
- label: '风速',
- value: 60,
- unit: 'km/h',
- image: require('../assets/images/command-center/icon-windSpeed.png'),
- color: '#f66629',
- valueBackgroundImage: require('../assets/images/command-center/block3.png')
+ list:[
+ {time:'10月14日 11:29',value:'2022年10月13日广州市新冠肺炎疫情情况-广州本地宝',
+ href:'http://gz.bendibao.com/news/20221014/content326288.shtml'
},
- windDirection: {
- label: '风向',
- value: '东南',
- unit: '风',
- image: require('../assets/images/command-center/icon-windDirection.png')
+ {time:'10月14日 09:14',value:'10月13日广州新增本土确诊25例和无症状3例(含12例无症状确诊)',
+ href:'http://gz.bendibao.com/news/20221014/content326265.shtml'
},
- barometricPressure: {
- label: '大气压',
- value: 101,
- unit: 'KPa',
- image: require('../assets/images/command-center/icon-barometricPressure.png')
- }
- }
+ // {time:'10月13日 11:32',value:'2022年10月12日广州市新冠肺炎疫情情况-广州本地宝',
+ // href:'http://gz.bendibao.com/news/20221013/content326216.shtml'
+ // },
+ ]
}
},
created() {
- this.getList()
+
},
methods: {
- getList() {},
}
}
@@ -89,92 +41,59 @@ export default {
diff --git a/src/views/projectAdmin/fourEngin/command/rightTwo.vue b/src/views/projectAdmin/fourEngin/command/rightTwo.vue
index 8c166700..3c5f5fef 100644
--- a/src/views/projectAdmin/fourEngin/command/rightTwo.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightTwo.vue
@@ -48,7 +48,14 @@ export default {
noRectificationNum: undefined, // 未整改数量
totalNum: undefined, // 总数量
},
- list: []
+ list: [
+ {dangerName:'防水'},
+ {dangerName:'门窗'},
+ {dangerName:'钢结构工程'},
+ {dangerName:'建筑装饰装修'},
+ {dangerName:'主体结构'},
+ {dangerName:'建筑电气'},
+ ]
}
},
created() {
@@ -84,7 +91,7 @@ export default {
getList() {
listQualityManagement({ projectSn: this.projectSn }).then(res => {
console.log('质量问题库: ', res);
- this.list = res.result;
+ // this.list = res.result;
})
},
/** 初始化chart */
@@ -92,26 +99,26 @@ export default {
const myChart = echarts.init(this.$refs.chart)
const option = {
- backgroundColor: '#182337',
+ backgroundColor: '#182337', //整个背景图色
tooltip: {
trigger: 'item'
},
title: {
text: '质量问题数',
- left: '48%',
+ left: '40%',
top: '55%',
textAlign: 'center',
textStyle: {
fontSize: '14',
color: '#8f929b',
- fontWeight: '400'
+ fontWeight: '400',
}
},
series: [
{
type: 'pie',
- radius: ['60%', '53%'],
- center: ['50%', '50%'],
+ radius: ['70%', '63%'],
+ center: ['40%', '50%'],
hoverAnimation: false,
label: {
normal: {
@@ -163,8 +170,8 @@ export default {
type: 'pie',
hoverAnimation: false,
legendHoverLink: false,
- radius: ['47%', '45%'],
- center: ['50%', '50%'],
+ radius: ['57%', '55%'],
+ center: ['40%', '50%'],
color: ['#182337', '#60d3d0'],
label: {
normal: {
@@ -210,7 +217,7 @@ export default {
height: 100%;
> .left {
- width: 50%;
+ width: 40%;
height: 100%;
}
diff --git a/yarn.lock b/yarn.lock
index 818d45b0..9bccfa7b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4192,6 +4192,13 @@
"resolved" "https://registry.npmmirror.com/dom-to-image/-/dom-to-image-2.6.0.tgz"
"version" "2.6.0"
+"dom7@^2.1.5":
+ "integrity" "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA=="
+ "resolved" "https://registry.npmmirror.com/dom7/-/dom7-2.1.5.tgz"
+ "version" "2.1.5"
+ dependencies:
+ "ssr-window" "^2.0.0"
+
"domain-browser@^1.1.1":
"integrity" "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
"resolved" "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz"
@@ -10000,6 +10007,11 @@
"safer-buffer" "^2.0.2"
"tweetnacl" "~0.14.0"
+"ssr-window@^2.0.0":
+ "integrity" "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
+ "resolved" "https://registry.npmmirror.com/ssr-window/-/ssr-window-2.0.0.tgz"
+ "version" "2.0.0"
+
"ssri@^6.0.1":
"integrity" "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="
"version" "6.0.1"
@@ -10394,6 +10406,14 @@
"unquote" "~1.1.1"
"util.promisify" "~1.0.0"
+"swiper@^5.2.0":
+ "integrity" "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA=="
+ "resolved" "https://registry.npmmirror.com/swiper/-/swiper-5.4.5.tgz"
+ "version" "5.4.5"
+ dependencies:
+ "dom7" "^2.1.5"
+ "ssr-window" "^2.0.0"
+
"tapable@^0.2.7":
"integrity" "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A=="
"resolved" "https://registry.npmmirror.com/tapable/-/tapable-0.2.9.tgz"
@@ -10965,6 +10985,11 @@
"resolved" "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz"
"version" "1.1.2"
+"vue-awesome-swiper@4.0":
+ "integrity" "sha512-yzp93S1DBucR16ouzKn7QBQojqGX6yHPEuVIioYp4U4Eyk0rxe0RRVQcUnZXi05bM5MwCvCKXtgaY31N5tTi7g=="
+ "resolved" "https://registry.npmmirror.com/vue-awesome-swiper/-/vue-awesome-swiper-4.0.4.tgz"
+ "version" "4.0.4"
+
"vue-cli-plugin-element@~1.0.1":
"integrity" "sha512-OJSOnJtn7f1v/8xX+MJae+RrE8WguhiiG9QTBx/MNOPXYsxqut6Ommo+ZD3raNc7eryhqdM2T/DlMfdvIKpCtw=="
"resolved" "https://registry.npmmirror.com/vue-cli-plugin-element/-/vue-cli-plugin-element-1.0.1.tgz"