diff --git a/src/api/app.js b/src/api/app.js
index 95c827de..c191ce4d 100644
--- a/src/api/app.js
+++ b/src/api/app.js
@@ -20,7 +20,7 @@ export const getDeviceList = (query) => {
// app 警告分析
export const getWarningAnalysis = (query) => {
return request({
- url: '/app/index/warning-analysis',
+ url: '/app/tenant/index/warning-analysis',
method: 'get',
params: query
})
@@ -29,7 +29,7 @@ export const getWarningAnalysis = (query) => {
// 首页数据
export function homeCount(query) {
return request({
- url: '/app/index',
+ url: '/app/tenant/index',
method: 'get',
params: query
})
@@ -38,7 +38,7 @@ export function homeCount(query) {
// app 项目设备
export function appProjectDeviceList(query) {
return request({
- url: '/app/device/table',
+ url: '/app/tenant/device/table',
method: 'get',
params: query
})
@@ -47,7 +47,7 @@ export function appProjectDeviceList(query) {
// app 项目列表
export function appProjectList(query) {
return request({
- url: '/app/project/list',
+ url: '/app/tenant/project/list',
method: 'get',
params: query
})
@@ -56,7 +56,7 @@ export function appProjectList(query) {
// app 告警列表
export function appAlarmRecordList(query) {
return request({
- url: '/app/alarm/table',
+ url: '/app/tenant/alarm/table',
method: 'get',
params: query
})
@@ -65,7 +65,7 @@ export function appAlarmRecordList(query) {
// app 模型统计
export function appDeviceStatistics(query) {
return request({
- url: '/app/index/device-statistics',
+ url: '/app/tenant/index/device-statistics',
method: 'get',
params: query
})
diff --git a/src/api/system/home.js b/src/api/system/home.js
index 9f09dcb1..e96a8797 100644
--- a/src/api/system/home.js
+++ b/src/api/system/home.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 首页数据
export function homeCount(query) {
return request({
- url: '/app/index',
+ url: '/app/tenant/index',
method: 'get',
params: query
})
diff --git a/src/api/system/user.js b/src/api/system/user.js
index a519c37b..d6fa63d5 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -148,7 +148,7 @@ export function roleOptionselectList(tenantId) {
// 查询工单处理人列表
export function gdListUser(query) {
return request({
- url: '/app/maintenance/maintenance-user',
+ url: '/app/tenant/maintenance/maintenance-user',
method: 'get',
params: query
})
diff --git a/src/views/bigScreen/v2/profile/echartsPie.vue b/src/views/bigScreen/v2/profile/echartsPie.vue
index 3c6aee5d..b6ee887e 100644
--- a/src/views/bigScreen/v2/profile/echartsPie.vue
+++ b/src/views/bigScreen/v2/profile/echartsPie.vue
@@ -1,6 +1,6 @@
@@ -10,23 +10,23 @@ export default {
name: "echartsRadarWrap",
props: {
eId: {
- type: String
+ type: String,
},
styles: {
- type: String
+ type: String,
},
colorList: {
type: [Array, String],
- default: ""
+ default: "",
},
option: {
stype: Object,
- default: []
- }
+ default: [],
+ },
},
data() {
return {
- chart: null
+ chart: null,
};
},
created() {
@@ -49,8 +49,9 @@ export default {
const option = {
legend: {
top: "5",
- right: "60",
+ right: "10",
type: "scroll",
+ // itemWidth: 10, // legend 显示宽度
orient: "vertical",
pageIconColor: "#6495ed", //翻页下一页的三角按钮颜色
pageIconInactiveColor: "#aaa", //翻页(即翻页到头时)
@@ -58,9 +59,11 @@ export default {
pageButtonItemGap: 1, //翻页按钮的两个之间的间距
textStyle: {
color: "#fff",
- fontSize: 16
+ fontSize: 16,
+ },
+ formatter: function (name) {
+ return name.length > 7 ? name.substr(0, 7) + "..." : name;
},
-
},
toolbox: {
show: false,
@@ -68,8 +71,8 @@ export default {
mark: { show: true },
dataView: { show: true, readOnly: false },
restore: { show: true },
- saveAsImage: { show: true }
- }
+ saveAsImage: { show: true },
+ },
},
series: [
{
@@ -80,28 +83,28 @@ export default {
roseType: "area",
emphasis: {
label: {
- show: false
- }
+ show: false,
+ },
},
label: {
- show: false
+ show: false,
},
itemStyle: {
- borderRadius: 1
+ borderRadius: 1,
},
- data: this.option
- }
- ]
+ data: this.option,
+ },
+ ],
};
this.chart.setOption(option);
- }
+ },
},
watch: {
option(val, oldVal) {
this.chart = null;
this.drawLine();
- }
- }
+ },
+ },
};