样式调整
Showing
15 changed files
with
68 additions
and
53 deletions
... | @@ -68,7 +68,6 @@ | ... | @@ -68,7 +68,6 @@ |
68 | tooltip: { | 68 | tooltip: { |
69 | trigger: "axis", | 69 | trigger: "axis", |
70 | formatter: function (params) { | 70 | formatter: function (params) { |
71 | console.log("params222", params); | ||
72 | let html = ""; | 71 | let html = ""; |
73 | params.forEach((v) => { | 72 | params.forEach((v) => { |
74 | html += `<div style="color: #000;font-size: 14px;line-height: 24px background-color: #000000"> | 73 | html += `<div style="color: #000;font-size: 14px;line-height: 24px background-color: #000000"> | ... | ... |
... | @@ -34,7 +34,6 @@ | ... | @@ -34,7 +34,6 @@ |
34 | type: "shadow", | 34 | type: "shadow", |
35 | }, | 35 | }, |
36 | formatter: function (params) { | 36 | formatter: function (params) { |
37 | console.log("params222", params); | ||
38 | let html = ""; | 37 | let html = ""; |
39 | params.forEach((v) => { | 38 | params.forEach((v) => { |
40 | html += `<div style="color: #000;font-size: 14px;line-height: 24px background-color: #000000"> | 39 | html += `<div style="color: #000;font-size: 14px;line-height: 24px background-color: #000000"> |
... | @@ -101,7 +100,7 @@ | ... | @@ -101,7 +100,7 @@ |
101 | }, | 100 | }, |
102 | itemStyle: { | 101 | itemStyle: { |
103 | normal: { | 102 | normal: { |
104 | color: "#5fba7d", | 103 | color: "#12ba7d", |
105 | }, | 104 | }, |
106 | }, | 105 | }, |
107 | data: newData.barData, | 106 | data: newData.barData, | ... | ... |
... | @@ -2,8 +2,8 @@ | ... | @@ -2,8 +2,8 @@ |
2 | <Echart :options="options" id="centreLeft1Chart" :key="key" height="1.0417rem" width="80%"></Echart> | 2 | <Echart :options="options" id="centreLeft1Chart" :key="key" height="1.0417rem" width="80%"></Echart> |
3 | </template> | 3 | </template> |
4 | <script> | 4 | <script> |
5 | import Echart from "@/common/echart"; | 5 | import Echart from "@/common/echart"; |
6 | export default { | 6 | export default { |
7 | components: { | 7 | components: { |
8 | Echart, | 8 | Echart, |
9 | }, | 9 | }, |
... | @@ -37,7 +37,6 @@ export default { | ... | @@ -37,7 +37,6 @@ export default { |
37 | tooltip: { | 37 | tooltip: { |
38 | trigger: "item", | 38 | trigger: "item", |
39 | formatter: function (params) { | 39 | formatter: function (params) { |
40 | console.log("params11", params); | ||
41 | let html = ""; | 40 | let html = ""; |
42 | html += `<div style="font-size: 14px;line-height: 24px > | 41 | html += `<div style="font-size: 14px;line-height: 24px > |
43 | <span style="display:inline-block;"></span> | 42 | <span style="display:inline-block;"></span> |
... | @@ -49,6 +48,9 @@ export default { | ... | @@ -49,6 +48,9 @@ export default { |
49 | extraCssText: | 48 | extraCssText: |
50 | "background: #85a2eb; border-radius: 0;box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);color: #333;", | 49 | "background: #85a2eb; border-radius: 0;box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);color: #333;", |
51 | }, | 50 | }, |
51 | label: { | ||
52 | color: 'inherit', | ||
53 | }, | ||
52 | series: [ | 54 | series: [ |
53 | { | 55 | { |
54 | name: "Access From", | 56 | name: "Access From", |
... | @@ -56,16 +58,18 @@ export default { | ... | @@ -56,16 +58,18 @@ export default { |
56 | radius: '60%', | 58 | radius: '60%', |
57 | avoidLabelOverlap: true, | 59 | avoidLabelOverlap: true, |
58 | label: { | 60 | label: { |
61 | color: 'inherit', | ||
59 | formatter: (params) => { | 62 | formatter: (params) => { |
60 | return `${params.name}`; | 63 | return `${params.name}`; |
61 | }, | 64 | }, |
62 | position: "outer", | 65 | position: "outer", |
63 | alignTo: "edge", | 66 | alignTo: "edge", |
64 | margin: 10, | 67 | margin: 10, |
68 | |||
65 | normal: { | 69 | normal: { |
66 | show: true, | 70 | show: true, |
67 | textStyle: { | 71 | textStyle: { |
68 | fontSize: 12 | 72 | fontSize: 12, |
69 | } | 73 | } |
70 | }, | 74 | }, |
71 | }, | 75 | }, |
... | @@ -81,12 +85,12 @@ export default { | ... | @@ -81,12 +85,12 @@ export default { |
81 | deep: true, | 85 | deep: true, |
82 | }, | 86 | }, |
83 | }, | 87 | }, |
84 | }; | 88 | }; |
85 | </script> | 89 | </script> |
86 | 90 | ||
87 | <style lang="scss" scoped> | 91 | <style lang="scss" scoped> |
88 | #centreLeft1Chart { | 92 | #centreLeft1Chart { |
89 | margin-bottom: 0.0521rem; | 93 | margin-bottom: 0.0521rem; |
90 | margin-left: 0.3125rem; | 94 | margin-left: 0.3125rem; |
91 | } | 95 | } |
92 | </style> | 96 | </style> | ... | ... |
1 | <!-- | ||
2 | * @Author: xiaomiao 1158771342@qq.com | ||
3 | * @Date: 2023-03-09 15:24:53 | ||
4 | * @LastEditors: xiaomiao 1158771342@qq.com | ||
5 | * @LastEditTime: 2023-03-16 15:58:03 | ||
6 | * @FilePath: \上报\bdcjg-web\src\components\Echart\Rose\index.vue | ||
7 | * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||
8 | --> | ||
1 | <template> | 9 | <template> |
2 | <div> | 10 | <div> |
3 | <Chart :cdata="cdata" /> | 11 | <Chart :cdata="cdata" /> |
... | @@ -28,7 +36,7 @@ | ... | @@ -28,7 +36,7 @@ |
28 | methods: { | 36 | methods: { |
29 | async addhousetotal () { | 37 | async addhousetotal () { |
30 | if (this.cdata == 0) { | 38 | if (this.cdata == 0) { |
31 | this.getdata = []; | 39 | this.cdata = []; |
32 | try { | 40 | try { |
33 | let { result: res } = await work.addhousetotal(); | 41 | let { result: res } = await work.addhousetotal(); |
34 | res.map((item) => { | 42 | res.map((item) => { | ... | ... |
... | @@ -94,7 +94,6 @@ | ... | @@ -94,7 +94,6 @@ |
94 | }, | 94 | }, |
95 | onJsonSave () { | 95 | onJsonSave () { |
96 | const value = this.resultInfo | 96 | const value = this.resultInfo |
97 | console.log(this.resultInfo, 'resultInfo') | ||
98 | if (this.hasJsonFlag === false) { | 97 | if (this.hasJsonFlag === false) { |
99 | this.$message.error({ message: 'json格式验证失败', showClose: true }) | 98 | this.$message.error({ message: 'json格式验证失败', showClose: true }) |
100 | // alert("json验证失败") | 99 | // alert("json验证失败") |
... | @@ -112,7 +111,6 @@ | ... | @@ -112,7 +111,6 @@ |
112 | this.dialogVisible = true | 111 | this.dialogVisible = true |
113 | }, | 112 | }, |
114 | cancel () { | 113 | cancel () { |
115 | console.log(this.tmpResultInfo, 'tmpResultInfo') | ||
116 | this.resultInfo = this.tmpResultInfo | 114 | this.resultInfo = this.tmpResultInfo |
117 | this.dialogVisible = false | 115 | this.dialogVisible = false |
118 | }, | 116 | }, | ... | ... |
... | @@ -58,7 +58,7 @@ export const TableListMixin = { | ... | @@ -58,7 +58,7 @@ export const TableListMixin = { |
58 | } | 58 | } |
59 | }) | 59 | }) |
60 | .catch(error => { | 60 | .catch(error => { |
61 | console.log('errrrrrorrrrr', error) | 61 | console.log('error', error) |
62 | this.loading = false | 62 | this.loading = false |
63 | }) | 63 | }) |
64 | }, | 64 | }, |
... | @@ -83,7 +83,6 @@ export const TableListMixin = { | ... | @@ -83,7 +83,6 @@ export const TableListMixin = { |
83 | if (this.queryOptions !== '') { | 83 | if (this.queryOptions !== '') { |
84 | this.queryParam.queryOptions = JSON.stringify(this.queryOptions) | 84 | this.queryParam.queryOptions = JSON.stringify(this.queryOptions) |
85 | } | 85 | } |
86 | // console.log(this.$filterNullObj(this.queryParam), '查询条件') | ||
87 | return this.$filterNullObj(this.queryParam) | 86 | return this.$filterNullObj(this.queryParam) |
88 | }, | 87 | }, |
89 | // 新增 | 88 | // 新增 | ... | ... |
... | @@ -216,7 +216,6 @@ function addRangeBorder (range, ws) { | ... | @@ -216,7 +216,6 @@ function addRangeBorder (range, ws) { |
216 | range.forEach(item => { | 216 | range.forEach(item => { |
217 | let startColNumber = Number(item.s.r), endColNumber = Number(item.e.r); | 217 | let startColNumber = Number(item.s.r), endColNumber = Number(item.e.r); |
218 | let startRowNumber = Number(item.s.c), endRowNumber = Number(item.e.c); | 218 | let startRowNumber = Number(item.s.c), endRowNumber = Number(item.e.c); |
219 | console.log(startColNumber); | ||
220 | const test = ws[arr[startRowNumber] + (startColNumber + 1)]; | 219 | const test = ws[arr[startRowNumber] + (startColNumber + 1)]; |
221 | for (let col = startColNumber; col <= endColNumber; col++) { | 220 | for (let col = startColNumber; col <= endColNumber; col++) { |
222 | for (let row = startRowNumber; row <= endRowNumber; row++) { | 221 | for (let row = startRowNumber; row <= endRowNumber; row++) { | ... | ... |
... | @@ -39,10 +39,10 @@ | ... | @@ -39,10 +39,10 @@ |
39 | </div> | 39 | </div> |
40 | </template> | 40 | </template> |
41 | <script> | 41 | <script> |
42 | import { mapGetters } from "vuex"; | 42 | import { mapGetters } from "vuex"; |
43 | import efficient from "@/api/efficient"; | 43 | import efficient from "@/api/efficient"; |
44 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; | 44 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; |
45 | export default { | 45 | export default { |
46 | name: "jktj", | 46 | name: "jktj", |
47 | data () { | 47 | data () { |
48 | return { | 48 | return { |
... | @@ -133,6 +133,9 @@ export default { | ... | @@ -133,6 +133,9 @@ export default { |
133 | trigger: "item", | 133 | trigger: "item", |
134 | formatter: "{b} : {c}", | 134 | formatter: "{b} : {c}", |
135 | }, | 135 | }, |
136 | label: { | ||
137 | color: 'inherit', | ||
138 | }, | ||
136 | series: [ | 139 | series: [ |
137 | { | 140 | { |
138 | name: "各业务类型办理数量", | 141 | name: "各业务类型办理数量", |
... | @@ -259,6 +262,9 @@ export default { | ... | @@ -259,6 +262,9 @@ export default { |
259 | }, | 262 | }, |
260 | }, | 263 | }, |
261 | ], | 264 | ], |
265 | label: { | ||
266 | color: 'inherit', | ||
267 | }, | ||
262 | series: [ | 268 | series: [ |
263 | { | 269 | { |
264 | type: "bar", | 270 | type: "bar", |
... | @@ -268,6 +274,7 @@ export default { | ... | @@ -268,6 +274,7 @@ export default { |
268 | label: { | 274 | label: { |
269 | show: true, //开启显示 | 275 | show: true, //开启显示 |
270 | position: "top", //在上方显示 | 276 | position: "top", //在上方显示 |
277 | |||
271 | }, | 278 | }, |
272 | }, | 279 | }, |
273 | }, | 280 | }, |
... | @@ -283,6 +290,7 @@ export default { | ... | @@ -283,6 +290,7 @@ export default { |
283 | label: { | 290 | label: { |
284 | show: true, //开启显示 | 291 | show: true, //开启显示 |
285 | position: "top", //在上方显示 | 292 | position: "top", //在上方显示 |
293 | |||
286 | }, | 294 | }, |
287 | }, | 295 | }, |
288 | }, | 296 | }, |
... | @@ -298,6 +306,7 @@ export default { | ... | @@ -298,6 +306,7 @@ export default { |
298 | label: { | 306 | label: { |
299 | show: true, //开启显示 | 307 | show: true, //开启显示 |
300 | position: "top", //在上方显示 | 308 | position: "top", //在上方显示 |
309 | |||
301 | }, | 310 | }, |
302 | }, | 311 | }, |
303 | }, | 312 | }, |
... | @@ -309,12 +318,12 @@ export default { | ... | @@ -309,12 +318,12 @@ export default { |
309 | }); | 318 | }); |
310 | }, | 319 | }, |
311 | }, | 320 | }, |
312 | }; | 321 | }; |
313 | </script> | 322 | </script> |
314 | <style scoped lang="scss"> | 323 | <style scoped lang="scss"> |
315 | // @import "~@/styles/public.scss"; | 324 | // @import "~@/styles/public.scss"; |
316 | 325 | ||
317 | .jktjDetail { | 326 | .jktjDetail { |
318 | height: 100%; | 327 | height: 100%; |
319 | display: flex; | 328 | display: flex; |
320 | flex-direction: column; | 329 | flex-direction: column; |
... | @@ -348,8 +357,8 @@ export default { | ... | @@ -348,8 +357,8 @@ export default { |
348 | height: 100%; | 357 | height: 100%; |
349 | color: #b6b5b5; | 358 | color: #b6b5b5; |
350 | } | 359 | } |
351 | } | 360 | } |
352 | </style> | 361 | </style> |
353 | <style scoped lang="scss"> | 362 | <style scoped lang="scss"> |
354 | // @import "~@/styles/public.scss"; | 363 | // @import "~@/styles/public.scss"; |
355 | </style> | 364 | </style> | ... | ... |
... | @@ -47,10 +47,10 @@ | ... | @@ -47,10 +47,10 @@ |
47 | </template> | 47 | </template> |
48 | 48 | ||
49 | <script> | 49 | <script> |
50 | import { mapGetters } from "vuex"; | 50 | import { mapGetters } from "vuex"; |
51 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; | 51 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; |
52 | import business from "@/api/business"; | 52 | import business from "@/api/business"; |
53 | export default { | 53 | export default { |
54 | name: "jktj", | 54 | name: "jktj", |
55 | data () { | 55 | data () { |
56 | return { | 56 | return { |
... | @@ -101,7 +101,6 @@ export default { | ... | @@ -101,7 +101,6 @@ export default { |
101 | this.form.qxdm | 101 | this.form.qxdm |
102 | ); | 102 | ); |
103 | this.chartData = res; | 103 | this.chartData = res; |
104 | console.log(this.chartData); | ||
105 | 104 | ||
106 | let maxData = Math.max.apply(Math, this.chartData.map(item => { return item.failure })) | 105 | let maxData = Math.max.apply(Math, this.chartData.map(item => { return item.failure })) |
107 | this.interval = Math.ceil(maxData / 10) | 106 | this.interval = Math.ceil(maxData / 10) |
... | @@ -150,6 +149,9 @@ export default { | ... | @@ -150,6 +149,9 @@ export default { |
150 | fontSize: "16", | 149 | fontSize: "16", |
151 | }, | 150 | }, |
152 | }, | 151 | }, |
152 | label: { | ||
153 | color: 'inherit', | ||
154 | }, | ||
153 | xAxis: [ | 155 | xAxis: [ |
154 | { | 156 | { |
155 | type: "category", | 157 | type: "category", |
... | @@ -281,12 +283,12 @@ export default { | ... | @@ -281,12 +283,12 @@ export default { |
281 | }); | 283 | }); |
282 | }, | 284 | }, |
283 | }, | 285 | }, |
284 | }; | 286 | }; |
285 | </script> | 287 | </script> |
286 | <style scoped lang="scss"> | 288 | <style scoped lang="scss"> |
287 | // @import "~@/styles/public.scss"; | 289 | // @import "~@/styles/public.scss"; |
288 | 290 | ||
289 | .jktjDetail { | 291 | .jktjDetail { |
290 | height: 100%; | 292 | height: 100%; |
291 | display: flex; | 293 | display: flex; |
292 | flex-direction: column; | 294 | flex-direction: column; |
... | @@ -298,7 +300,7 @@ export default { | ... | @@ -298,7 +300,7 @@ export default { |
298 | .center { | 300 | .center { |
299 | line-height: 50vh; | 301 | line-height: 50vh; |
300 | text-align: center; | 302 | text-align: center; |
301 | color: #b6b5b5 | 303 | color: #b6b5b5; |
302 | } | 304 | } |
303 | 305 | ||
304 | .echarts-box { | 306 | .echarts-box { |
... | @@ -316,8 +318,8 @@ export default { | ... | @@ -316,8 +318,8 @@ export default { |
316 | flex: 1; | 318 | flex: 1; |
317 | height: 100%; | 319 | height: 100%; |
318 | } | 320 | } |
319 | } | 321 | } |
320 | </style> | 322 | </style> |
321 | <style scoped lang="scss"> | 323 | <style scoped lang="scss"> |
322 | // @import "~@/styles/public.scss"; | 324 | // @import "~@/styles/public.scss"; |
323 | </style> | 325 | </style> | ... | ... |
... | @@ -47,10 +47,10 @@ | ... | @@ -47,10 +47,10 @@ |
47 | </template> | 47 | </template> |
48 | 48 | ||
49 | <script> | 49 | <script> |
50 | import { mapGetters } from "vuex"; | 50 | import { mapGetters } from "vuex"; |
51 | import efficient from "@/api/efficient"; | 51 | import efficient from "@/api/efficient"; |
52 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; | 52 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; |
53 | export default { | 53 | export default { |
54 | name: "jktj", | 54 | name: "jktj", |
55 | data () { | 55 | data () { |
56 | return { | 56 | return { |
... | @@ -134,6 +134,9 @@ export default { | ... | @@ -134,6 +134,9 @@ export default { |
134 | top: 120, | 134 | top: 120, |
135 | bottom: 100, | 135 | bottom: 100, |
136 | }, | 136 | }, |
137 | label: { | ||
138 | color: 'inherit', | ||
139 | }, | ||
137 | xAxis: [ | 140 | xAxis: [ |
138 | { | 141 | { |
139 | type: "category", | 142 | type: "category", |
... | @@ -208,12 +211,12 @@ export default { | ... | @@ -208,12 +211,12 @@ export default { |
208 | }); | 211 | }); |
209 | }, | 212 | }, |
210 | }, | 213 | }, |
211 | }; | 214 | }; |
212 | </script> | 215 | </script> |
213 | <style scoped lang="scss"> | 216 | <style scoped lang="scss"> |
214 | // @import "~@/styles/public.scss"; | 217 | // @import "~@/styles/public.scss"; |
215 | 218 | ||
216 | .jktjDetail { | 219 | .jktjDetail { |
217 | height: 100%; | 220 | height: 100%; |
218 | display: flex; | 221 | display: flex; |
219 | flex-direction: column; | 222 | flex-direction: column; |
... | @@ -225,7 +228,7 @@ export default { | ... | @@ -225,7 +228,7 @@ export default { |
225 | .center { | 228 | .center { |
226 | line-height: 50vh; | 229 | line-height: 50vh; |
227 | text-align: center; | 230 | text-align: center; |
228 | color: #b6b5b5 | 231 | color: #b6b5b5; |
229 | } | 232 | } |
230 | 233 | ||
231 | .echarts-box { | 234 | .echarts-box { |
... | @@ -243,8 +246,8 @@ export default { | ... | @@ -243,8 +246,8 @@ export default { |
243 | flex: 1; | 246 | flex: 1; |
244 | height: 100%; | 247 | height: 100%; |
245 | } | 248 | } |
246 | } | 249 | } |
247 | </style> | 250 | </style> |
248 | <style scoped lang="scss"> | 251 | <style scoped lang="scss"> |
249 | // @import "~@/styles/public.scss"; | 252 | // @import "~@/styles/public.scss"; |
250 | </style> | 253 | </style> | ... | ... |
... | @@ -59,11 +59,9 @@ | ... | @@ -59,11 +59,9 @@ |
59 | //根据子系统code获取子系统详细信息 | 59 | //根据子系统code获取子系统详细信息 |
60 | getAction(api.subsystem, params).then((res) => { | 60 | getAction(api.subsystem, params).then((res) => { |
61 | if (res.status === 1) { | 61 | if (res.status === 1) { |
62 | console.log(" res.contentJJJGGG", res.content); | ||
63 | this.productName = res.content[0].name; | 62 | this.productName = res.content[0].name; |
64 | this.$store.dispatch("products/setData", res.content[0].code); | 63 | this.$store.dispatch("products/setData", res.content[0].code); |
65 | sessionStorage.setItem("products", res.content[0].code) | 64 | sessionStorage.setItem("products", res.content[0].code) |
66 | console.log("jjjggg的product"); | ||
67 | } else { | 65 | } else { |
68 | this.$message.error({ message: res.message, showClose: true }); | 66 | this.$message.error({ message: res.message, showClose: true }); |
69 | } | 67 | } | ... | ... |
... | @@ -15,10 +15,10 @@ | ... | @@ -15,10 +15,10 @@ |
15 | </el-form-item> | 15 | </el-form-item> |
16 | <el-row class="mb-5"> | 16 | <el-row class="mb-5"> |
17 | <el-col :span="4" class="btnColRight"> | 17 | <el-col :span="4" class="btnColRight"> |
18 | <btn nativeType="cx" type="primary" @click="information"> | 18 | <btn nativeType="cx" @click="information"> |
19 | 基本信息 | 19 | 基本信息 |
20 | </btn> | 20 | </btn> |
21 | <btn nativeType="cz" @click="password"> | 21 | <btn nativeType="cx" @click="password"> |
22 | 修改密码 | 22 | 修改密码 |
23 | </btn> | 23 | </btn> |
24 | </el-col> | 24 | </el-col> | ... | ... |
... | @@ -168,7 +168,6 @@ | ... | @@ -168,7 +168,6 @@ |
168 | // 获取授权主体的菜单权限 | 168 | // 获取授权主体的菜单权限 |
169 | // getMenuAuthorityList | 169 | // getMenuAuthorityList |
170 | menulist (operationList, id, Code, menutablelistData, operationCodes) { | 170 | menulist (operationList, id, Code, menutablelistData, operationCodes) { |
171 | console.log("Code", Code); | ||
172 | this.selectedSubsystemCode = Code | 171 | this.selectedSubsystemCode = Code |
173 | this.menuList = menutablelistData; | 172 | this.menuList = menutablelistData; |
174 | getRoleAuthorityList( | 173 | getRoleAuthorityList( | ... | ... |
... | @@ -113,7 +113,6 @@ export default { | ... | @@ -113,7 +113,6 @@ export default { |
113 | this.form = Object.assign(this.form, this.formData) | 113 | this.form = Object.assign(this.form, this.formData) |
114 | let { result } = await sjsbTask.getTaskListByName(this.form) | 114 | let { result } = await sjsbTask.getTaskListByName(this.form) |
115 | this.tableData.data = result.list | 115 | this.tableData.data = result.list |
116 | console.log(this.tableData.data, 'fffffffffffffffffff') | ||
117 | } catch (error) { | 116 | } catch (error) { |
118 | this.message = error | 117 | this.message = error |
119 | } | 118 | } | ... | ... |
-
Please register or sign in to post a comment