e27e11dd by xiaomiao

样式调整

1 parent eb96e55d
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
3 </template> 3 </template>
4 4
5 <script> 5 <script>
6 import Chart from "./Chart"; 6 import Chart from "./Chart";
7 import work from "@/api/work"; 7 import work from "@/api/work";
8 export default { 8 export default {
9 data() { 9 data () {
10 return { 10 return {
11 cdata: { 11 cdata: {
12 category: [], 12 category: [],
...@@ -18,14 +18,14 @@ export default { ...@@ -18,14 +18,14 @@ export default {
18 components: { 18 components: {
19 Chart, 19 Chart,
20 }, 20 },
21 mounted() { 21 mounted () {
22 window.addEventListener("resize", () => { 22 window.addEventListener("resize", () => {
23 this.submitViews(); 23 this.submitViews();
24 }); 24 });
25 this.submitViews(); 25 this.submitViews();
26 }, 26 },
27 methods: { 27 methods: {
28 async submitViews() { 28 async submitViews () {
29 try { 29 try {
30 let { result: res } = await work.submitViews("A20"); 30 let { result: res } = await work.submitViews("A20");
31 this.cdata.category = []; 31 this.cdata.category = [];
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
43 } 43 }
44 }, 44 },
45 }, 45 },
46 }; 46 };
47 </script> 47 </script>
48 48
49 <style lang="scss" scoped></style> 49 <style lang="scss" scoped></style>
......
...@@ -7,15 +7,14 @@ ...@@ -7,15 +7,14 @@
7 ref="centreLeft2ChartRef" 7 ref="centreLeft2ChartRef"
8 width="100%" 8 width="100%"
9 height="100%" 9 height="100%"
10 :options="options" 10 :options="options"></Echart>
11 ></Echart>
12 </template> 11 </template>
13 12
14 <script> 13 <script>
15 import Echart from "@/common/echart"; 14 import Echart from "@/common/echart";
16 import { mapGetters } from "vuex"; 15 import { mapGetters } from "vuex";
17 export default { 16 export default {
18 data() { 17 data () {
19 return { 18 return {
20 options: {}, 19 options: {},
21 max: "100", //最大value值 20 max: "100", //最大value值
...@@ -27,14 +26,14 @@ export default { ...@@ -27,14 +26,14 @@ export default {
27 components: { 26 components: {
28 Echart, 27 Echart,
29 }, 28 },
30 created() {}, 29 created () { },
31 props: { 30 props: {
32 cdata: { 31 cdata: {
33 type: Array, 32 type: Array,
34 default: () => [], 33 default: () => [],
35 }, 34 },
36 }, 35 },
37 mounted() { 36 mounted () {
38 37
39 window.addEventListener("resize", () => { 38 window.addEventListener("resize", () => {
40 this.key++; 39 this.key++;
...@@ -43,7 +42,7 @@ export default { ...@@ -43,7 +42,7 @@ export default {
43 }, 42 },
44 watch: { 43 watch: {
45 cdata: { 44 cdata: {
46 handler(newData) { 45 handler (newData) {
47 let _this = this; 46 let _this = this;
48 // 设置点的位置(经纬度) 47 // 设置点的位置(经纬度)
49 const geoCoordMap = { 48 const geoCoordMap = {
...@@ -73,8 +72,7 @@ export default { ...@@ -73,8 +72,7 @@ export default {
73 }, 72 },
74 // 如果需要自定义 tooltip样式,需要使用formatter 73 // 如果需要自定义 tooltip样式,需要使用formatter
75 formatter: (params) => { 74 formatter: (params) => {
76 return `<div style="">${params.name}:${ 75 return `<div style="">${params.name}:${params.value + "个"
77 params.value + "个"
78 }</div>`; 76 }</div>`;
79 }, 77 },
80 }, 78 },
...@@ -164,24 +162,26 @@ export default { ...@@ -164,24 +162,26 @@ export default {
164 }, 162 },
165 computed: { 163 computed: {
166 ...mapGetters(["sidebar", "dicData"]), 164 ...mapGetters(["sidebar", "dicData"]),
167 logoName() { 165 logoName () {
168 return ( 166 return (
169 this.dicData["sysCode"] && 167 this.dicData["sysCode"] && this.dicData["sysCode"].filter((item) => { return item.DCODE == "areaMap" })
170 this.dicData["sysCode"].filter((item) => item.DCODE == "areaMap")
171 ); 168 );
172 }, 169 },
173 }, 170 },
174 methods: { 171 methods: {
175 // 根据行政区代码匹配行政区 172 // 根据行政区代码匹配行政区
176 getDistrictcode() { 173 getDistrictcode () {
177 console.log("this.logoName.DNAME", this.logoName.DNAME); 174 this.mapjson = ""
178 if ((this.logoName.DNAME = "map610700")) { 175 if ((this.logoName[0].DNAME == "hanzhong")) {
179 this.mapjson = "hanzhong"; 176 this.mapjson = "hanzhong";
180 require(`@/common/map/${this.mapjson}.js`); 177 require(`@/common/map/${this.mapjson}.js`);
178 } else {
179 this.mapjson = "yushu";
180 require(`@/common/map/${this.mapjson}.js`);
181 } 181 }
182 }, 182 },
183 // 开启定时器 183 // 开启定时器
184 startInterval() { 184 startInterval () {
185 const _self = this; 185 const _self = this;
186 // 应通过接口获取配置时间,暂时写死5s 186 // 应通过接口获取配置时间,暂时写死5s
187 const time = 2000; 187 const time = 2000;
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
193 }, time); 193 }, time);
194 }, 194 },
195 // 重新随机选中地图区域 195 // 重新随机选中地图区域
196 reSelectMapRandomArea() { 196 reSelectMapRandomArea () {
197 const length = 9; 197 const length = 9;
198 this.$nextTick(() => { 198 this.$nextTick(() => {
199 try { 199 try {
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
223 } 223 }
224 }); 224 });
225 }, 225 },
226 handleMapRandomSelect() { 226 handleMapRandomSelect () {
227 this.$nextTick(() => { 227 this.$nextTick(() => {
228 try { 228 try {
229 const map = this.$refs.centreLeft2ChartRef.chart; 229 const map = this.$refs.centreLeft2ChartRef.chart;
...@@ -258,6 +258,6 @@ export default { ...@@ -258,6 +258,6 @@ export default {
258 }); 258 });
259 }, 259 },
260 }, 260 },
261 }; 261 };
262 </script> 262 </script>
263 <style></style> 263 <style></style>
......
...@@ -506,3 +506,16 @@ tr:hover { ...@@ -506,3 +506,16 @@ tr:hover {
506 .el-select-dropdown__item:hover { 506 .el-select-dropdown__item:hover {
507 background-color: transparent !important; 507 background-color: transparent !important;
508 } 508 }
509
510 // 提示框
511 .el-message-box {
512 background-color: #031a46;
513 border: 1px solid #5f82c7;
514
515 .el-message-box__title{
516 color: white;
517 }
518 .el-message-box__content{
519 color: white;
520 }
521 }
......
...@@ -199,3 +199,4 @@ ...@@ -199,3 +199,4 @@
199 box-sizing: border-box; 199 box-sizing: border-box;
200 text-align: right; 200 text-align: right;
201 } 201 }
202
......
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
19 </template> 19 </template>
20 20
21 <script> 21 <script>
22 import columnarsmat from "@/components/Echart/Columnarsmat"; 22 import columnarsmat from "@/components/Echart/Columnarsmat";
23 import Rose from "@/components/Echart/Rose"; 23 import Rose from "@/components/Echart/Rose";
24 import work from "@/api/work"; 24 import work from "@/api/work";
25 export default { 25 export default {
26 data () { 26 data () {
27 return { 27 return {
28 config: { 28 config: {
...@@ -54,28 +54,28 @@ export default { ...@@ -54,28 +54,28 @@ export default {
54 } 54 }
55 } 55 }
56 } 56 }
57 } 57 }
58 </script> 58 </script>
59 <style lang="scss" scoped> 59 <style lang="scss" scoped>
60 /deep/.row-item:not(:last-child) { 60 /deep/.row-item:not(:last-child) {
61 margin-bottom: .026rem; 61 margin-bottom: 0.026rem;
62 } 62 }
63 63
64 .rightcard { 64 .rightcard {
65 width: 32%; 65 width: 32%;
66 display: flex; 66 display: flex;
67 height: calc(100vh - 114px); 67 height: calc(100vh - 114px);
68 flex-direction: column; 68 flex-direction: column;
69 69
70 .cardhead { 70 .cardhead {
71 font-size: .1042rem; 71 font-size: 0.1042rem;
72 font-weight: bold; 72 font-weight: bold;
73 color: #02D9FD; 73 color: #02d9fd;
74 text-align: center; 74 text-align: center;
75 position: absolute; 75 position: absolute;
76 left: 0; 76 left: 0;
77 right: 0; 77 right: 0;
78 top: .0625rem; 78 top: 0.0625rem;
79 text-align: center; 79 text-align: center;
80 } 80 }
81 81
...@@ -86,8 +86,8 @@ export default { ...@@ -86,8 +86,8 @@ export default {
86 overflow: hidden; 86 overflow: hidden;
87 87
88 .nodata { 88 .nodata {
89 font-size: .1042rem; 89 font-size: 0.1042rem;
90 color: #02D9FD; 90 color: #02d9fd;
91 font-weight: bold; 91 font-weight: bold;
92 margin: auto; 92 margin: auto;
93 margin-top: 120px; 93 margin-top: 120px;
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
95 } 95 }
96 96
97 .cardCon { 97 .cardCon {
98 padding: .0521rem .026rem; 98 padding: 0.0521rem 0.026rem;
99 position: relative; 99 position: relative;
100 text-align: center; 100 text-align: center;
101 width: 100%; 101 width: 100%;
...@@ -105,19 +105,24 @@ export default { ...@@ -105,19 +105,24 @@ export default {
105 height: 33%; 105 height: 33%;
106 background: url("~@/image/xjgyfwxx.png") no-repeat; 106 background: url("~@/image/xjgyfwxx.png") no-repeat;
107 background-size: 100% 100%; 107 background-size: 100% 100%;
108 108 /deep/.dv-scroll-board {
109 .header {
110 height: 0.1875rem;
111 align-items: center;
112 }
113 }
109 .board { 114 .board {
110 width: 90%; 115 width: 90%;
111 margin: 0 auto; 116 margin: 0 auto;
112 height: 1.1031rem; 117 height: 1.1031rem;
113 margin-top: .0521rem; 118 margin-top: 0.0521rem;
114 /deep/.header{ 119 /deep/.header {
115 font-size: .0738rem; 120 font-size: 0.0738rem;
116 } 121 }
117 /deep/.rows{ 122 /deep/.rows {
118 .ceil{ 123 .ceil {
119 font-size: .0738rem; 124 font-size: 0.0738rem;
120 color: #6BC1FC 125 color: #6bc1fc;
121 } 126 }
122 } 127 }
123 } 128 }
...@@ -127,7 +132,7 @@ export default { ...@@ -127,7 +132,7 @@ export default {
127 height: 33%; 132 height: 33%;
128 background: url("~@/image/djywl.png") no-repeat; 133 background: url("~@/image/djywl.png") no-repeat;
129 background-size: 100% 100%; 134 background-size: 100% 100%;
130 padding: .3825rem 0 0 0; 135 padding: 0.3825rem 0 0 0;
131 } 136 }
132 137
133 .card3 { 138 .card3 {
...@@ -138,12 +143,12 @@ export default { ...@@ -138,12 +143,12 @@ export default {
138 padding-bottom: 0; 143 padding-bottom: 0;
139 144
140 .cardhead { 145 .cardhead {
141 top: .0417rem; 146 top: 0.0417rem;
142 } 147 }
143 } 148 }
144 149
145 .cardhead { 150 .cardhead {
146 position: absolute; 151 position: absolute;
147 } 152 }
148 } 153 }
149 </style> 154 </style>
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
15 </div> 15 </div>
16 <div class="from-clues-content"> 16 <div class="from-clues-content">
17 <div class="contentbox"> 17 <div class="contentbox">
18 <base-set v-show="isshow" :userInfo="userData" /> 18 <base-set v-if="isshow" :userInfo="userData" />
19 <password-edit v-show="!isshow" :userInfo="userData" /> 19 <password-edit v-if="!isshow" :userInfo="userData" />
20 </div> 20 </div>
21 </div> 21 </div>
22 </div> 22 </div>
......
...@@ -176,4 +176,11 @@ ...@@ -176,4 +176,11 @@
176 top: 15px; 176 top: 15px;
177 right: 30px; 177 right: 30px;
178 } 178 }
179 /deep/.el-dialog__header {
180 text-align: center;
181 margin-bottom: 10px;
182 .el-dialog__title {
183 color: white;
184 }
185 }
179 </style> 186 </style>
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 { required: true, message: "请输入用户名", trigger: "blur" }, 114 { required: true, message: "请输入用户名", trigger: "blur" },
115 ], 115 ],
116 }, 116 },
117 title: "", 117 title: "修改",
118 visible: false, 118 visible: false,
119 showLoginName: false, 119 showLoginName: false,
120 sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }], 120 sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }],
...@@ -230,4 +230,14 @@ ...@@ -230,4 +230,14 @@
230 /deep/.el-form-item__label { 230 /deep/.el-form-item__label {
231 color: #fff; 231 color: #fff;
232 } 232 }
233 /deep/.el-dialog__body {
234 padding-top: 20px;
235 }
236 /deep/.el-dialog__header {
237 text-align: center;
238 margin-bottom: 10px;
239 .el-dialog__title {
240 color: white;
241 }
242 }
233 </style> 243 </style>
......
...@@ -316,4 +316,5 @@ ...@@ -316,4 +316,5 @@
316 .btnColRight { 316 .btnColRight {
317 margin-top: 20px; 317 margin-top: 20px;
318 } 318 }
319
319 </style> 320 </style>
......