Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
35dade82 by renchao@pashanhoo.com
Options

Merge branch 'master' into dev

2 parents 7bfa8c8d 5e9dcd37
Inline Side-by-side
Showing 1 changed file with 8 additions and 63 deletions
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
29 </div> 29 </div>
30 </template> 30 </template>
31 <script> 31 <script>
32 // 定时任务 32 // 定时任务
33 import data from "./data" 33 import data from "./data"
34 import sjsbTask from '@/api/sjsbTask.js' 34 import sjsbTask from '@/api/sjsbTask.js'
35 import tableMixin from '@/mixins/tableMixin.js' 35 import tableMixin from '@/mixins/tableMixin.js'
36 import addTask from '../components/addTask.vue' 36 import addTask from '../components/addTask.vue'
37 export default { 37 export default {
38 name: "timedTask", 38 name: "timedTask",
39 mixins: [tableMixin], 39 mixins: [tableMixin],
40 components: { 40 components: {
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 }].concat(data.columns()).concat([ 58 }].concat(data.columns()).concat([
59 { 59 {
60 label: "操作", 60 label: "操作",
61 width: 380, 61 width: 230,
62 render: (h, scope) => { 62 render: (h, scope) => {
63 return ( 63 return (
64 <div> 64 <div>
...@@ -96,63 +96,8 @@ ...@@ -96,63 +96,8 @@
96 total: 0, 96 total: 0,
97 pageSize: 15, 97 pageSize: 15,
98 current: 1, 98 current: 1,
99 },
100 } 99 }
101 }, 100 }
102 methods: {
103 handleAdd () {
104 this.taskData = null
105 this.isDialog = true
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 }, 101 },
157 methods: { 102 methods: {
158 handleAdd () { 103 handleAdd () {
......