From e615aaa015907a97e77355ed251df4adc2d4299d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Apr 2021 22:29:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/clientManagement/clientManagement.vue | 107 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 40 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 2f1ee48..3933876 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -37,6 +37,9 @@
v-if="permission.clientManagement_delete"
@click="handleDelete">删 除
</el-button>
+ <span><!--图例 components-->
+ <Legend :datas="datalistLIU"></Legend>
+ </span>
</template>
@@ -193,13 +196,28 @@
import {getList, remove, update, add, getclient, getDeptLazyTree, getAll, updates} from "@/api/client/client";
import {mapGetters} from "vuex";
import axios from "axios";
+ import Legend from '../../components/liu-legend/Legend'
export default {
+ components:{
+ Legend,
+ },
created() {
//this.payWin();
},
data() {
return {
+ //legend-liu数据
+ datalistLIU:[
+ {
+ color: 'rgb(233, 39, 25)',
+ text: '掉线'
+ },
+ {
+ color: 'black',
+ text: '在线'
+ }
+ ],
form: {},
query: {},
showMap: false,
@@ -419,8 +437,9 @@
cascaderItem: ["city", "district"],
dicUrl: "/api/blade-system/region/select",
span: 6,
- className: "cityClass1",
+ className: "city1",
hide: true,
+ // width: 10,
addDisplay: true,
editDisplay: true,
viewDisplay: true,
@@ -441,7 +460,7 @@
dicUrl: "/api/blade-system/region/select?code={{key}}",
span: 3,
labelWidth: "0",
- className: "cityClass2",
+ className: "city2",
hide: true,
addDisplay: true,
editDisplay: true,
@@ -463,7 +482,7 @@
dicUrl: "/api/blade-system/region/select?code={{key}}",
span: 3,
labelWidth: "0",
- className: "cityClass3",
+ className: "city3",
hide: true,
addDisplay: true,
editDisplay: true,
@@ -826,7 +845,9 @@
};
</script>
-<style>
+<style lang="scss" scoped>
+$city-m-l: 10px;
+
.payWin {
overflow-y: auto;
height: 350px;
@@ -837,49 +858,55 @@
}
- /*页面样式*/
- .el-card__body .cityClass1 {
- width: 155px;
- padding-right: 0px !important;
- }
+ // /*页面样式*/ //丢弃 因为不起作用，样式在cs.vue中 city1,2,3 liuyg改
+ // .el-card__body .cityClass1 {
+ // width: 50px;
+ // padding-right: 0px !important;
+ // margin-left: $city-m-l;
+ // }
- .el-card__body .cityClass2 {
- width: 100px;
- padding-left: 0px !important;
- padding-right: 0px !important;
- }
+ // .el-card__body .cityClass2 {
+ // width: 50px;
+ // padding-left: 0px !important;
+ // padding-right: 0px !important;
+ // margin-left: $city-m-l;
+ // }
- .el-card__body .cityClass3 {
- width: 100px;
- padding-left: 0px !important;
- padding-right: 0px !important;
- }
+ // .el-card__body .cityClass3 {
+ // width: 50px;
+ // padding-left: 0px !important;
+ // padding-right: 0px !important;
+ // margin-left: $city-m-l;
+ // }
- /*新增窗体样式*/
- .el-dialog .cityClass1 {
- width: 220px;
- padding-right: 0px !important;
- }
+ // /*新增窗体样式*/
+ // .el-dialog .city1 {
+ // width: 155px;
+ // padding-right: 0px !important;
+ // margin-left: $city-m-l;
+ // }
- .el-dialog .cityClass2 {
- width: 110px;
- padding-left: 5px !important;
- padding-right: 5px !important;
- }
+ // .el-dialog .city2 {
+ // width: 100px;
+ // padding-left: 5px !important;
+ // padding-right: 5px !important;
+ // margin-left: $city-m-l;
+ // }
- .el-dialog .cityClass3 {
- width: 110px;
- padding-left: 0px !important;
- padding-right: 0px !important;
- }
+ // .el-dialog .city3 {
+ // width: 100px;
+ // padding-left: 0px !important;
+ // padding-right: 0px !important;
+ // margin-left: $city-m-l;
+ // }
- .cityClass2 div label {
- display: none;
- }
+ // .city2 div label {
+ // display: none;
+ // }
- .cityClass3 div label {
- display: none;
- }
+ // .city3 div label {
+ // display: none;
+ // }
.real-jf-dialog {
position: absolute !important;
--
Gitblit v1.9.3