diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue index d6dcece..6031dcd 100644 --- a/src/layout/newyjLayout.vue +++ b/src/layout/newyjLayout.vue @@ -44,11 +44,7 @@ - 黄金糕 - 狮子头 - 螺蛳粉 - 双皮奶 - 蚵仔煎 + 退出登录 @@ -100,6 +96,20 @@ export default { getDrop(e) { this.avatarFlag = e; }, + //退出登录 + logout() { + this.$confirm("确定注销并退出系统吗?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$store.dispatch("LogOut").then(() => { + this.$router.replace("/toLogin").catch(() => {}); + }); + }) + .catch(() => {}); + }, }, }; @@ -192,6 +202,7 @@ export default { display: flex; flex-direction: row-reverse; align-items: center; + padding-right: 20px; .avatar { height: 25px; width: 25px; @@ -216,6 +227,5 @@ export default { align-items: center; cursor: pointer; user-select: none; - margin-right: 20px; } \ No newline at end of file diff --git a/src/views/yingji/echarts/completePlan.vue b/src/views/yingji/echarts/completePlan.vue index 7915270..1a92b8c 100644 --- a/src/views/yingji/echarts/completePlan.vue +++ b/src/views/yingji/echarts/completePlan.vue @@ -27,7 +27,7 @@ export default { top: 20, }, tooltip: { - // show: false, + // show: false, trigger: "axis", textStyle: { align: "left", @@ -65,6 +65,7 @@ export default { { type: "category", data: [ + "高新区", "工业园区", "相城区", "姑苏区", @@ -97,7 +98,7 @@ export default { }, { type: "category", - data: [63, 115, 167, 210, 225, 245, 283, 300, 321, 1000], + data: [33, 63, 115, 167, 210, 225, 245, 283, 300, 321, 1000], axisLabel: { formatter: function (value, index) { return `{a|${value}}{b|家}`; @@ -130,7 +131,7 @@ export default { label: { show: false, //是否显示标签 }, - data: [63, 115, 167, 210, 225, 245, 283, 300, 321, 1000], + data: [63, 115, 167, 210, 225, 245, 283, 300, 321,678, 1000], barWidth: 12, itemStyle: { color: { @@ -158,14 +159,14 @@ export default { type: "bar", barWidth: 12, barGap: "-100%", - data: [1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000], + data: [1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,1000], itemStyle: { normal: { color: "#EDF0F2", }, }, - emphasis:{ - disabled:true, + emphasis: { + disabled: true, }, tooltip: { show: false, @@ -183,6 +184,6 @@ export default { #main1 { height: 100%; width: 100%; - border-radius:10px ; + border-radius: 10px; } \ No newline at end of file diff --git a/src/views/yingji/echarts/finishRate.vue b/src/views/yingji/echarts/finishRate.vue index 826ab60..bc3ded7 100644 --- a/src/views/yingji/echarts/finishRate.vue +++ b/src/views/yingji/echarts/finishRate.vue @@ -42,10 +42,10 @@ export default { trigger: "item", }, legend: { - width: "40%", - height: "80%", + width: "45%", top: "25%", right: "10%", + orient: "horizontal", itemGap: 25, itemWidth: 10, itemHeight: 10, @@ -57,13 +57,15 @@ export default { rich: { a: { color: "#525966", - width: 35, + width: 40, padding: [0, 10, 0, 5], }, b: { color: "#495B7D", - padding: [0, 5, 0, 10], + fontWeight: "bold", + padding: [0, 0, 0, 10], }, + }, }, //将waiyuan的数据拿过来,就会只显示该外圆的数据 diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue index c080bd7..7e7ee12 100644 --- a/src/views/yingji/home.vue +++ b/src/views/yingji/home.vue @@ -29,8 +29,8 @@