Merge branch 'master' into dev

@@ -29,12 +29,12 @@
   </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 {
+// 定时任务
+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: {
@@ -58,7 +58,7 @@
         }].concat(data.columns()).concat([
           {
             label: "操作",
-              width: 380,
+            width: 230,
             render: (h, scope) => {
               return (
                 <div>
@@ -96,63 +96,8 @@
         total: 0,
         pageSize: 15,
         current: 1,
-        },
       }
-    },
-    methods: {
-      handleAdd () {
-        this.taskData = null
-        this.isDialog = true
-      },
-      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"
-                    v-show={scope.row.jobStatus === 0}
-                    class='btnColor'
-                    icon="el-icon-video-pause"
-                    onClick={() => { this.handleActive(scope.row) }}>激活
-                  </el-button>
-                  <el-button type="text"
-                    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'
-                    onClick={() => { this.handleEdit(scope.row) }}>编辑
-                  </el-button>
-                  <el-button type="text"
-                    icon="el-icon-delete"
-                    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 () {