Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
22344843 by xiaomiao
Options

合并

2 parents 9642781a 03dbaf2e
Inline Side-by-side
Showing 24 changed files with 231 additions and 205 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-27 13:25:25 4 * @LastEditTime: 2023-03-27 15:43:24
5 --> 5 -->
6 # 安装依赖 6 # 安装依赖
7 npm install 7 npm install
...@@ -22,3 +22,15 @@ npm install --registry=https://registry.npm.taobao.org ...@@ -22,3 +22,15 @@ npm install --registry=https://registry.npm.taobao.org
22 22
23 ## 项目换肤 23 ## 项目换肤
24 给html根标签设置一个data-theme属性，然后通过js切换data-theme的属性值，Scss根据此属性来判断使用对应主题变量 24 给html根标签设置一个data-theme属性，然后通过js切换data-theme的属性值，Scss根据此属性来判断使用对应主题变量
25
26 ## config说明
27
28 {
29 "TITLE": "汉中市数据上报系统",
30 "THEME": "sb",
31 "CODE": "BDCJGPT", {"BDCSBPT":上报: "BDCJGPT":监管}
32 "SERVERAPI": "/bdcsjsb",
33 "calcHeight": 200, {上报:160 监管:200}
34 "echartTextColor": "#FFFFFF", {上报:"#4A4A4A" 监管:"#FFFFFF"}
35 "MANAGEMENTAPI": "http://192.168.2.38:8090/management"
36 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,5 +3,7 @@ ...@@ -3,5 +3,7 @@
3 "THEME": "sb", 3 "THEME": "sb",
4 "CODE": "BDCJGPT", 4 "CODE": "BDCJGPT",
5 "SERVERAPI": "/bdcsjsb", 5 "SERVERAPI": "/bdcsjsb",
6 "calcHeight": 160,
7 "echartTextColor": "#4A4A4A",
6 "MANAGEMENTAPI": "http://192.168.2.38:8090/management" 8 "MANAGEMENTAPI": "http://192.168.2.38:8090/management"
7 } 9 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -139,11 +139,25 @@ export default { ...@@ -139,11 +139,25 @@ export default {
139 let _this = this 139 let _this = this
140 if (this.heightNum) { 140 if (this.heightNum) {
141 _this.$nextTick(() => { 141 _this.$nextTick(() => {
142 142 if (document.querySelector(".tags-view-container")) {
143 window.addEventListener('resize', () => {
144 if (_this.calcHeight == 230) {
145 _this.tableHeight = _this.calcHeightx(192)
146 } else {
147 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
148 }
149 });
150 if (_this.calcHeight == 230) {
151 _this.tableHeight = _this.calcHeightx(192)
152 } else {
153 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
154 }
155 } else {
143 window.addEventListener('resize', () => { 156 window.addEventListener('resize', () => {
144 _this.tableHeight = _this.calcHeightx(_this.calcHeight) 157 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
145 }); 158 });
146 _this.tableHeight = _this.calcHeightx(_this.calcHeight) 159 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
160 }
147 }) 161 })
148 } else { 162 } else {
149 _this.tableHeight = window.innerHeight - _this.heightNum 163 _this.tableHeight = window.innerHeight - _this.heightNum
...@@ -158,9 +172,15 @@ export default { ...@@ -158,9 +172,15 @@ export default {
158 calcHeightx (value, wappered = true) { 172 calcHeightx (value, wappered = true) {
159 //项目自定义的公共header部分的高度，可忽略 173 //项目自定义的公共header部分的高度，可忽略
160 let header = document.querySelector(".from-clues-header").offsetHeight; 174 let header = document.querySelector(".from-clues-header").offsetHeight;
175
161 //value为动态计算table界面高度时，减去的其他空白部分，需自行在调试找到临界值，剩下的就是table表格的高度（包含header+body部分） 176 //value为动态计算table界面高度时，减去的其他空白部分，需自行在调试找到临界值，剩下的就是table表格的高度（包含header+body部分）
162 value = value == undefined ? 100 : value; 177 value = value == undefined ? 100 : value;
163 let res = window.innerHeight - parseInt(header) - value; 178 if (document.querySelector(".tags-view-container")) {
179 let tagsView = document.querySelector(".tags-view-container").offsetHeight;
180 var res = window.innerHeight - parseInt(header) - value - parseInt(tagsView);
181 } else {
182 var res = window.innerHeight - parseInt(header) - value;
183 }
164 if (wappered) { 184 if (wappered) {
165 //通过原生方法，获取dom节点的高度------获取element-ui table表格body的元素 185 //通过原生方法，获取dom节点的高度------获取element-ui table表格body的元素
166 let wapper = window.document.getElementsByClassName('el-table__body-wrapper'); 186 let wapper = window.document.getElementsByClassName('el-table__body-wrapper');
......
...@@ -16,13 +16,3 @@ export default { ...@@ -16,13 +16,3 @@ export default {
16 } 16 }
17 } 17 }
18 </script> 18 </script>
...\ No newline at end of file ...\ No newline at end of file
19 <style lang="scss" scoped>
20 .hasTagsView {
21 .app-main {
22 overflow-x: auto;
23 box-sizing: border-box;
24 background-color: #EDF1F7;
25 box-sizing: border-box;
26 }
27 }
28 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-22 10:23:46 4 * @LastEditTime: 2023-03-28 10:12:27
5 --> 5 -->
6 <template> 6 <template>
7 <section>
8 <transition name="fade-transform" mode="out-in"> 7 <transition name="fade-transform" mode="out-in">
9 <router-view /> 8 <router-view />
10 </transition> 9 </transition>
11 </section>
12 </template> 10 </template>
13 <script> 11 <script>
14 export default { 12 export default {
......
...@@ -6,14 +6,12 @@ ...@@ -6,14 +6,12 @@
6 <h4>不动产登记上报系统</h4> 6 <h4>不动产登记上报系统</h4>
7 </div> 7 </div>
8 <div class="right-menu"> 8 <div class="right-menu">
9 <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
10 <div class="user"> 9 <div class="user">
11 {{ userName }} 10 {{ userName }}
12 <span @click="onCancel"> 11 <span @click="onCancel">
13 <i class="el-icon-switch-button"></i> 12 <i class="el-icon-switch-button"></i>
14 </span> 13 </span>
15 </div> 14 </div>
16 </el-dropdown>
17 </div> 15 </div>
18 </div> 16 </div>
19 </div> 17 </div>
......
...@@ -194,12 +194,12 @@ export default { ...@@ -194,12 +194,12 @@ export default {
194 @import "~@/styles/_handle.scss"; 194 @import "~@/styles/_handle.scss";
195 195
196 .tags-view-container { 196 .tags-view-container {
197 height: 40px; 197 height: 50px;
198 width: 100%; 198 width: 100%;
199 background: #fff; 199 background: #fff;
200 border-bottom: 1px solid #d8dce5; 200 border-bottom: 1px solid #d8dce5;
201 box-sizing: border-box; 201 box-sizing: border-box;
202 padding-top: 2px; 202 padding-top: 7px;
203 margin-bottom: 7px; 203 margin-bottom: 7px;
204 border-radius: 4px; 204 border-radius: 4px;
205 205
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-23 09:21:00 4 * @LastEditTime: 2023-03-28 10:14:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="app-wrapper"> 7 <div class="app-wrapper">
8 <navbar /> 8 <navbar />
9 <div class="main-container"> 9 <div class="main-container">
10 <sidebar class="sidebar-container" /> 10 <sidebar class="sidebar-container" />
11 <div class="app-main"> 11 <div class="app-content">
12 <tags-view v-if="needTagsView" /> 12 <tags-view v-if="needTagsView" />
13 <app-main /> 13 <app-main />
14 </div> 14 </div>
...@@ -40,17 +40,6 @@ export default { ...@@ -40,17 +40,6 @@ export default {
40 } 40 }
41 } 41 }
42 </script> 42 </script>
43 <style lang="scss" scoped>
44 .app-main {
45 height: calc(100vh - 74px);
46 overflow-x: hidden;
47 box-sizing: border-box;
48 flex: 1;
49 width: 100%;
50 background: #EAEBF0;
51 padding: 10px;
52 }
53 </style>
54 <style lang="scss"> 43 <style lang="scss">
55 @import "~@/styles/mixin.scss"; 44 @import "~@/styles/mixin.scss";
56 @import "~@/styles/sbSidebar.scss"; 45 @import "~@/styles/sbSidebar.scss";
...@@ -83,4 +72,13 @@ export default { ...@@ -83,4 +72,13 @@ export default {
83 width: 100%; 72 width: 100%;
84 transition: width 0.28s; 73 transition: width 0.28s;
85 } 74 }
75
76 .app-content {
77 overflow-x: hidden;
78 box-sizing: border-box;
79 flex: 1;
80 width: 100%;
81 background: #EAEBF0;
82 padding: 10px;
83 }
86 </style> 84 </style>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-01-16 09:10:12 3 * @Date: 2023-01-16 09:10:12
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-23 15:15:02 5 * @LastEditTime: 2023-03-27 16:54:34
6 * @FilePath: \bdcjg-web\src\main.js 6 * @FilePath: \bdcjg-web\src\main.js
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -19,7 +19,6 @@ import mixin from '@/utils/mixin/theme.js' ...@@ -19,7 +19,6 @@ import mixin from '@/utils/mixin/theme.js'
19 import axios from 'axios' 19 import axios from 'axios'
20 import dataV from '@jiaminghi/data-view'; 20 import dataV from '@jiaminghi/data-view';
21 import * as echarts from "echarts" 21 import * as echarts from "echarts"
22
23 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading' 22 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
24 Vue.mixin(mixin) 23 Vue.mixin(mixin)
25 import './directive/vxe-table' 24 import './directive/vxe-table'
...@@ -68,4 +67,5 @@ axios.get("./config.json") ...@@ -68,4 +67,5 @@ axios.get("./config.json")
68 store, 67 store,
69 render: h => h(App) 68 render: h => h(App)
70 }) 69 })
70 window.document.documentElement.setAttribute("data-theme", 'blue');
71 }) 71 })
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -20,7 +20,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -20,7 +20,7 @@ router.beforeEach(async (to, from, next) => {
20 localStorage.removeItem("token"); 20 localStorage.removeItem("token");
21 next(); 21 next();
22 } else { 22 } else {
23 window.document.documentElement.setAttribute("data-theme", 'blue'); 23
24 let code = Vue.prototype.BASE_API.CODE 24 let code = Vue.prototype.BASE_API.CODE
25 //判断token是否存在 25 //判断token是否存在
26 const hasToken = localStorage.getItem("token"); 26 const hasToken = localStorage.getItem("token");
......
...@@ -190,6 +190,27 @@ ...@@ -190,6 +190,27 @@
190 } 190 }
191 } 191 }
192 192
193 .echarts-box {
194 display: flex;
195 justify-content: center;
196 height: calc(100vh - 260px);
197 }
198
199 .complex-header {
200 .el-table--border th.el-table__cell {
201 border-bottom: 1px solid #458ACF !important;
202 }
203
204 .el-table--border .el-table__cell {
205 border-right: 1px solid #458ACF !important;
206 }
207
208 .el-table--group,
209 .el-table--border {
210 border: 1px solid #458ACF !important;
211 }
212 }
213
193 .el-pagination.is-background .btn-prev, 214 .el-pagination.is-background .btn-prev,
194 .el-pagination.is-background .btn-next { 215 .el-pagination.is-background .btn-next {
195 @extend .bgc; 216 @extend .bgc;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 9
10 10
11 .from-clues { 11 .from-clues {
12 height: 100%; 12 // height: 100%;
13 width: 100%; 13 width: 100%;
14 min-width: 1280px; 14 min-width: 1280px;
15 box-sizing: border-box; 15 box-sizing: border-box;
...@@ -17,9 +17,8 @@ ...@@ -17,9 +17,8 @@
17 17
18 &-header { 18 &-header {
19 width: 100%; 19 width: 100%;
20 padding: 7px 15px 10px 15px; 20 padding: 7px 15px 15px 15px;
21 box-sizing: border-box; 21 box-sizing: border-box;
22 background-size: 100% 100%;
23 background: #FFFFFF; 22 background: #FFFFFF;
24 border-radius: 4px; 23 border-radius: 4px;
25 } 24 }
...@@ -30,7 +29,6 @@ ...@@ -30,7 +29,6 @@
30 margin-top: 10px; 29 margin-top: 10px;
31 background: #FFFFFF; 30 background: #FFFFFF;
32 border-radius: 4px; 31 border-radius: 4px;
33 background-size: 100% 100%;
34 padding: 15px; 32 padding: 15px;
35 } 33 }
36 34
...@@ -57,6 +55,12 @@ ...@@ -57,6 +55,12 @@
57 } 55 }
58 } 56 }
59 57
58 .echarts-box {
59 display: flex;
60 justify-content: center;
61 height: calc(100vh - 230px);
62 }
63
60 /* --------------进度条美化---------------- */ 64 /* --------------进度条美化---------------- */
61 ::-webkit-scrollbar { 65 ::-webkit-scrollbar {
62 width: 7px; 66 width: 7px;
...@@ -169,7 +173,6 @@ ...@@ -169,7 +173,6 @@
169 width: 2px; 173 width: 2px;
170 position: relative; 174 position: relative;
171 left: 10px; 175 left: 10px;
172 color: #FFFFFF;
173 } 176 }
174 177
175 .el-breadcrumb__inner { 178 .el-breadcrumb__inner {
......
1 <template> 1 <template>
2 <!-- 监控日志 --> 2 <!-- 监控日志 -->
3 <div class="jktjDetail form-clues"> 3 <div class="jktjDetail from-clues">
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="form" :model="form" label-width="100px"> 6 <el-form ref="form" :model="form" label-width="100px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row class="mb-5">
11 <el-col :span="4"> 11 <el-col :span="4">
12 <el-form-item label="开始日期" prop="startTime"> 12 <el-form-item label="开始日期" prop="startTime" class="d-flex">
13 <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期" 13 <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期"
14 :picker-options="pickerOptionsStart" v-model="form.startTime" 14 :picker-options="pickerOptionsStart" v-model="form.startTime"
15 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> 15 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="4"> 18 <el-col :span="4">
19 <el-form-item label="结束日期" prop="endTime"> 19 <el-form-item label="结束日期" prop="endTime" class="d-flex">
20 <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期" 20 <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期"
21 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" 21 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
22 @change="endTimeChange"></el-date-picker> 22 @change="endTimeChange"></el-date-picker>
...@@ -31,18 +31,18 @@ ...@@ -31,18 +31,18 @@
31 </el-form> 31 </el-form>
32 </div> 32 </div>
33 <!-- 表格 --> 33 <!-- 表格 -->
34 <div class="form-clues-content echarts-box" v-if="pieChartsData.length"> 34 <div class="from-clues-content echarts-box" v-if="pieChartsData.length">
35 <div id="myChart" class="chart"></div> 35 <div id="myChart" class="chart" style="height:100%;width:100%;"></div>
36 <div id="myChart-bar" class="chart-bar"></div> 36 <div id="myChart-bar" class="chart-bar" style="height:100%;width:100%;"></div>
37 </div> 37 </div>
38 <div class="form-clues-content echarts-box center" v-else>暂无数据</div> 38 <div class="from-clues-content center" v-else>暂无数据</div>
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 {
...@@ -123,10 +123,10 @@ ...@@ -123,10 +123,10 @@
123 // 绘制图表 123 // 绘制图表
124 myChart.setOption({ 124 myChart.setOption({
125 legend: { 125 legend: {
126 bottom: "2%", 126 bottom: "-1%",
127 left: "center", 127 left: "center",
128 textStyle: { 128 textStyle: {
129 color: "#fff", 129 color: this.BASE_API.echartTextColor,
130 }, 130 },
131 }, 131 },
132 tooltip: { 132 tooltip: {
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
141 name: "各业务类型办理数量", 141 name: "各业务类型办理数量",
142 type: "pie", 142 type: "pie",
143 radius: [0, 250], 143 radius: [0, 250],
144 center: ["50%", "45%"], 144 center: ["50%", "32%"],
145 roseType: "area", 145 roseType: "area",
146 itemStyle: { 146 itemStyle: {
147 borderRadius: 8, 147 borderRadius: 8,
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
227 top: 20, 227 top: 20,
228 textStyle: { 228 textStyle: {
229 show: true, 229 show: true,
230 color: "#fff", 230 color: this.BASE_API.echartTextColor,
231 fontSize: "16", 231 fontSize: "16",
232 }, 232 },
233 }, 233 },
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
239 interval: 0, 239 interval: 0,
240 textStyle: { 240 textStyle: {
241 show: true, 241 show: true,
242 color: "#fff", 242 color: this.BASE_API.echartTextColor,
243 fontSize: "16", 243 fontSize: "16",
244 }, 244 },
245 }, 245 },
...@@ -250,13 +250,13 @@ ...@@ -250,13 +250,13 @@
250 type: "value", 250 type: "value",
251 name: "单位：天", 251 name: "单位：天",
252 nameTextStyle: { 252 nameTextStyle: {
253 color: "#fff", 253 color: this.BASE_APIechartTextColor,
254 fontSize: "16", 254 fontSize: "16",
255 }, 255 },
256 axisLabel: { 256 axisLabel: {
257 textStyle: { 257 textStyle: {
258 show: true, 258 show: true,
259 color: "#fff", 259 color: this.BASE_API.echartTextColor,
260 fontSize: "16", 260 fontSize: "16",
261 }, 261 },
262 }, 262 },
...@@ -318,12 +318,10 @@ ...@@ -318,12 +318,10 @@
318 }); 318 });
319 }, 319 },
320 }, 320 },
321 }; 321 };
322 </script> 322 </script>
323 <style scoped lang="scss"> 323 <style scoped lang="scss">
324 .jktjDetail { 324 .jktjDetail {
325 height: 100%;
326 display: flex;
327 flex-direction: column; 325 flex-direction: column;
328 326
329 .rows { 327 .rows {
...@@ -333,28 +331,8 @@ ...@@ -333,28 +331,8 @@
333 .center { 331 .center {
334 line-height: 50vh; 332 line-height: 50vh;
335 text-align: center; 333 text-align: center;
336 }
337
338 .echarts-box {
339 display: flex;
340 justify-content: center;
341
342 .chart {
343 width: 40%;
344 height: 100%;
345 float: left;
346 }
347
348 .chart-bar {
349 width: 60%;
350 }
351 }
352
353 .form-clues-content {
354 flex: 1;
355 height: 100%;
356 color: #b6b5b5; 334 color: #b6b5b5;
357 } 335 }
358 } 336 }
359 </style> 337 </style>
360 338
......
1 <template> 1 <template>
2 <!-- 监控日志 --> 2 <!-- 监控日志 -->
3 <div class="jktjDetail form-clues"> 3 <div class="jktjDetail from-clues">
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="form" :model="form" label-width="100px"> 6 <el-form ref="form" :model="form" label-width="80px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row class="mb-5">
11 <el-col :span="4"> 11 <el-col :span="4">
12 <el-form-item label="行政区"> 12 <el-form-item label="行政区" class="d-flex">
13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区"> 13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="4"> 19 <el-col :span="4">
20 <el-form-item label="开始日期" prop="startTime"> 20 <el-form-item label="开始日期" prop="startTime" class="d-flex">
21 <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期" 21 <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期"
22 :picker-options="pickerOptionsStart" v-model="form.startTime" 22 :picker-options="pickerOptionsStart" v-model="form.startTime"
23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> 23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="4"> 26 <el-col :span="4">
27 <el-form-item label="结束日期" prop="endTime"> 27 <el-form-item label="结束日期" prop="endTime" class="d-flex">
28 <el-date-picker type="date" :clearable="false" class="width100" placeholder="结束日期" 28 <el-date-picker type="date" :clearable="false" class="width100" placeholder="结束日期"
29 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" 29 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
30 @change="endTimeChange"></el-date-picker> 30 @change="endTimeChange"></el-date-picker>
...@@ -39,18 +39,18 @@ ...@@ -39,18 +39,18 @@
39 </el-form> 39 </el-form>
40 </div> 40 </div>
41 <!-- 图表 --> 41 <!-- 图表 -->
42 <div class="form-clues-content echarts-box" v-if="chartData.length"> 42 <div class="from-clues-content echarts-box" v-if="chartData.length">
43 <div id="myChart" class="chart"></div> 43 <div id="myChart" class="chart" style="height:100%;width:100%;"></div>
44 </div> 44 </div>
45 <div class="form-clues-content echarts-box center" v-else>暂无数据</div> 45 <div class="from-clues-content echarts-box center" v-else>暂无数据</div>
46 </div> 46 </div>
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 {
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
136 axisPointer: { 136 axisPointer: {
137 type: "cross", 137 type: "cross",
138 crossStyle: { 138 crossStyle: {
139 color: "#fff", 139 color: this.BASE_API.echartTextColor,
140 }, 140 },
141 }, 141 },
142 }, 142 },
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 top: '16', 145 top: '16',
146 textStyle: { 146 textStyle: {
147 show: true, 147 show: true,
148 color: "#fff", 148 color: this.BASE_API.echartTextColor,
149 fontSize: "16", 149 fontSize: "16",
150 }, 150 },
151 }, 151 },
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
162 axisLabel: { 162 axisLabel: {
163 textStyle: { 163 textStyle: {
164 show: true, 164 show: true,
165 color: "#fff", 165 color: this.BASE_API.echartTextColor,
166 fontSize: "16", 166 fontSize: "16",
167 }, 167 },
168 formatter: function (val) { 168 formatter: function (val) {
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
195 type: "value", 195 type: "value",
196 name: "数量/个", 196 name: "数量/个",
197 nameTextStyle: { 197 nameTextStyle: {
198 color: "#fff", 198 color: this.BASE_API.echartTextColor,
199 fontSize: "16", 199 fontSize: "16",
200 }, 200 },
201 // interval: this.interval, 201 // interval: this.interval,
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
203 formatter: "{value}", 203 formatter: "{value}",
204 textStyle: { 204 textStyle: {
205 show: true, 205 show: true,
206 color: "#fff", 206 color: this.BASE_API.echartTextColor,
207 fontSize: "16", 207 fontSize: "16",
208 }, 208 },
209 }, 209 },
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
212 type: "value", 212 type: "value",
213 name: "成功率", 213 name: "成功率",
214 nameTextStyle: { 214 nameTextStyle: {
215 color: "#fff", 215 color: this.BASE_API.echartTextColor,
216 fontSize: "16", 216 fontSize: "16",
217 }, 217 },
218 splitNumber: 2, 218 splitNumber: 2,
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
220 formatter: "{value} %", 220 formatter: "{value} %",
221 textStyle: { 221 textStyle: {
222 show: true, 222 show: true,
223 color: "#fff", 223 color: this.BASE_API.echartTextColor,
224 fontSize: "16", 224 fontSize: "16",
225 }, 225 },
226 }, 226 },
...@@ -283,12 +283,10 @@ ...@@ -283,12 +283,10 @@
283 }); 283 });
284 }, 284 },
285 }, 285 },
286 }; 286 };
287 </script> 287 </script>
288 <style scoped lang="scss"> 288 <style scoped lang="scss">
289 .jktjDetail { 289 .jktjDetail {
290 height: 100%;
291 display: flex;
292 flex-direction: column; 290 flex-direction: column;
293 291
294 .rows { 292 .rows {
...@@ -300,21 +298,5 @@ ...@@ -300,21 +298,5 @@
300 text-align: center; 298 text-align: center;
301 color: #b6b5b5; 299 color: #b6b5b5;
302 } 300 }
303 301 }
304 .echarts-box {
305 display: flex;
306 justify-content: center;
307 height: 500px;
308
309 .chart {
310 width: 100%;
311 height: 100%;
312 }
313 }
314
315 .form-clues-content {
316 flex: 1;
317 height: 100%;
318 }
319 }
320 </style> 302 </style>
......
1 <template> 1 <template>
2 <!-- 监控日志 --> 2 <!-- 监控日志 -->
3 <div class="jktjDetail form-clues"> 3 <div class="jktjDetail from-clues">
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="form" :model="form" label-width="100px"> 6 <el-form ref="form" :model="form" label-width="100px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row class="mb-5">
11 <el-col :span="4"> 11 <el-col :span="4">
12 <el-form-item label="行政区"> 12 <el-form-item label="行政区" class="d-flex">
13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区"> 13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="4"> 19 <el-col :span="4">
20 <el-form-item label="开始日期"> 20 <el-form-item label="开始日期" class="d-flex">
21 <el-date-picker class="width100" :clearable="false" type="date" placeholder="开始日期" 21 <el-date-picker class="width100" :clearable="false" type="date" placeholder="开始日期"
22 :picker-options="pickerOptionsStart" v-model="form.startTime" 22 :picker-options="pickerOptionsStart" v-model="form.startTime"
23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> 23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="4"> 26 <el-col :span="4">
27 <el-form-item label="结束日期"> 27 <el-form-item label="结束日期" class="d-flex">
28 <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期" 28 <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期"
29 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" 29 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
30 @change="endTimeChange"></el-date-picker> 30 @change="endTimeChange"></el-date-picker>
...@@ -39,18 +39,17 @@ ...@@ -39,18 +39,17 @@
39 </el-form> 39 </el-form>
40 </div> 40 </div>
41 <!-- 图表 --> 41 <!-- 图表 -->
42 <div class="form-clues-content echarts-box" v-if="chartData.length"> 42 <div class="from-clues-content echarts-box" v-if="chartData.length">
43 <div id="myChart" class="chart"></div> 43 <div id="myChart" class="chart" style="height:100%;width:100%;"></div>
44 </div> 44 </div>
45 <div class="form-clues-content echarts-box center" v-else>暂无数据</div> 45 <div class="from-clues-content echarts-box center" v-else>暂无数据</div>
46 </div> 46 </div>
47 </template> 47 </template>
48
49 <script> 48 <script>
50 import { mapGetters } from "vuex"; 49 import { mapGetters } from "vuex";
51 import efficient from "@/api/efficient"; 50 import efficient from "@/api/efficient";
52 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; 51 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
53 export default { 52 export default {
54 name: "jktj", 53 name: "jktj",
55 data () { 54 data () {
56 return { 55 return {
...@@ -168,7 +167,7 @@ ...@@ -168,7 +167,7 @@
168 }, 167 },
169 textStyle: { 168 textStyle: {
170 show: true, 169 show: true,
171 color: "#fff", 170 color: this.BASE_API.echartTextColor,
172 fontSize: "16", 171 fontSize: "16",
173 }, 172 },
174 }, 173 },
...@@ -179,13 +178,13 @@ ...@@ -179,13 +178,13 @@
179 type: "value", 178 type: "value",
180 name: "数量/个", 179 name: "数量/个",
181 nameTextStyle: { 180 nameTextStyle: {
182 color: "#fff", 181 color: this.BASE_API.echartTextColor,
183 fontSize: "16", 182 fontSize: "16",
184 }, 183 },
185 axisLabel: { 184 axisLabel: {
186 textStyle: { 185 textStyle: {
187 show: true, 186 show: true,
188 color: "#fff", 187 color: this.BASE_API.echartTextColor,
189 fontSize: "16", 188 fontSize: "16",
190 }, 189 },
191 }, 190 },
...@@ -211,12 +210,10 @@ ...@@ -211,12 +210,10 @@
211 }); 210 });
212 }, 211 },
213 }, 212 },
214 }; 213 };
215 </script> 214 </script>
216 <style scoped lang="scss"> 215 <style scoped lang="scss">
217 .jktjDetail { 216 .jktjDetail {
218 height: 100%;
219 display: flex;
220 flex-direction: column; 217 flex-direction: column;
221 218
222 .rows { 219 .rows {
...@@ -228,21 +225,5 @@ ...@@ -228,21 +225,5 @@
228 text-align: center; 225 text-align: center;
229 color: #b6b5b5; 226 color: #b6b5b5;
230 } 227 }
231 228 }
232 .echarts-box {
233 display: flex;
234 justify-content: center;
235 height: 500px;
236
237 .chart {
238 width: 100%;
239 height: 100%;
240 }
241 }
242
243 .form-clues-content {
244 flex: 1;
245 height: 100%;
246 }
247 }
248 </style> 229 </style>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-form-item v-if="BASE_API.THEME=='jg'"> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
......
1 /deep/.el-table--border th.el-table__cell {
2 border-bottom: 1px solid #458ACF !important;
3 }
4
5 /deep/.el-table--border .el-table__cell {
6 border-right: 1px solid #458ACF !important;
7 }
8
9 /deep/.el-table thead.is-group th.el-table__cell { 1 /deep/.el-table thead.is-group th.el-table__cell {
10 background-color: transparent !important; 2 background-color: transparent !important;
11 } 3 }
...@@ -18,8 +10,3 @@ ...@@ -18,8 +10,3 @@
18 .export-excel-wrapper { 10 .export-excel-wrapper {
19 display: inline-block; 11 display: inline-block;
20 } 12 }
...\ No newline at end of file ...\ No newline at end of file
21
22 /deep/.el-table--group,
23 .el-table--border {
24 border: 1px solid #458ACF !important;
25 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
32 </el-form> 32 </el-form>
33 </div> 33 </div>
34 <!-- 列表区域 --> 34 <!-- 列表区域 -->
35 <div class="from-clues-content"> 35 <div class="from-clues-content complex-header">
36 <lb-table ref="table" :header-cell-style="headerStyle1" :calcHeight="200" :pagination="false" 36 <lb-table ref="table" :header-cell-style="headerStyle1" :calcHeight="BASE_API.calcHeight" :pagination="false"
37 :column="tableData.columns" :data="tableData.data"> 37 :column="tableData.columns" :data="tableData.data">
38 </lb-table> 38 </lb-table>
39 39
...@@ -171,6 +171,7 @@ export default { ...@@ -171,6 +171,7 @@ export default {
171 </script> 171 </script>
172 <style scoped lang="scss"> 172 <style scoped lang="scss">
173 @import "../css/index.scss"; 173 @import "../css/index.scss";
174
174 /deep/th.el-table__cell { 175 /deep/th.el-table__cell {
175 height: 0 !important; 176 height: 0 !important;
176 } 177 }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
...@@ -33,10 +33,9 @@ ...@@ -33,10 +33,9 @@
33 </el-form> 33 </el-form>
34 </div> 34 </div>
35 <!-- 列表区域 --> 35 <!-- 列表区域 -->
36 <div class="from-clues-content"> 36 <div class="from-clues-content complex-header">
37 <lb-table ref="table" :pagination="false" :calcHeight="200" :column="tableData.columns" :data="tableData.data"> 37 <lb-table ref="table" :pagination="false" :calcHeight="BASE_API.calcHeight" :column="tableData.columns" :data="tableData.data">
38 </lb-table> 38 </lb-table>
39
40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false" 39 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false"
41 :column="tableData.columns" :data="tableData.data" :downTitle="downTitle"> 40 :column="tableData.columns" :data="tableData.data" :downTitle="downTitle">
42 </down-lb-table> 41 </down-lb-table>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-17 16:32:50 3 * @Date: 2023-02-17 16:32:50
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-15 10:42:21 5 * @LastEditTime: 2023-03-28 10:24:52
6 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue 6 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <!-- 头部搜索 --> 14 <!-- 头部搜索 -->
15 <div class="from-clues-header"> 15 <div class="from-clues-header">
16 <el-form ref="ruleForm" :model="form" label-width="100px"> 16 <el-form ref="ruleForm" :model="form" label-width="100px">
17 <el-form-item> 17 <el-form-item v-if="BASE_API.THEME == 'jg'">
18 <Breadcrumb /> 18 <Breadcrumb />
19 </el-form-item> 19 </el-form-item>
20 <el-row class="mb-5"> 20 <el-row class="mb-5">
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
42 </el-form> 42 </el-form>
43 </div> 43 </div>
44 <!-- 列表区域 --> 44 <!-- 列表区域 -->
45 <div class="from-clues-content"> 45 <div class="from-clues-content complex-header">
46 <lb-table ref="table" :pagination="false" :border="true" :calcHeight="200" :header-cell-style="headerStyle" 46 <lb-table ref="table" :pagination="false" :border="true" :calcHeight="BASE_API.calcHeight"
47 :column="tableData.columns" :data="tableData.data"> 47 :header-cell-style="headerStyle" :column="tableData.columns" :data="tableData.data">
48 </lb-table> 48 </lb-table>
49 <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true" 49 <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true"
50 :pagination="false" :column="tableData.columns" :data="tableData.data" :downTitle="downTitle"> 50 :pagination="false" :column="tableData.columns" :data="tableData.data" :downTitle="downTitle">
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <el-input v-model.trim="form.menuName" class="width100" clearable placeholder="菜单名称"></el-input> 11 <el-input v-model.trim="form.menuName" class="width100" clearable placeholder="菜单名称"></el-input>
12 </el-form-item> 12 </el-form-item>
13 </el-col> 13 </el-col>
14 <el-col :span="3" class="btnColRight"> 14 <el-col :span="20" class="btnColRight">
15 <btn nativeType="cx" @click="searchQuery">查询</btn> 15 <btn nativeType="cx" @click="searchQuery">查询</btn>
16 <btn nativeType="cx" @click="handleAdd()">新增菜单</btn> 16 <btn nativeType="cx" @click="handleAdd()">新增菜单</btn>
17 </el-col> 17 </el-col>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 </el-form> 19 </el-form>
20 </div> 20 </div>
21 <div class="from-clues-content"> 21 <div class="from-clues-content">
22 <lb-table :pagination="false" :column="tableData.columns" :calcHeight="200" :data="tablelistData" row-key="id" 22 <lb-table :pagination="false" :column="tableData.columns" :calcHeight="BASE_API.calcHeight" :data="tablelistData" row-key="id"
23 default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"> 23 default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
24 24
25 </lb-table> 25 </lb-table>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="timedTask from-clues"> 2 <div class="timedTask from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="ruleForm" :model="form" label-width="100px"> 4 <el-form ref="ruleForm" :model="form" label-width="100px">
5 <el-form-item v-if="BASE_API.THEME=='jg'"> 5 <el-form-item v-if="BASE_API.THEME == 'jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <el-input v-model.trim="form.rolesName" class="width100" clearable placeholder="角色名称"></el-input> 11 <el-input v-model.trim="form.rolesName" class="width100" clearable placeholder="角色名称"></el-input>
12 </el-form-item> 12 </el-form-item>
13 </el-col> 13 </el-col>
14 <el-col :span="3" class="btnColRight"> 14 <el-col :span="20" class="btnColRight">
15 <btn nativeType="cx" @click="searchQuery">查询</btn> 15 <btn nativeType="cx" @click="searchQuery">查询</btn>
16 <btn nativeType="cx" @click="handleAddEdit">增加角色</btn> 16 <btn nativeType="cx" @click="handleAddEdit">增加角色</btn>
17 </el-col> 17 </el-col>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 </el-form> 19 </el-form>
20 </div> 20 </div>
21 <div class="from-clues-content"> 21 <div class="from-clues-content">
22 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200" 22 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="BASE_API.calcHeight"
23 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" 23 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
24 row-key="dictid"> 24 row-key="dictid">
25 </lb-table> 25 </lb-table>
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
2 <div class="timedTask from-clues"> 2 <div class="timedTask from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="80px"> 4 <el-form ref="form" :model="form" label-width="80px">
5 <el-form-item v-if="BASE_API.THEME=='jg'"> 5 <el-form-item v-if="BASE_API.THEME == 'jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="搜索标题"> 10 <el-form-item label="搜索标题">
11 <el-input v-model="form.jobName" placeholder="标题"></el-input> 11 <el-input v-model="form.jobName" placeholder="标题"></el-input>
...@@ -104,6 +104,61 @@ ...@@ -104,6 +104,61 @@
104 this.taskData = null 104 this.taskData = null
105 this.isDialog = true 105 this.isDialog = true
106 }, 106 },
107 selectionList: [],
108 tableData: {
109 columns: [{
110 label: '序号',
111 type: 'index',
112 width: '50',
113 index: this.indexMethod,
114 }].concat(data.columns()).concat([
115 {
116 label: "操作",
117 width: 380,
118 render: (h, scope) => {
119 return (
120 <div>
121 <el-button type="text"
122 v-show={scope.row.jobStatus === 0}
123 class='btnColor'
124 icon="el-icon-video-pause"
125 onClick={() => { this.handleActive(scope.row) }}>激活
126 </el-button>
127 <el-button type="text"
128 v-show={scope.row.jobStatus === -1}
129 class='btnColor'
130 icon="el-icon-video-pause"
131 onClick={() => { this.recover(scope.row) }}>恢复
132 </el-button>
133 <el-button type="text"
134 icon="el-icon-edit"
135 class='btnColor'
136 onClick={() => { this.handleEdit(scope.row) }}>编辑
137 </el-button>
138 <el-button type="text"
139 icon="el-icon-delete"
140 class='successColor'
141 v-show={scope.row.jobStatus !== -1}
142 onClick={() => { this.handleDel(scope.row) }}>删除
143 </el-button>
144 </div>
145 );
146 },
147 },
148 ]),
149 data: []
150 },
151 pageData: {
152 total: 0,
153 pageSize: 15,
154 current: 1,
155 },
156 },
157 methods: {
158 handleAdd () {
159 this.taskData = null
160 this.isDialog = true
161 },
107 resetSe () { 162 resetSe () {
108 this.form.jobName = '' 163 this.form.jobName = ''
109 this.featchData() 164 this.featchData()
...@@ -248,8 +303,8 @@ ...@@ -248,8 +303,8 @@
248 }) 303 })
249 } 304 }
250 } 305 }
251 } 306 }
252 </script> 307 </script>
253 <style scoped lang="scss"> 308 <style scoped lang="scss">
254 @import "~@/styles/mixin.scss"; 309 // @import "~@/styles/mixin.scss";
255 </style> 310 </style>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="timedTask from-clues"> 2 <div class="timedTask from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="ruleForm" :model="form" label-width="100px"> 4 <el-form ref="ruleForm" :model="form" label-width="100px">
5 <el-form-item v-if="BASE_API.THEME=='jg'"> 5 <el-form-item v-if="BASE_API.THEME == 'jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <!-- 操作按钮 --> 24 <!-- 操作按钮 -->
25 <el-col :span="3" class="btnColRight"> 25 <el-col :span="12" class="btnColRight">
26 <btn nativeType="cx" @click="getTableList">查询</btn> 26 <btn nativeType="cx" @click="getTableList">查询</btn>
27 <btn nativeType="cx" @click="handleAdd">添加人员</btn> 27 <btn nativeType="cx" @click="handleAdd">添加人员</btn>
28 </el-col> 28 </el-col>
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
31 </div> 31 </div>
32 <div class="from-clues-content"> 32 <div class="from-clues-content">
33 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 33 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
34 :column="tableData.columns" :calcHeight="200" :data="tableData.data" :expand-row-keys="keyList" row-key="dictid"> 34 :column="tableData.columns" :calcHeight="BASE_API.calcHeight" :data="tableData.data" :expand-row-keys="keyList"
35 row-key="dictid">
35 </lb-table> 36 </lb-table>
36 </div> 37 </div>
37 <EditDialog ref="dialogForm" v-model="isDialog" @ok="reloadTableData" /> 38 <EditDialog ref="dialogForm" v-model="isDialog" @ok="reloadTableData" />
...@@ -408,5 +409,5 @@ export default { ...@@ -408,5 +409,5 @@ export default {
408 }; 409 };
409 </script> 410 </script>
410 <style scoped lang="scss"> 411 <style scoped lang="scss">
411 @import "~@/styles/mixin.scss"; 412 @import "~@/styles/mixin.scss";
412 </style> 413 </style>
......