Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
9ceadfaa by xiaomiao
Options

样式调整

1 parent 648adb08
Expand all
Inline Side-by-side
Showing 15 changed files with 237 additions and 233 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,42 +2,41 @@ ...@@ -2,42 +2,41 @@
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 },
10 data () {
11 return {
12 key: 0,
13 };
14 },
15 props: {
16 cdata: {
17 type: Array,
18 default: () => ([]),
19 }, 9 },
20 }, 10 data () {
21 watch: { 11 return {
22 cdata: { 12 key: 0,
23 handler (newData) { 13 };
14 },
15 props: {
16 cdata: {
17 type: Array,
18 default: () => ([]),
19 },
20 },
21 watch: {
22 cdata: {
23 handler (newData) {
24 24
25 this.options = { 25 this.options = {
26 color: [ 26 color: [
27 "#37a2da", 27 "#37a2da",
28 "#32c5e9", 28 "#32c5e9",
29 "#9fe6b8", 29 "#9fe6b8",
30 "#ffdb5c", 30 "#ffdb5c",
31 "#ff9f7f", 31 "#ff9f7f",
32 "#fb7293", 32 "#fb7293",
33 "#e7bcf3", 33 "#e7bcf3",
34 "#8378ea" 34 "#8378ea"
35 35
36 ], 36 ],
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,37 +58,39 @@ export default { ...@@ -56,37 +58,39 @@ 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 },
72 76
73 77
74 data: newData, 78 data: newData,
75 } 79 }
76 ], 80 ],
77 }; 81 };
78 this.key++; 82 this.key++;
83 },
84 immediate: true,
85 deep: true,
79 }, 86 },
80 immediate: true,
81 deep: true,
82 }, 87 },
83 }, 88 };
84 };
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 },
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
53 } 53 }
54 }, 54 },
55 mounted () { 55 mounted () {
56 console.log("this. permission_routes", this.permission_routes);
57 56
58 } 57 }
59 } 58 }
......
...@@ -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 // 新增
......
...@@ -114,7 +114,7 @@ export function js_strto_time (str_time) { ...@@ -114,7 +114,7 @@ export function js_strto_time (str_time) {
114 var date = new Date(str) // 构造一个日期型数据，值为传入的字符串 114 var date = new Date(str) // 构造一个日期型数据，值为传入的字符串
115 return date.getTime() 115 return date.getTime()
116 } 116 }
117 // 时间戳转日期 117 // 时间戳转日期
118 export function timestampToTime (timestamp) { 118 export function timestampToTime (timestamp) {
119 var date = new Date(timestamp)//时间戳为10位需*1000，时间戳为13位的话不需乘1000 119 var date = new Date(timestamp)//时间戳为10位需*1000，时间戳为13位的话不需乘1000
120 var Y = date.getFullYear() + '-' 120 var Y = date.getFullYear() + '-'
...@@ -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++) {
......
...@@ -47,204 +47,207 @@ ...@@ -47,204 +47,207 @@
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 {
57 // 开始日期限制 57 // 开始日期限制
58 pickerOptionsStart: { 58 pickerOptionsStart: {
59 disabledDate: (time) => { 59 disabledDate: (time) => {
60 if (this.form.endTime) { 60 if (this.form.endTime) {
61 return time.getTime() > new Date(this.form.endTime).getTime(); 61 return time.getTime() > new Date(this.form.endTime).getTime();
62 } 62 }
63 },
63 }, 64 },
64 }, 65 // 结束日期限制
65 // 结束日期限制 66 pickerOptionsEnd: {
66 pickerOptionsEnd: { 67 disabledDate: (time) => {
67 disabledDate: (time) => { 68 if (this.form.startTime) {
68 if (this.form.startTime) { 69 return time.getTime() < new Date(this.form.startTime).getTime();
69 return time.getTime() < new Date(this.form.startTime).getTime(); 70 }
70 } 71 },
71 }, 72 },
72 }, 73 // 搜索表单
73 // 搜索表单 74 valueTime: "",
74 valueTime: "", 75 // 搜索表单
75 // 搜索表单 76 form: {
76 form: { 77 startTime: getFirstDayOfSeason(),
77 startTime: getFirstDayOfSeason(), 78 endTime: timeFormat(new Date(), true),
78 endTime: timeFormat(new Date(), true), 79 qxdm: "",
79 qxdm: "", 80 },
80 }, 81 chartData: []
81 chartData: []
82 };
83 },
84 mounted () {
85 // 查询业务量
86 this.getProcessCounts();
87 },
88 computed: {
89 ...mapGetters(["dicData"]),
90 },
91 methods: {
92 endTimeChange (val) {
93 this.form.endTime = timeFormat(new Date(val), true)
94 },
95 async getProcessCounts () {
96 this.chartData = [];
97 let { result: res } = await efficient.getProcessCounts(
98 this.form.startTime,
99 this.form.endTime,
100 this.form.qxdm
101 );
102 //获取图表配置项需要的数据
103 this.chartData = res;
104 this.$nextTick(() => {
105 // 初始化图表
106 this.chartData.length && this.echartInit(this.chartData)
107 });
108
109 },
110 // 重置
111 resetForm () {
112 this.form = {
113 startTime: getFirstDayOfSeason(),
114 endTime: timeFormat(new Date(), true),
115 qxdm: ""
116 }; 82 };
83 },
84 mounted () {
85 // 查询业务量
117 this.getProcessCounts(); 86 this.getProcessCounts();
118 }, 87 },
119 //图表渲染 88 computed: {
120 echartInit (chartArr) { 89 ...mapGetters(["dicData"]),
121 // 基于准备好的dom，初始化echarts实例 90 },
122 let myChart = this.$echarts.init(document.getElementById("myChart")); 91 methods: {
123 // 绘制图表 92 endTimeChange (val) {
124 myChart.setOption({ 93 this.form.endTime = timeFormat(new Date(val), true)
125 color: ["#13E5FF"], 94 },
126 tooltip: { 95 async getProcessCounts () {
127 show: true, 96 this.chartData = [];
128 trigger: "axis", 97 let { result: res } = await efficient.getProcessCounts(
129 textStyle: { 98 this.form.startTime,
130 fontSize: 16, // 字体大小 99 this.form.endTime,
100 this.form.qxdm
101 );
102 //获取图表配置项需要的数据
103 this.chartData = res;
104 this.$nextTick(() => {
105 // 初始化图表
106 this.chartData.length && this.echartInit(this.chartData)
107 });
108
109 },
110 // 重置
111 resetForm () {
112 this.form = {
113 startTime: getFirstDayOfSeason(),
114 endTime: timeFormat(new Date(), true),
115 qxdm: ""
116 };
117 this.getProcessCounts();
118 },
119 //图表渲染
120 echartInit (chartArr) {
121 // 基于准备好的dom，初始化echarts实例
122 let myChart = this.$echarts.init(document.getElementById("myChart"));
123 // 绘制图表
124 myChart.setOption({
125 color: ["#13E5FF"],
126 tooltip: {
127 show: true,
128 trigger: "axis",
129 textStyle: {
130 fontSize: 16, // 字体大小
131 },
131 }, 132 },
132 }, 133 grid: {
133 grid: { 134 top: 120,
134 top: 120, 135 bottom: 100,
135 bottom: 100, 136 },
136 }, 137 label: {
137 xAxis: [ 138 color: 'inherit',
138 { 139 },
139 type: "category", 140 xAxis: [
140 data: chartArr.map(item => item.recTypeName), 141 {
141 axisLabel: { 142 type: "category",
142 interval: 0, 143 data: chartArr.map(item => item.recTypeName),
143 rotate: 40, 144 axisLabel: {
144 formatter: function (val) { 145 interval: 0,
145 let c = document.createElement("canvas"); 146 rotate: 40,
146 const ctx = c.getContext("2d"); 147 formatter: function (val) {
147 const arr = val.split(""); 148 let c = document.createElement("canvas");
148 arr 149 const ctx = c.getContext("2d");
149 .map((item) => ctx.measureText(item).width) 150 const arr = val.split("");
150 .reduce((pre, next, index) => { 151 arr
151 const nLen = pre + next; 152 .map((item) => ctx.measureText(item).width)
152 if (nLen > 60) { 153 .reduce((pre, next, index) => {
153 arr[index - 1] += "..."; 154 const nLen = pre + next;
154 return next; 155 if (nLen > 60) {
155 } else { 156 arr[index - 1] += "...";
156 return nLen; 157 return next;
157 } 158 } else {
159 return nLen;
160 }
161 });
162 c = null;
163 let ind = arr.findIndex((i) => {
164 return i.indexOf("...") > -1;
158 }); 165 });
159 c = null; 166 let newArr = ind > 0 ? arr.splice(0, ind + 1) : arr;
160 let ind = arr.findIndex((i) => { 167 return newArr.join("");
161 return i.indexOf("...") > -1; 168 },
162 }); 169 textStyle: {
163 let newArr = ind > 0 ? arr.splice(0, ind + 1) : arr; 170 show: true,
164 return newArr.join(""); 171 color: "#fff",
165 }, 172 fontSize: "16",
166 textStyle: { 173 },
167 show: true,
168 color: "#fff",
169 fontSize: "16",
170 }, 174 },
171 }, 175 },
172 }, 176 ],
173 ], 177 yAxis: [
174 yAxis: [ 178 {
175 { 179 type: "value",
176 type: "value", 180 name: "数量/个",
177 name: "数量/个", 181 nameTextStyle: {
178 nameTextStyle: {
179 color: "#fff",
180 fontSize: "16",
181 },
182 axisLabel: {
183 textStyle: {
184 show: true,
185 color: "#fff", 182 color: "#fff",
186 fontSize: "16", 183 fontSize: "16",
187 }, 184 },
185 axisLabel: {
186 textStyle: {
187 show: true,
188 color: "#fff",
189 fontSize: "16",
190 },
191 },
188 }, 192 },
189 }, 193 ],
190 ],
191 194
192 series: [ 195 series: [
193 { 196 {
194 type: "bar", 197 type: "bar",
195 //显示数值 198 //显示数值
196 itemStyle: { 199 itemStyle: {
197 normal: { 200 normal: {
198 label: { 201 label: {
199 show: true, //开启显示 202 show: true, //开启显示
200 position: "top", //在上方显示 203 position: "top", //在上方显示
204 },
201 }, 205 },
202 }, 206 },
207 barMaxWidth: '60',
208 data: chartArr.map(item => item.counts),
203 }, 209 },
204 barMaxWidth: '60', 210 ],
205 data: chartArr.map(item => item.counts), 211 });
206 }, 212 },
207 ],
208 });
209 }, 213 },
210 }, 214 };
211 };
212 </script> 215 </script>
213 <style scoped lang="scss"> 216 <style scoped lang="scss">
214 // @import "~@/styles/public.scss"; 217 // @import "~@/styles/public.scss";
218
219 .jktjDetail {
220 height: 100%;
221 display: flex;
222 flex-direction: column;
215 223
216 .jktjDetail { 224 .rows {
217 height: 100%; 225 margin-left: 100px;
218 display: flex; 226 }
219 flex-direction: column;
220 227
221 .rows { 228 .center {
222 margin-left: 100px; 229 line-height: 50vh;
223 } 230 text-align: center;
231 color: #b6b5b5;
232 }
224 233
225 .center { 234 .echarts-box {
226 line-height: 50vh; 235 display: flex;
227 text-align: center; 236 justify-content: center;
228 color: #b6b5b5 237 height: 500px;
229 }
230 238
231 .echarts-box { 239 .chart {
232 display: flex; 240 width: 100%;
233 justify-content: center; 241 height: 100%;
234 height: 500px; 242 }
243 }
235 244
236 .chart { 245 .form-clues-content {
237 width: 100%; 246 flex: 1;
238 height: 100%; 247 height: 100%;
239 } 248 }
240 } 249 }
241
242 .form-clues-content {
243 flex: 1;
244 height: 100%;
245 }
246 }
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 }
......