diff --git a/src/App.vue b/src/App.vue
index efc5e6413f5c0d71529598109670b4b4311c6e15..6e16045cfef8d4d127dcf0135abadeda3d1dd74e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,7 @@ import bdMenu from "./components/menu";
export default {
data: () => ({}),
components: {
- bdMenu,
+ bdMenu
},
methods: {
getCurrentUser() {
@@ -20,15 +20,18 @@ export default {
console.log(data.data);
console.log("--- --- ---");
this.$store.commit("userInfofun", data.data);
+ if (data.data.is_admin == 1 || data.data.is_admin == 2) {
+ this.$router.push({ name: "workPlace" });
+ }
} else {
console.log(data.errMsg);
}
});
- },
+ }
},
created() {
this.getCurrentUser();
- },
+ }
};
diff --git a/src/components/e-charts/bar-chart.vue b/src/components/e-charts/bar-chart.vue
index 1bc083d1b85c0f8361c9a6746cee64b6ebe36338..6087dd6b3890094a5da14802b94387daef7e83cb 100644
--- a/src/components/e-charts/bar-chart.vue
+++ b/src/components/e-charts/bar-chart.vue
@@ -16,8 +16,8 @@ export default {
}
},
bar_width: {
- type: String,
- default: "12px"
+ type: Number,
+ default: 12
},
colors: {
type: Array,
diff --git a/src/components/e-charts/dashboard.vue b/src/components/e-charts/dashboard.vue
index 9fb89226d33a587b363725259cd0f1df61b5ed76..53690c72d575edffe06f39973e835a74817a59e8 100644
--- a/src/components/e-charts/dashboard.vue
+++ b/src/components/e-charts/dashboard.vue
@@ -100,9 +100,9 @@ export default {
self.data.data > 75
? "#00beb2" //green
: self.data.data > 50
- ? "#ff7200" //yellow
+ ? "#38aef9" //blue
: self.data.data > 25
- ? "#da4251" //red
+ ? "#ff7200" //yellow
: "#da4251" //red
}
}
@@ -167,9 +167,9 @@ export default {
: self.data.data > 75
? "#d5f7e8"
: self.data.data > 50
- ? "#ffd98f"
+ ? "#e5f4fe"
: self.data.data > 25
- ? "#f7f1d5"
+ ? "#ffd98f"
: "#f7f1d5"
},
{
@@ -186,9 +186,9 @@ export default {
: self.data.data > 75
? "#00beb2" //green
: self.data.data > 50
- ? "#ff7200" //yellow
+ ? "#38aef9" //blue
: self.data.data > 25
- ? "#da4251" //red
+ ? "#ff7200" //yellow
: "#da4251" //red
}
])
diff --git a/src/components/e-charts/water-polo.vue b/src/components/e-charts/water-polo.vue
index 6d03beeea59fb448e232ffc27049819ba96795c3..60442ff1ff33e77f0673995a6df76b7096c34874 100644
--- a/src/components/e-charts/water-polo.vue
+++ b/src/components/e-charts/water-polo.vue
@@ -56,12 +56,12 @@ export default {
}
],
radius: "50%",
- center: ["50%", "25%"],
+ center: ["50%", "20%"],
outline: {
- borderDistance: 5,
+ borderDistance: 2,
itemStyle: {
- borderWidth: 5,
- borderColor: "#e56600",
+ borderWidth: 3,
+ borderColor: "#274fee",
shadowBlur: 0
}
},
@@ -79,14 +79,14 @@ export default {
colorStops: [
{
offset: 1,
- color: ["#e6ebfe"] // 0% 处的颜色
+ color: ["#c9d3fc"]
},
{
offset: 0,
- color: ["#515fe7"] // 100% 处的颜色
+ color: ["#515fe7"]
}
],
- global: false // 缺省为 false
+ global: false
},
opacity: 1,
shadowBlur: 0
@@ -114,11 +114,11 @@ export default {
}
],
radius: "50%",
- center: ["50%", "75%"],
+ center: ["50%", "70%"],
outline: {
- borderDistance: 5,
+ borderDistance: 2,
itemStyle: {
- borderWidth: 5,
+ borderWidth: 3,
borderColor: "#e56600",
shadowBlur: 0
}
@@ -137,14 +137,14 @@ export default {
colorStops: [
{
offset: 1,
- color: ["#e6ebfe"] // 0% 处的颜色
+ color: ["#f9ddba"]
},
{
offset: 0,
- color: ["#515fe7"] // 100% 处的颜色
+ color: ["#ef9433"]
}
],
- global: false // 缺省为 false
+ global: false
},
opacity: 1,
shadowBlur: 0
diff --git a/src/components/order-list/order-list-com.vue b/src/components/order-list/order-list-com.vue
index f26ff3f5bbc2a53636b7283e30fb9ae521436ee8..f3637c14382f4ee14d1ad721d790c422fde5ce88 100644
--- a/src/components/order-list/order-list-com.vue
+++ b/src/components/order-list/order-list-com.vue
@@ -60,7 +60,7 @@
:disabled="pagination.page == 1"
>
第{{ pagination.page }}页 / 共{{
- Math.floor(pagination.total / pagination.rowsPerPage) + 1
+ Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
}}页
diff --git a/src/components/service-list/commodity-list.vue b/src/components/service-list/commodity-list.vue
index 1174eebe54bb4b6f1d6ea93c0cb6638736773213..a86ea53b03518d839d4b49ef688f268fbe50f4e7 100644
--- a/src/components/service-list/commodity-list.vue
+++ b/src/components/service-list/commodity-list.vue
@@ -47,7 +47,7 @@
:disabled="pagination.page == 1"
>
第{{ pagination.page }}页 / 共{{
- Math.floor(pagination.total / pagination.rowsPerPage) + 1
+ Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
}}页
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index 758732963b12bf9e5a3eb3b80910359624052607..793fbd7589670c6d0524727ca2aad569d8c81b35 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -236,7 +236,7 @@
:disabled="pagination.page == 1"
>
第{{ pagination.page }}页 / 共{{
- Math.floor(pagination.total / pagination.rowsPerPage) + 1
+ Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
}}页
diff --git a/src/pages/data-analysis/my-application.vue b/src/pages/data-analysis/my-application.vue
index 575a99f2b7ff3143b5dd0239d6ac4ccafc9df257..c8a099fe6b66d78fe22706e2aace72ef984dcc1d 100644
--- a/src/pages/data-analysis/my-application.vue
+++ b/src/pages/data-analysis/my-application.vue
@@ -16,29 +16,35 @@
![]()
月环比
-
- {{ Math.abs(overview.month_chain) }}
+
+ {{ Math.abs(overview.month_chain) }}%
![]()
周环比
- {{ Math.abs(overview.week_chain) }}
+ {{ Math.abs(overview.week_chain) }}%
![]()
日均被部署次数12432（次）
+
+ 日均被部署次数
+ 12432（次）
+
-
+
@@ -58,7 +64,7 @@
@@ -69,15 +75,25 @@
-
-
-
+
+
+
+
+
@@ -106,7 +122,7 @@
-
-
-
+
@@ -170,7 +182,7 @@
-
+
@@ -394,33 +406,33 @@ export default {
hotIndex: 1,
name: "地图视频融合应用1",
count: 666,
- increases: 1.28,
+ increases: 1.28
},
{
hotIndex: 2,
name: "地图视频融合应用2",
count: 666,
- increases: 0.03,
+ increases: 0.03
},
{
hotIndex: 3,
name: "地图视频融合应用3",
count: 666,
- increases: 0.58,
+ increases: 0.58
},
{
hotIndex: 4,
name: "地图视频融合应用4",
count: 666,
- increases: -0.28,
+ increases: -0.28
},
{
hotIndex: 5,
name: "地图视频融合应用5",
count: 666,
- increases: -0.58,
- },
- ], // 热门搜索 数据
+ increases: -0.58
+ }
+ ] // 热门搜索 数据
}),
mounted() {
this.hotSearchHeader = [
@@ -428,19 +440,19 @@ export default {
label: "排名",
type: "hot-index",
width: 100,
- align: "center",
+ align: "center"
},
{
label: "应用名称",
prop: "name",
type: "button",
- callback: this.detailHotSearch,
+ callback: this.detailHotSearch
},
{
label: "搜索次数",
prop: "count",
width: 100,
- align: "center",
+ align: "center"
},
{
label: "日涨幅",
@@ -448,9 +460,9 @@ export default {
width: 100,
sortType: "0", // 0：升序 1：降序
sortable: true,
- align: "center",
- },
- ]
+ align: "center"
+ }
+ ];
},
methods: {
detailHotSearch(item) {
@@ -512,7 +524,7 @@ export default {
justify-content: space-between;
}
.left_block {
- width: 70%;
+ width: 280px;
height: 100%;
padding: 10px 0 0 0;
}
@@ -537,8 +549,7 @@ export default {
.chain {
color: #58617a;
font-size: 14px;
- padding: 10px 0;
- text-align: center;
+ padding: 10px;
}
.chain_down {
background-color: #fbe8e8;
@@ -546,6 +557,7 @@ export default {
padding: 2px 4px;
font-size: 12px;
margin-left: 8px;
+ color: #e15260;
}
.chain_up {
background-color: #e7fdfc;
@@ -553,6 +565,7 @@ export default {
padding: 1px 4px;
font-size: 12px;
margin-left: 8px;
+ color: #25bdb1;
}
.chain_mid {
margin-right: 20px;
@@ -576,10 +589,14 @@ export default {
background-color: #f2f2f2;
}
.left_1_right {
- width: 30%;
+ width: 180px;
height: 100%;
display: inline-block;
}
+.water_polo {
+ width: 140px;
+ margin: 0 auto 20px;
+}
.default {
text-align: center;
}
@@ -625,7 +642,7 @@ export default {