Merge branch 'master' into dev

@@ -29,80 +29,24 @@
   </div>
 </template>
 <script>
-  // 定时任务
-  import data from "./data"
-  import sjsbTask from '@/api/sjsbTask.js'
-  import tableMixin from '@/mixins/tableMixin.js'
-  import addTask from '../components/addTask.vue'
-  export default {
-    name: "timedTask",
-    mixins: [tableMixin],
-    components: {
-      addTask
-    },
-    data () {
-      return {
-        taskData: null,
-        isDialog: false,
-        form: {
-          jobName: '',
-          currentPage: 1
-        },
-        selectionList: [],
-        tableData: {
-          columns: [{
-            label: '序号',
-            type: 'index',
-            width: '50',
-            index: this.indexMethod,
-          }].concat(data.columns()).concat([
-            {
-              label: "操作",
-              width: 380,
-              render: (h, scope) => {
-                return (
-                  <div>
-                    <el-button type="text"
-                      size="mini"
-                      v-show={scope.row.jobStatus === 0}
-                      class='btnColor'
-                      onClick={() => { this.handleActive(scope.row) }}>激活
-                    </el-button>
-                    <el-button type="text"
-                      size="mini"
-                      v-show={scope.row.jobStatus === -1}
-                      class='btnColor'
-                      onClick={() => { this.recover(scope.row) }}>恢复
-                    </el-button>
-                    <el-button type="text"
-                      size="mini"
-                      class='successColor'
-                      onClick={() => { this.handleEdit(scope.row) }}>编辑
-                    </el-button>
-                    <el-button type="text"
-                      size="mini"
-                      class='successColor'
-                      v-show={scope.row.jobStatus !== -1}
-                      onClick={() => { this.handleDel(scope.row) }}>删除
-                    </el-button>
-                  </div>
-                );
-              },
-            },
-          ]),
-          data: []
-        },
-        pageData: {
-          total: 0,
-          pageSize: 15,
-          current: 1,
-        },
-      }
-    },
-    methods: {
-      handleAdd () {
-        this.taskData = null
-        this.isDialog = true
+// 定时任务
+import data from "./data"
+import sjsbTask from '@/api/sjsbTask.js'
+import tableMixin from '@/mixins/tableMixin.js'
+import addTask from '../components/addTask.vue'
+export default {
+  name: "timedTask",
+  mixins: [tableMixin],
+  components: {
+    addTask
+  },
+  data () {
+    return {
+      taskData: null,
+      isDialog: false,
+      form: {
+        jobName: '',
+        currentPage: 1
       },
       selectionList: [],
       tableData: {
@@ -114,29 +58,29 @@
         }].concat(data.columns()).concat([
           {
             label: "操作",
-            width: 380,
+            width: 230,
             render: (h, scope) => {
               return (
                 <div>
                   <el-button type="text"
+                    size="mini"
                     v-show={scope.row.jobStatus === 0}
                     class='btnColor'
-                    icon="el-icon-video-pause"
                     onClick={() => { this.handleActive(scope.row) }}>激活
                   </el-button>
                   <el-button type="text"
+                    size="mini"
                     v-show={scope.row.jobStatus === -1}
                     class='btnColor'
-                    icon="el-icon-video-pause"
                     onClick={() => { this.recover(scope.row) }}>恢复
                   </el-button>
                   <el-button type="text"
-                    icon="el-icon-edit"
-                    class='btnColor'
+                    size="mini"
+                    class='successColor'
                     onClick={() => { this.handleEdit(scope.row) }}>编辑
                   </el-button>
                   <el-button type="text"
-                    icon="el-icon-delete"
+                    size="mini"
                     class='successColor'
                     v-show={scope.row.jobStatus !== -1}
                     onClick={() => { this.handleDel(scope.row) }}>删除
@@ -152,8 +96,9 @@
         total: 0,
         pageSize: 15,
         current: 1,
-      },
-    },
+      }
+    }
+  },
   methods: {
     handleAdd () {
       this.taskData = null