Skip to content

bdc / bdcjg-web

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

合并

2 parents 9642781a 03dbaf2e
Expand all
Inline Side-by-side
Showing 24 changed files with 300 additions and 215 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
...@@ -21,4 +21,16 @@ npm install --registry=https://registry.npm.taobao.org ...@@ -21,4 +21,16 @@ npm install --registry=https://registry.npm.taobao.org
21 - `wip` 开发中 21 - `wip` 开发中
22 22
23 ## 项目换肤 23 ## 项目换肤
24 给html根标签设置一个data-theme属性，然后通过js切换data-theme的属性值，Scss根据此属性来判断使用对应主题变量
...\ No newline at end of file ...\ No newline at end of file
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', () => { 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 {
156 window.addEventListener('resize', () => {
157 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
158 });
144 _this.tableHeight = _this.calcHeightx(_this.calcHeight) 159 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
145 }); 160 }
146 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
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');
......
...@@ -15,14 +15,4 @@ export default { ...@@ -15,14 +15,4 @@ export default {
15 } 15 }
16 } 16 }
17 } 17 }
18 </script>
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
18 </script>
...\ 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> 7 <transition name="fade-transform" mode="out-in">
8 <transition name="fade-transform" mode="out-in"> 8 <router-view />
9 <router-view /> 9 </transition>
10 </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"> 9 <div class="user">
10 <div class="user"> 10 {{ userName }}
11 {{ userName }} 11 <span @click="onCancel">
12 <span @click="onCancel"> 12 <i class="el-icon-switch-button"></i>
13 <i class="el-icon-switch-button"></i> 13 </span>
14 </span> 14 </div>
15 </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 {
......
...@@ -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 }
...@@ -17,9 +9,4 @@ ...@@ -17,9 +9,4 @@
17 9
18 .export-excel-wrapper { 10 .export-excel-wrapper {
19 display: inline-block; 11 display: inline-block;
20 }
21
22 /deep/.el-table--group,
23 .el-table--border {
24 border: 1px solid #458ACF !important;
25 } 12 }
...\ 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,152 +104,207 @@ ...@@ -104,152 +104,207 @@
104 this.taskData = null 104 this.taskData = null
105 this.isDialog = true 105 this.isDialog = true
106 }, 106 },
107 resetSe () { 107 selectionList: [],
108 this.form.jobName = '' 108 tableData: {
109 this.featchData() 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: []
110 }, 150 },
111 async featchData () { 151 pageData: {
112 try { 152 total: 0,
113 this.form = Object.assign(this.form, this.formData) 153 pageSize: 15,
114 let { result } = await sjsbTask.getTaskListByName(this.form) 154 current: 1,
115 this.tableData.data = result.list
116 } catch (error) {
117 this.message = error
118 }
119 }, 155 },
120 recover (row) { 156 },
121 this.$confirm('此操将进行恢复操作, 是否继续?', '提示', { 157 methods: {
122 confirmButtonText: '确定', 158 handleAdd () {
123 cancelButtonText: '取消', 159 this.taskData = null
124 type: 'warning', 160 this.isDialog = true
125 }) 161 },
126 .then(() => { 162 resetSe () {
127 sjsbTask.recover(row.jobId) 163 this.form.jobName = ''
128 .then((res) => { 164 this.featchData()
129 if ((res.code = 200)) { 165 },
130 this.$message({ 166 async featchData () {
131 type: 'success', 167 try {
132 message: res.message, 168 this.form = Object.assign(this.form, this.formData)
133 }) 169 let { result } = await sjsbTask.getTaskListByName(this.form)
134 this.featchData() 170 this.tableData.data = result.list
135 } 171 } catch (error) {
136 }) 172 this.message = error
137 .catch((error) => { 173 }
138 this.$alert(error, '提示', { 174 },
139 confirmButtonText: '确定', 175 recover (row) {
140 type: 'error' 176 this.$confirm('此操将进行恢复操作, 是否继续?', '提示', {
177 confirmButtonText: '确定',
178 cancelButtonText: '取消',
179 type: 'warning',
180 })
181 .then(() => {
182 sjsbTask.recover(row.jobId)
183 .then((res) => {
184 if ((res.code = 200)) {
185 this.$message({
186 type: 'success',
187 message: res.message,
141 }) 188 })
189 this.featchData()
190 }
191 })
192 .catch((error) => {
193 this.$alert(error, '提示', {
194 confirmButtonText: '确定',
195 type: 'error'
142 }) 196 })
143 })
144 .catch(() => {
145 this.$message({
146 type: 'info',
147 message: '已取消',
148 }) 197 })
198 })
199 .catch(() => {
200 this.$message({
201 type: 'info',
202 message: '已取消',
149 }) 203 })
150 },
151
152 handleActive (row) {
153 this.$confirm('此操将进行激活操作, 是否继续?', '提示', {
154 confirmButtonText: '确定',
155 cancelButtonText: '取消',
156 type: 'warning',
157 }) 204 })
158 .then(() => { 205 },
159 sjsbTask.active(row.jobId) 206
160 .then((res) => { 207 handleActive (row) {
161 if ((res.code = 200)) { 208 this.$confirm('此操将进行激活操作, 是否继续?', '提示', {
162 this.$message({ 209 confirmButtonText: '确定',
163 type: 'success', 210 cancelButtonText: '取消',
164 message: res.message, 211 type: 'warning',
165 }) 212 })
166 this.featchData() 213 .then(() => {
167 } 214 sjsbTask.active(row.jobId)
168 }) 215 .then((res) => {
169 .catch((error) => { 216 if ((res.code = 200)) {
170 this.$alert(error, '提示', { 217 this.$message({
171 confirmButtonText: '确定', 218 type: 'success',
172 type: 'error' 219 message: res.message,
173 }) 220 })
221 this.featchData()
222 }
223 })
224 .catch((error) => {
225 this.$alert(error, '提示', {
226 confirmButtonText: '确定',
227 type: 'error'
174 }) 228 })
175 })
176 .catch(() => {
177 this.$message({
178 type: 'info',
179 message: '已取消',
180 }) 229 })
230 })
231 .catch(() => {
232 this.$message({
233 type: 'info',
234 message: '已取消',
181 }) 235 })
182 },
183 // 暂停
184 handleSuspend (row) {
185 this.$confirm('此操将进行暂停操作, 是否继续?', '提示', {
186 confirmButtonText: '确定',
187 cancelButtonText: '取消',
188 type: 'warning',
189 }) 236 })
190 .then(() => { 237 },
191 sjsbTask.pauseJob(row.id) 238 // 暂停
192 .then((res) => { 239 handleSuspend (row) {
193 if ((res.code = 200)) { 240 this.$confirm('此操将进行暂停操作, 是否继续?', '提示', {
194 this.$message({ 241 confirmButtonText: '确定',
195 type: 'success', 242 cancelButtonText: '取消',
196 message: res.message, 243 type: 'warning',
197 }) 244 })
198 this.featchData() 245 .then(() => {
199 } 246 sjsbTask.pauseJob(row.id)
200 }) 247 .then((res) => {
201 .catch((error) => { 248 if ((res.code = 200)) {
202 this.$alert(error, '提示', { 249 this.$message({
203 confirmButtonText: '确定', 250 type: 'success',
204 type: 'error' 251 message: res.message,
205 }) 252 })
253 this.featchData()
254 }
255 })
256 .catch((error) => {
257 this.$alert(error, '提示', {
258 confirmButtonText: '确定',
259 type: 'error'
206 }) 260 })
207 })
208 .catch(() => {
209 this.$message({
210 type: 'info',
211 message: '已取消',
212 }) 261 })
262 })
263 .catch(() => {
264 this.$message({
265 type: 'info',
266 message: '已取消',
213 }) 267 })
214 },
215 handleEdit (row) {
216 this.taskData = row
217 this.isDialog = true
218 },
219 handleDel (row) {
220 this.$confirm('此操将进行删除操作, 是否继续?', '提示', {
221 confirmButtonText: '确定',
222 cancelButtonText: '取消',
223 type: 'warning',
224 }) 268 })
225 .then(() => { 269 },
226 sjsbTask.sjsbTaskRemove(row.jobId) 270 handleEdit (row) {
227 .then((res) => { 271 this.taskData = row
228 if ((res.code = 200)) { 272 this.isDialog = true
229 this.$message({ 273 },
230 type: 'success', 274 handleDel (row) {
231 message: res.message, 275 this.$confirm('此操将进行删除操作, 是否继续?', '提示', {
232 }) 276 confirmButtonText: '确定',
233 this.featchData() 277 cancelButtonText: '取消',
234 } 278 type: 'warning',
235 }) 279 })
236 .catch((error) => { 280 .then(() => {
237 this.$alert(error, '提示', { 281 sjsbTask.sjsbTaskRemove(row.jobId)
238 confirmButtonText: '确定', 282 .then((res) => {
239 type: 'error' 283 if ((res.code = 200)) {
284 this.$message({
285 type: 'success',
286 message: res.message,
240 }) 287 })
288 this.featchData()
289 }
290 })
291 .catch((error) => {
292 this.$alert(error, '提示', {
293 confirmButtonText: '确定',
294 type: 'error'
241 }) 295 })
242 })
243 .catch(() => {
244 this.$message({
245 type: 'info',
246 message: '已取消',
247 }) 296 })
297 })
298 .catch(() => {
299 this.$message({
300 type: 'info',
301 message: '已取消',
248 }) 302 })
249 } 303 })
250 } 304 }
251 } 305 }
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>
......