diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 7465f368..57b7041c 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://139.9.66.234:8/';
diff --git a/src/views/projectAdmin/common/jChart/pie/JRingChart.vue b/src/views/projectAdmin/common/jChart/pie/JRingChart.vue
index 35432e35..85404b0b 100644
--- a/src/views/projectAdmin/common/jChart/pie/JRingChart.vue
+++ b/src/views/projectAdmin/common/jChart/pie/JRingChart.vue
@@ -20,7 +20,8 @@ export default {
text: '',
subTitle: '',
x: '48%',
- y: '36%'
+ y: '36%',
+ fontSize: 20
})
},
radius: {
@@ -31,24 +32,24 @@ export default {
mounted() {
this.createRingChart()
},
- watch:{
- data:{
- handler(newVal,oldVal){
- if(newVal != oldVal){
- this.createRingChart();
- }
- },
- deep:true,
- immediate:true,
+ watch: {
+ data: {
+ handler(newVal, oldVal) {
+ if (newVal != oldVal) {
+ this.createRingChart()
+ }
+ },
+ deep: true,
+ immediate: true
},
- title:{
- handler(newVal,oldVal){
- if(newVal != oldVal){
- this.createRingChart();
- }
- },
- deep:true,
- immediate:true,
+ title: {
+ handler(newVal, oldVal) {
+ if (newVal != oldVal) {
+ this.createRingChart()
+ }
+ },
+ deep: true,
+ immediate: true
}
},
methods: {
@@ -66,7 +67,7 @@ export default {
textAlign: 'center',
textStyle: {
color: 'rgba(255, 255, 255, 1)',
- fontSize: 20
+ fontSize: title.fontSize || 20
},
subtext: title.subTitle,
subtextStyle: {
diff --git a/src/views/projectAdmin/jlw/jChart/pie/JRingChart.vue b/src/views/projectAdmin/jlw/jChart/pie/JRingChart.vue
index 35432e35..b8c9a4b7 100644
--- a/src/views/projectAdmin/jlw/jChart/pie/JRingChart.vue
+++ b/src/views/projectAdmin/jlw/jChart/pie/JRingChart.vue
@@ -31,24 +31,24 @@ export default {
mounted() {
this.createRingChart()
},
- watch:{
- data:{
- handler(newVal,oldVal){
- if(newVal != oldVal){
- this.createRingChart();
- }
- },
- deep:true,
- immediate:true,
+ watch: {
+ data: {
+ handler(newVal, oldVal) {
+ if (newVal != oldVal) {
+ this.createRingChart()
+ }
+ },
+ deep: true,
+ immediate: true
},
- title:{
- handler(newVal,oldVal){
- if(newVal != oldVal){
- this.createRingChart();
- }
- },
- deep:true,
- immediate:true,
+ title: {
+ handler(newVal, oldVal) {
+ if (newVal != oldVal) {
+ this.createRingChart()
+ }
+ },
+ deep: true,
+ immediate: true
}
},
methods: {
diff --git a/src/views/projectAdmin/zjsj/security/leftTop.vue b/src/views/projectAdmin/zjsj/security/leftTop.vue
index 7e3bc781..654faa31 100644
--- a/src/views/projectAdmin/zjsj/security/leftTop.vue
+++ b/src/views/projectAdmin/zjsj/security/leftTop.vue
@@ -1,14 +1,133 @@
- 安全巡检
+
+
+
+
+
+
+
+ 已处理
+ 占比
+
+
+ 123456
+ 20%
+
+
+
+
+ 未处理
+ 占比
+
+
+ 123456
+ 20%
+
+
+
+
+
+
+
+
+
+ 已巡检
+ 占比
+
+
+ 123456
+ 20%
+
+
+
+
+ 未巡检
+ 占比
+
+
+ 123456
+ 20%
+
+
+
+
-
+