Merge remote-tracking branch 'origin/master'

src/api/task/task.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-//查询规则引擎列表
+//查询任务列表
 export function selectTaskList(data){
   return request({
     url: "/task/task/list",
@@ -9,33 +9,22 @@ export function selectTaskList(data){
   })
 }
 
-//导出
+//添加
-export function selectSourceExport(data){
+export function addTask(data){
   return request({
-    url: "/source/source/export",
+    url: "/task/task/addTask",
+    method: "POST",
+    data:data
+  })
+}
+
+//修改
+export function updateById(data){
+  return request({
+    url: "/task/task/updateById",
     method: "POST",
     data:data
   })
 }
 
 
-//新增
-export function insertAdd(data){
-  return request({
-    url: "/source/source/insert",
-    method: "get",
-    data:data
-  })
-}
-
-
-//获取基本信息
-export function getInfo(id){
-  return request({
-    url: "/source/source/id",
-    method: "get",
-  })
-}
-
-
-

src/views/engine/engine/index.vue

@@ -32,17 +32,17 @@
     </el-button>
 
 
-<!--    <el-button-->
+    <el-button
-<!--      icon="el-icon-delete"-->
+      icon="el-icon-delete"
-<!--      plain-->
+      plain
-<!--      size="mini"-->
+      size="mini"
-<!--      type="danger"-->
+      type="danger"
-<!--      @click="insertAdd()"-->
+      @click="insert()"
-<!--    >新增-->
+    >新增
-<!--    </el-button>-->
+    </el-button>
 
 
-    <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">
+    <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" >
 
       <el-form :model="engine">
         <el-form-item label="接入源名称">
@@ -75,7 +75,7 @@
 
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogFormVisible = insert">确 定</el-button>
+        <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -94,6 +94,7 @@
           <span v-if="scope.row.type==2">基本类型</span>
           <span v-if="scope.row.type==3">时间类型</span>
           <span v-if="scope.row.type==4">普通类型</span>
+          <span v-if="scope.row.type==4">介入类型</span>
         </template>
       </el-table-column>
       <el-table-column label="作用域"  style="color: blue" prop="scope">
@@ -149,11 +150,6 @@
     </el-table>
 
 
-
-
-
-
-
   </div>
 </template>
 
@@ -161,8 +157,7 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 import {insertAdd} from "@/api/etl/switch";
-import {insert, selectEngineList} from "@/api/engine/engine";
+import {del, insert, selectEngineList, update} from "@/api/engine/engine";
-import {del, selectList, update} from "@/api/pay/customer";
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},
@@ -171,7 +166,9 @@ export default {
     //这里存放数据"
 
     return {
+      engineReq:{
 
+      },
       engine:{
 
       },
@@ -186,9 +183,11 @@ export default {
   //方法集合",
   methods: {
     insert(){
+      this.dialogFormVisible = true
       insert(this.engine).then(res =>{
         this.$message.success(res.msg || "添加成功")
       })
+      this.engine = {}
     },
     findSelectSourceList(){
       selectEngineList().then(res=>{
@@ -206,9 +205,9 @@ export default {
       })
     },
     findSelectSourceExport(){
-      selectEngineList().then(res=>{
+      this.download('engine/engine/export', {
-        this.arr=res.data;
+        ...this.engineReq
-      })
+      }, `source_${new Date().getTime()}.xlsx`)
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",

src/views/etl/switch/index.vue

@@ -298,7 +298,6 @@ export default {
       this.download('source/source/export', {
         ...this.SourceReq
       }, `source_${new Date().getTime()}.xlsx`)
-      // selectSourceExport(this.SourceReq).then();
     },
     handleSelectionChange(row){
       this.ids=[];

src/views/task/task/index.vue

@@ -15,7 +15,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="任务执行状态">
-        <el-select v-model="taskReq.weigh" placeholder="请选择等级">
+        <el-select v-model="taskReq.status" placeholder="请选择等级">
           <el-option label="请选择" value=""></el-option>
           <el-option label="待执行" value="0"></el-option>
           <el-option label="正在执行" value="1"></el-option>
@@ -28,24 +28,18 @@
     </el-form>
 
 
-    <!--    <el-button-->
-    <!--      v-hasPermi="['system:user:remove']"-->
-    <!--      icon="el-icon-delete"-->
-    <!--      size="mini"-->
-    <!--      type="text"-->
-    <!--      @click="handleDelete(scope.row)"-->
-    <!--    >删除-->
-    <!--    </el-button>-->
-
 
+    <el-col :span="1.5">
       <el-button
-      icon="el-icon-delete"
+        v-hasPermi="['system:config:add']"
+        icon="el-icon-plus"
         plain
         size="mini"
-      type="danger"
+        type="primary"
-      @click="insertAdd()"
+        @click="handleAdd"
       >新增
       </el-button>
+    </el-col>
 
 
 <!--    <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">-->
@@ -155,11 +149,36 @@
         </template>
 
       </el-table-column>
-
     </el-table>
+<!--      添加界面-->
+
+    <el-dialog title="添加任务信息" :visible.sync="dialogFormVisible">
+
+      <el-form :model="taskAddReq">
+        <el-form-item label="任务名称">
+          <el-input v-model="taskAddReq.name"></el-input>
+        </el-form-item>
 
 
 
+        <el-table-column
+          label="任务权重级别"
+          width="180">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px" v-if="scope.row.weigh ==1 ">紧急</span>
+            <span style="margin-left: 10px" v-if="scope.row.weigh ==2 ">底</span>
+            <span style="margin-left: 10px" v-if="scope.row.weigh ==3 ">中</span>
+            <span style="margin-left: 10px" v-if="scope.row.weigh ==4 ">高</span>
+          </template>
+        </el-table-column>
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addTask()">确 定</el-button>
+      </div>
+    </el-dialog>
 
 
 
@@ -175,7 +194,7 @@ import {selectSourceExport} from "@/api/etl/switch";
 import {connectionTest} from "@/api/etl/switch";
 import {insertAdd} from "@/api/etl/switch";
 import {getInfo} from "@/api/etl/switch";
-import { selectTaskList } from '@/api/task/task'
+import { addTask, selectTaskList, updateById } from '@/api/task/task'
 
 export default {
   //import引入的组件需要注入到对象中才能使用"
@@ -189,6 +208,7 @@ export default {
       taskReq:{
 
       },
+      taskAddReq:{},
       taskList:[],
     };
   },
@@ -198,6 +218,22 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    //添加页面展示
+    handleAdd(){
+      this.dialogFormVisible = true;
+    },
+
+    //添加任务
+    addTask(){
+      addTask(this.taskAddReq).then(res=>{
+        alert(res.msg)
+        if(res.code == 200){
+          location.reload();
+        }
+      });
+    },
+
+    //根据条件查询列表
     findSelectTaskList(){
       selectTaskList(this.taskReq).then(res=>{
         console.log(res.data);
@@ -206,7 +242,7 @@ export default {
       })
     },
 
-    insertAdd(){
+    updateById(){
 
     },