Skip to content

A
apaas-ui
Commit 2c8aa1d3 authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

管理员权限页面控制有问题，调数据，修改样式等等等

parent e5bfc0ea
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 72 deletions
src/App.vue
View file @ 2c8aa1d3
......@@ -20,9 +20,6 @@ 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);
}
......
src/components/e-charts/graph.vue
View file @ 2c8aa1d3
......@@ -77,6 +77,12 @@ export default {
textStyle: {
fontSize: 12
}
},
splitLine: {
lineStyle: {
color: "#f2f2f2",
type: "solid"
}
}
}
],
......
src/components/e-charts/water-polo.vue
View file @ 2c8aa1d3
......@@ -6,14 +6,10 @@
import { graphic } from "echarts/lib/export";
export default {
props: {
data: {
type: Object,
datas: {
type: Array,
default: () => {
return {
xaxis: [],
data: [],
legend: []
};
return [];
}
}
},
......@@ -51,8 +47,8 @@ export default {
data: [
{
name: "A",
value: 0.67,
key: 77
value: self.datas[0] / 100,
key: self.datas[0]
}
],
radius: "50%",
......@@ -94,7 +90,7 @@ export default {
label: {
normal: {
formatter: function(param) {
return "63%";
return self.datas[0] + "%";
},
textStyle: {
color: "#000",
......@@ -109,8 +105,8 @@ export default {
data: [
{
name: "A",
value: 0.67,
key: 77
value: self.datas[1] / 100,
key: self.datas[1]
}
],
radius: "50%",
......@@ -152,7 +148,7 @@ export default {
label: {
normal: {
formatter: function(param) {
return "63%";
return self.datas[1] + "%";
},
textStyle: {
color: "#000",
......
src/components/service-list/commodity-list.vue
View file @ 2c8aa1d3
......@@ -47,7 +47,7 @@
:disabled="pagination.page == 1"
></el-button>
&nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
Math.ceil((total == 0 ? 1 : total) / pagination.rowsPerPage)
}}页
<el-button
icon="el-icon-arrow-right"
......@@ -56,7 +56,7 @@
@click="handleCurrentChange(1)"
:disabled="
pagination.page >=
Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
Math.ceil((total == 0 ? 1 : total) / pagination.rowsPerPage)
"
></el-button>
</div>
......@@ -74,7 +74,11 @@ export default {
"commodity-card": CommodityCard
},
props: {
datas: { type: Array, default: [] },
datas: { type: Array, default: () => {[]} },
total: {
type: Number,
default: 0
},
url: { type: String, default: "" },
paginationShow: {
type: Boolean,
......@@ -89,8 +93,7 @@ export default {
data: () => ({
pagination: {
rowsPerPage: 10,
page: 1,
total: 0
page: 1
},
pageOptions: [
{
......@@ -118,9 +121,6 @@ export default {
this.pagination.page += val;
this.$emit("refresh", this.pagination);
},
getTotal() {
this.pagination.total = this.datas.length;
},
pageResize() {
let listWidth = this.$refs.commodityCardIn.clientWidth;
let rowCardNum = Math.floor(listWidth / 310);
......@@ -136,7 +136,6 @@ export default {
watch: {
datas: {
handler(val) {
this.getTotal();
if (this.urlFilter == "app") {
setTimeout(() => {
this.pageResize();
......
src/components/service-list/service_list.vue
View file @ 2c8aa1d3
......@@ -129,6 +129,7 @@
<!-- the list -->
<commodity-list
:datas="lists && lists.length != 0 ? lists : []"
:total="total"
:url="url"
:urlFilter="urlFilter"
:paginationShow="true"
......@@ -188,6 +189,7 @@ export default {
],
activeBtn: 0,
lists: [],
total: 0,
filterLists: [
{
id: 110,
......@@ -305,6 +307,7 @@ export default {
this.$api.serviceShop.getAppList(query).then(response => {
if (response.data.success == "1") {
this.lists = response.data.data;
this.total = response.data.total;
} else {
console.log(response.data.errMsg);
}
......
src/pages/data-analysis/my-application.vue
View file @ 2c8aa1d3
......@@ -44,7 +44,7 @@
</div>
</div>
<div class="left_1_right">
<WaterPolo class="water_polo" />
<WaterPolo :datas="water_polo" class="water_polo" />
</div>
</div>
</block-radius>
......@@ -249,6 +249,7 @@ export default {
WaterPolo
},
data: () => ({
water_polo: [75, 25],
overview: {
month_chain: 14.5,
week_chain: -14.2
......@@ -275,12 +276,12 @@ export default {
},
sparkline1:{
arr:[1,2,3,4,8,9,10,21],
num:1231,
num:21,
up:15.3
},
sparkline2:{
arr:[1,2,3,4,8,9,10,21],
num:182,
num:18,
up:-19.3
},
single_data: {
......@@ -307,15 +308,15 @@ export default {
data: [
{
name: "开发者应用",
arr: [100, 120, 130, 150, 160, 120, 110, 100]
arr: [4, 3, 3, 3, 1, 3, 2, 3]
},
{
name: "平台应用",
arr: [120, 130, 140, 130, 140, 120, 100, 90]
arr: [2, 1, 1, 3, 2, 3, 4, 1]
},
{
name: "未上架",
arr: [80, 90, 100, 110, 100, 70, 80, 90]
arr: [1, 1, 0, 0, 0, 1, 2, 0]
}
]
},
......@@ -338,8 +339,11 @@ export default {
"教育科技",
"文化休闲",
"城市管理",
"机构团体",
"民生服务",
"其他",
],
data: [2, 0, 0, 1, 0, 2]
data: [1, 0, 0, 1, 0, 2, 0, 0, 0]
},
graph_arr: {
xaxis: [
......@@ -361,28 +365,28 @@ export default {
toplistData: [
{
name: "mapvideos",
value: 130,
value: 13,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "语音识别",
value: 121,
value: 12,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "轨迹绘制",
value: 98,
value: 9,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "postgresql",
value: 55,
value: 5,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
......@@ -465,7 +469,7 @@ export default {
{
hotIndex: 1,
name: "mapvideos",
count: 89,
count: 29,
increases: 0.28
},
{
......@@ -483,7 +487,7 @@ export default {
{
hotIndex: 4,
name: "postgresql",
count: 666,
count: 12,
increases: -0.05
},
] // 热门搜索 数据
......@@ -575,7 +579,7 @@ export default {
.left_1 {
height: 100%;
display: flex;
justify-content: space-between;
justify-content: space-around;
}
.left_block {
width: 280px;
......@@ -584,7 +588,7 @@ export default {
}
.left_1_l {
display: flex;
justify-content: space-between;
justify-content: space-around;
align-items: flex-end;
}
.left_1_title {
......@@ -603,7 +607,7 @@ export default {
.chain {
color: #58617a;
font-size: 14px;
padding: 10px;
padding: 10px 0 10px 10px;
}
.chain_down {
background-color: #fbe8e8;
......@@ -634,7 +638,7 @@ export default {
.left_1_msg {
display: inline-block;
width: 120px;
padding-bottom: 10px;
padding: 0 0 10px 10px;
}
.left_1_line {
width: 90%;
......@@ -643,12 +647,12 @@ export default {
background-color: #f2f2f2;
}
.left_1_right {
width: 180px;
width: 120px;
height: 100%;
display: inline-block;
}
.water_polo {
width: 140px;
width: 110px;
margin: 0 auto 20px;
}
.default {
......
src/pages/data-analysis/my-service.vue
View file @ 2c8aa1d3
......@@ -22,7 +22,7 @@
<div ref="left_1_l" class="left_1_l">
<img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" />
<div class="left_1_title">服务总数</div>
<div class="left_1_num">4</div>
<div class="left_1_num">8</div>
</div>
<dashboard ref="left_1_r" :data="das_data" :is_word="true" class="left_1_r"></dashboard>
</div>
......@@ -302,12 +302,12 @@ export default {
},
sparkline1: {
arr: [1, 2, 3, 4, 8, 9, 10, 21],
num: 1231,
num: 12,
up: 15.3
},
sparkline2: {
arr: [1, 2, 3, 4, 8, 9, 10, 21],
num: 182,
num: 6,
up: -19.3
},
text: "服务总数",
......@@ -380,56 +380,56 @@ export default {
toplistData: [
{
name: "报警服务",
value: 155,
value: 15,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "数据服务",
value: 130,
value: 13,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "消息队列服务",
value: 168,
value: 11,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "档案中心服务",
value: 77,
value: 7,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "按键中心服务",
value: 60,
value: 6,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "通用API服务",
value: 32,
value: 3,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "案件中心服务",
value: 15,
value: 1,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
},
{
name: "数据中心服务",
value: 3,
value: 1,
logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "次"
......@@ -440,7 +440,7 @@ export default {
commentlistData: [
{
add_time: "2020-07-14T16:35:40Z",
content: "1111111111111111",
content: "good!!! its good",
id: 36,
picture_path:
"/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob",
......@@ -450,7 +450,7 @@ export default {
},
{
add_time: "2020-07-14T16:35:40Z",
content: "222222222222",
content: "太好了",
id: 36,
picture_path:
"/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob",
......@@ -544,48 +544,48 @@ export default {
{
hotIndex: 1,
name: "数据服务",
count: 66,
count: 6,
increases: 0.28
},
{
hotIndex: 2,
name: "消息队列服务",
count: 54,
count: 5,
increases: 0.15
},
{
hotIndex: 3,
name: "按键中心服务",
count: 52,
count: 5,
increases: 0.03
},
{
hotIndex: 4,
name: "案件中心服务",
count: 37,
count: 3,
increases: -0.08
},
{
hotIndex: 5,
name: "数据中心服务",
count: 15,
count: 1,
increases: -0.18
}
], // 热门搜索 数据
graph_arr: {
xaxis: [
"01-01",
"01-02",
"01-03",
"01-04",
"01-05",
"01-06",
"01-07",
"01-08"
"07/09",
"07/10",
"07/11",
"07/12",
"07/13",
"07/14",
"07/15",
"07/16"
],
data: [
[1010, 120, 130, 520, 160, 1120, 110, 100],
[100, 1210, 130, 1530, 160, 120, 110, 1200]
[34, 30, 13, 52, 23, 80, 48, 52],
[24, 17, 12, 17, 23, 71, 18, 45],
],
legend: ["被调用次数", "调用次数"]
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment