diff --git a/package copy.json b/package copy.json index 9acfb21..557b8c9 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package copy.json b/package copy.json index 9acfb21..557b8c9 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 371b1cf..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package copy.json b/package copy.json index 9acfb21..557b8c9 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 371b1cf..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index b8650df..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package copy.json b/package copy.json index 9acfb21..557b8c9 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 371b1cf..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index b8650df..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/pieChart/simplePieChartCarousel.vue b/src/components/pieChart/simplePieChartCarousel.vue index 58b1a72..f5636bc 100644 --- a/src/components/pieChart/simplePieChartCarousel.vue +++ b/src/components/pieChart/simplePieChartCarousel.vue @@ -276,8 +276,8 @@ }, labelLine: { show: !this.isMouseOver && i === index, // 明确控制显示/隐藏 - length: 12, - length2: 15, + length: this.isMouseOver ? 0 : 12, + length2: this.isMouseOver ? 0 : 15, lineStyle: { // color: this.labelLineColor, // width: this.labelLineWidth @@ -310,11 +310,11 @@ show: true, // 启用tooltip trigger: 'item', formatter: '{b}
{c} ({d}%)', - backgroundColor: 'rgba(255,255,255,0.95)', + backgroundColor: 'rgba(36, 37, 51, .6)', textStyle: { - color: '#333' - }, - extraCssText: 'box-shadow: 0 0 10px rgba(0,0,0,0.15);' + color: '#fff' + } + // extraCssText: 'box-shadow: 0 0 10px rgba(0,0,0,0.15);' }, series: [{ ...this.option.series[0], diff --git a/package copy.json b/package copy.json index 9acfb21..557b8c9 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 371b1cf..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index b8650df..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/pieChart/simplePieChartCarousel.vue b/src/components/pieChart/simplePieChartCarousel.vue index 58b1a72..f5636bc 100644 --- a/src/components/pieChart/simplePieChartCarousel.vue +++ b/src/components/pieChart/simplePieChartCarousel.vue @@ -276,8 +276,8 @@ }, labelLine: { show: !this.isMouseOver && i === index, // 明确控制显示/隐藏 - length: 12, - length2: 15, + length: this.isMouseOver ? 0 : 12, + length2: this.isMouseOver ? 0 : 15, lineStyle: { // color: this.labelLineColor, // width: this.labelLineWidth @@ -310,11 +310,11 @@ show: true, // 启用tooltip trigger: 'item', formatter: '{b}
{c} ({d}%)', - backgroundColor: 'rgba(255,255,255,0.95)', + backgroundColor: 'rgba(36, 37, 51, .6)', textStyle: { - color: '#333' - }, - extraCssText: 'box-shadow: 0 0 10px rgba(0,0,0,0.15);' + color: '#fff' + } + // extraCssText: 'box-shadow: 0 0 10px rgba(0,0,0,0.15);' }, series: [{ ...this.option.series[0], diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index b3a7c7b..b96d440 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -2,7 +2,7 @@ jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api', // 运行监测的后台地址 baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api', // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 mockUrl: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/' // mock地址 diff --git a/package copy.json b/package copy.json index 9acfb21..557b8c9 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 371b1cf..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index b8650df..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/pieChart/simplePieChartCarousel.vue b/src/components/pieChart/simplePieChartCarousel.vue index 58b1a72..f5636bc 100644 --- a/src/components/pieChart/simplePieChartCarousel.vue +++ b/src/components/pieChart/simplePieChartCarousel.vue @@ -276,8 +276,8 @@ }, labelLine: { show: !this.isMouseOver && i === index, // 明确控制显示/隐藏 - length: 12, - length2: 15, + length: this.isMouseOver ? 0 : 12, + length2: this.isMouseOver ? 0 : 15, lineStyle: { // color: this.labelLineColor, // width: this.labelLineWidth @@ -310,11 +310,11 @@ show: true, // 启用tooltip trigger: 'item', formatter: '{b}
{c} ({d}%)', - backgroundColor: 'rgba(255,255,255,0.95)', + backgroundColor: 'rgba(36, 37, 51, .6)', textStyle: { - color: '#333' - }, - extraCssText: 'box-shadow: 0 0 10px rgba(0,0,0,0.15);' + color: '#fff' + } + // extraCssText: 'box-shadow: 0 0 10px rgba(0,0,0,0.15);' }, series: [{ ...this.option.series[0], diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index b3a7c7b..b96d440 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -2,7 +2,7 @@ jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api', // 运行监测的后台地址 baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api', // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 mockUrl: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/' // mock地址 diff --git a/src/views/industrialEconomy/components/assets/components/AssetsTotal.vue b/src/views/industrialEconomy/components/assets/components/AssetsTotal.vue index 0ede0a2..b08463a 100644 --- a/src/views/industrialEconomy/components/assets/components/AssetsTotal.vue +++ b/src/views/industrialEconomy/components/assets/components/AssetsTotal.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 9acfb21..557b8c9 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 371b1cf..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index b8650df..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "赣州蓉江新区智慧云脑", + "name": "big-data", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/pieChart/simplePieChartCarousel.vue b/src/components/pieChart/simplePieChartCarousel.vue index 58b1a72..f5636bc 100644 --- a/src/components/pieChart/simplePieChartCarousel.vue +++ b/src/components/pieChart/simplePieChartCarousel.vue @@ -276,8 +276,8 @@ }, labelLine: { show: !this.isMouseOver && i === index, // 明确控制显示/隐藏 - length: 12, - length2: 15, + length: this.isMouseOver ? 0 : 12, + length2: this.isMouseOver ? 0 : 15, lineStyle: { // color: this.labelLineColor, // width: this.labelLineWidth @@ -310,11 +310,11 @@ show: true, // 启用tooltip trigger: 'item', formatter: '{b}
{c} ({d}%)', - backgroundColor: 'rgba(255,255,255,0.95)', + backgroundColor: 'rgba(36, 37, 51, .6)', textStyle: { - color: '#333' - }, - extraCssText: 'box-shadow: 0 0 10px rgba(0,0,0,0.15);' + color: '#fff' + } + // extraCssText: 'box-shadow: 0 0 10px rgba(0,0,0,0.15);' }, series: [{ ...this.option.series[0], diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index b3a7c7b..b96d440 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -2,7 +2,7 @@ jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api', // 运行监测的后台地址 baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api', // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 mockUrl: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/' // mock地址 diff --git a/src/views/industrialEconomy/components/assets/components/AssetsTotal.vue b/src/views/industrialEconomy/components/assets/components/AssetsTotal.vue index 0ede0a2..b08463a 100644 --- a/src/views/industrialEconomy/components/assets/components/AssetsTotal.vue +++ b/src/views/industrialEconomy/components/assets/components/AssetsTotal.vue @@ -14,6 +14,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@ diff --git a/src/views/industrialEconomy/components/structure/components/structureCount.vue b/src/views/industrialEconomy/components/structure/components/structureCount.vue index 27829fa..2a2a34a 100644 --- a/src/views/industrialEconomy/components/structure/components/structureCount.vue +++ b/src/views/industrialEconomy/components/structure/components/structureCount.vue @@ -25,7 +25,7 @@