Merge remote-tracking branch 'origin/master'

src/api/task/task.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 //查询规则引擎列表
-export function selectEngineList(data){
+export function selectTaskList(data){
   return request({
     url: "/task/task/list",
     method: "get",

src/views/engine/engine/index.vue

@@ -106,7 +106,7 @@
 
       <el-table-column label="编号" prop="id"></el-table-column>
       <el-table-column label="名称" prop="name"></el-table-column>
-      <el-table-column label="类型" prop="type">
+      <el-table-column label="类型" style="color: #13ce66" prop="type">
         <template v-slot="scope">
           <span v-if="scope.row.type==1">数据字段</span>
           <span v-if="scope.row.type==2">基本类型</span>
@@ -114,7 +114,7 @@
           <span v-if="scope.row.type==4">普通类型</span>
         </template>
       </el-table-column>
-      <el-table-column label="作用域" prop="scope">
+      <el-table-column label="作用域"  style="color: blue" prop="scope">
         <template v-slot="scope">
           <span v-if="scope.row.scope==1">数据字段</span>
           <span v-if="scope.row.scope==2">记录</span>
@@ -124,13 +124,13 @@
         </template>
       </el-table-column>
       <el-table-column label="引擎编码" prop="engineCode"></el-table-column>
-      <el-table-column label="是否激活" prop="isActivate">
+      <el-table-column label="是否激活" style="color: red" prop="isActivate">
         <template v-slot="scope">
           <span v-if="scope.row.isActivate==1">已激活</span>
           <span v-if="scope.row.isActivate==2">未激活</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" prop="status">
+      <el-table-column label="状态"  style="color: #787be8" prop="status">
 
         <template v-slot="scope">
           <span v-if="scope.row.status==1">开启</span>
@@ -196,9 +196,9 @@ export default {
       // SourceReq:{
       //
       // },
-      // engine:{
+      engine:{
-      //
+
-      // },
+      },
       arr:[],
     };
   },

src/views/task/task/index.vue

@@ -1,247 +1,177 @@
 <template>
-  <div class="app-container">
+  <div>
-    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
+
-      <el-form-item label="客户名称" prop="appName">
+    <el-form  label-width="80px" :model="taskReq" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
-        <el-input
+      <el-form-item label="任务包含名称">
-          v-model="queryParams.appName"
+        <el-input v-model="taskReq.taskName"></el-input>
-          clearable
-          placeholder="请输入客户名称"
-          style="width: 240px"
-          @keyup.enter.native="getList"
-        />
       </el-form-item>
-      <el-form-item label="客户编码" prop="appCode">
+      <el-form-item label="优先级选择">
-        <el-input
+        <el-select v-model="taskReq.weigh" placeholder="请选择等级">
-          v-model="queryParams.appCode"
+          <el-option label="请选择" value=""></el-option>
-          clearable
+          <el-option label="紧急" value="1"></el-option>
-          placeholder="请输入客户编码"
+          <el-option label="低" value="2"></el-option>
-          style="width: 240px"
+          <el-option label="中" value="3"></el-option>
-          @keyup.enter.native="getList"
+          <el-option label="高" value="4"></el-option>
-        />
-      </el-form-item>
-      <el-form-item label="客户状态" prop="configType">
-        <el-select v-model="queryParams.status" clearable placeholder="客户状态">
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
-
+      <el-form-item label="任务执行状态">
-      <el-form-item>
+        <el-option label="请选择" value=""></el-option>
-        <el-button icon="el-icon-search" size="mini" type="primary" @click="getList">搜索</el-button>
+        <el-option label="待执行" value="0"></el-option>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-option label="正在执行" value="1"></el-option>
+        <el-option label="执行完毕" value="2"></el-option>
       </el-form-item>
+      <el-button @click="findSelectTaskList()">
+        查询
+      </el-button>
     </el-form>
 
 
-    <el-row :gutter="10" class="mb8">
+    <!--    <el-button-->
-      <el-col :span="1.5">
+    <!--      v-hasPermi="['system:user:remove']"-->
-        <el-button
+    <!--      icon="el-icon-delete"-->
-          v-hasPermi="['system:config:add']"
+    <!--      size="mini"-->
-          icon="el-icon-plus"
+    <!--      type="text"-->
-          plain
+    <!--      @click="handleDelete(scope.row)"-->
-          size="mini"
+    <!--    >删除-->
-          type="primary"
+    <!--    </el-button>-->
-          @click="handleAdd"
-        >新增
-        </el-button>
-      </el-col>
 
-      <el-col :span="1.5">
     <el-button
-          v-hasPermi="['system:config:export']"
+      v-hasPermi="['tool:gen:import']"
-          icon="el-icon-download"
+      icon="el-icon-upload"
       plain
       size="mini"
-          type="warning"
+      type="info"
-          @click="handleExport"
+      @click="findSelectSourceExport"
     >导出
     </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-row :gutter="10">
-      <el-empty description="暂无支付客户" v-if="customerList.length === 0"></el-empty>
-      <el-col :span="8" v-for="customer in customerList" v-if="customerList.length !== 0">
-
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span style="font-size: 18px;font-weight: 900">{{ customer.appName }}</span>
-            <el-switch
-              style="float: right; margin: 4px 5px 0;"
-              v-model="customer.status"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-              active-value="Y"
-              inactive-value="N"
-              @change="handleStatusChange(customer)"
-            >
-            </el-switch>
-
-            <el-popconfirm
-              confirm-button-text='好的'
-              cancel-button-text='不用了'
-              icon="el-icon-info"
-              icon-color="red"
-              title="这是一段内容确定删除吗？"
-              @confirm="handleDelete(customer.id)"
-            >
-              <el-button style="float: right; padding: 5px ;margin: 0 5px" slot="reference" type="danger" icon="el-icon-delete" circle ></el-button>
-            </el-popconfirm>
-
-            <el-button style="float: right; padding: 5px ;margin: 0 5px"  type="primary" icon="el-icon-edit" @click="handleUpdate(customer.id)"circle></el-button>
 
 
+    <el-button
+      icon="el-icon-delete"
+      plain
+      size="mini"
+      type="danger"
+      @click="insertAdd()"
+    >新增
+    </el-button>
 
 
-          </div>
+    <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">
-          <div>
-            <el-descriptions class="margin-top" :column="1" :size="size" border>
 
-              <el-descriptions-item>
+      <el-form :model="sourceAddReq">
-                <template slot="label"><i class="el-icon-user"></i>客户名称</template>
+        <el-form-item label="id">
-                {{ customer.appName }}
+          <el-input v-model="sourceAddReq.dataResourceName"></el-input>
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-user"></i>客户编码</template>
-                {{ customer.appCode }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-user"></i>创建人</template>
-                {{ customer.createBy }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-user"></i>创建日期</template>
-                {{ customer.createTime }}
-              </el-descriptions-item>
-            </el-descriptions>
-            <el-divider content-position="left">近5笔交易记录</el-divider>
-            <el-table
-              :data="customer.orderPaySimpleRespList"
-              style="width: 100%">
-              <el-table-column prop="cusOrderNumber" label="客户单号"></el-table-column>
-              <el-table-column prop="price" label="支付金额"></el-table-column>
-              <el-table-column prop="channelTypeName" label="渠道商"></el-table-column>
-            </el-table>
-
-          </div>
-
-
-        </el-card>
-      </el-col>
-    </el-row>
-
-
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="50%">
-
-      <el-form ref="form" :model="form" label-width="120px" :rules="rules">
-
-        <el-form-item label="客户编码" prop="appCode">
-          <span v-if="this.form.id !=null" style="font-size: 16px">{{form.appCode}}</span>
-          <el-select v-if="this.form.id == null" v-model="form.appCode" placeholder="请选择未入住的客户" style="width: 100%">
-            <el-option
-              v-for="item in appCodeList"
-              :key="item"
-              :label="item"
-              :value="item">
-            </el-option>
-          </el-select>
         </el-form-item>
-        <el-form-item label="客户名称" prop="appName">
+        <el-form-item label="任务名称">
-          <el-input v-model="form.appName"></el-input>
+          <el-input v-model="sourceAddReq.dataSourcesSystemName"></el-input>
         </el-form-item>
-        <el-form-item label="是否激活开通" prop="status">
+        <el-form-item label="任务执行状态">
-          <el-radio-group v-model="form.status">
+          <el-input v-model="sourceAddReq.host"></el-input>
-            <el-radio
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.value"
-            >{{ dict.label }}
-            </el-radio>
-          </el-radio-group>
         </el-form-item>
-        <el-form-item label="详细描述">
+        <el-form-item label="任务完成度">
-          <el-input v-model="form.appDesc" type="textarea"></el-input>
+          <el-input v-model="sourceAddReq.port"></el-input>
         </el-form-item>
-
+        <el-form-item label="操作">
-        <el-form-item label="客户备注">
+          <el-input v-model="sourceAddReq.databaseType"></el-input>
-
-          <editor v-model="form.remark" :min-height="192"/>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
-    <el-button @click="open = false">取 消</el-button>
-    <el-button type="primary"  @click="submitForm">提 交</el-button>
-  </span>
     </el-dialog>
 
 
 
 
+
+
+    <el-table
+      :data="source"
+      style="width: 100%"
+
+      @selection-change="handleSelectionChange">
+
+      <el-table-column
+        type="selection"
+        width="55">
+      </el-table-column>
+
+
+      <el-table-column
+        label="id"
+        prop="dataResourceName">
+      </el-table-column>
+
+      <el-table-column
+        label="任务名称"
+        prop="dataSourcesSystemName">
+      </el-table-column>
+
+      <el-table-column
+        label="任务权重级别"
+        prop="host">
+      </el-table-column>
+
+      <el-table-column
+        label="人物执行状态"
+        prop="port">
+      </el-table-column>
+
+      <el-table-column
+        label="任务完成度"
+        prop="databaseType">
+      </el-table-column>
+
+
+      <el-table-column
+        align="right">
+        <template slot-scope="scope">
+          <el-button
+            icon="el-icon-pear"
+            size="mini"
+            type="text"
+            @click="update(scope.row)">执行</el-button>
+
+          <el-button
+            icon="el-icon-delete"
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+
+      </el-table-column>
+
+    </el-table>
+
+
+
+
+
+
+
   </div>
 </template>
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
-import {selectList, customerAll, update, save, get, del, enable,disable} from "@/api/pay/customer";
+import {selectSourceList} from "@/api/etl/switch";
-
+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'
 
 export default {
-  name: "Customer",
-  dicts: ['sys_yes_no'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
   data() {
     //这里存放数据"
+
     return {
-      //未入住客户
+      dialogFormVisible:false,
-      appCodeList:["cloud-1","cloud-2","cloud-3"],
+      taskReq:{
-      //模态框标题
-      title:"",
-      //表单内容
-      form:{
-        appName: "",
-        appCode: "",
-        appDesc: "",
-        status: "Y",
-        remark: ""
-      },
-      //修改和添加弹框
-      open:false,
-      switchValue:true,
-      // 显示搜索条件
-      showSearch: true,
-      //查询条件
-      queryParams: {
-        appName: "",
-        appCode: "",
-        status: "Y"
-      },
 
-      rules: {
-        appCode: [
-          {required: true, message: "请选择客户编码", trigger: "change"}
-        ],
-        appName: [
-          {required: true, message: "客户名称不能为空", trigger: "blur"}
-        ],
-        status: [
-          {required: true, message: "请选择客户是否开通", trigger: "blur"}
-        ]
       },
-      //客户列表
+      taskList:[],
-      customerList:[],
-
-
     };
   },
   //计算属性 类似于data概念",
@@ -250,97 +180,28 @@ export default {
   watch: {},
   //方法集合",
   methods: {
-    /** 客户状态更改触发 */
+    textP(){
-    handleStatusChange(row){
+      connectionTest(this.sourceAddReq).then(res=>{
-      console.log(row)
+        if (res.code===200){
-      if (row.status === "Y"){
+          alert("测试连接成功")
-        enable(row.id).then((res)=>{
-          this.$modal.msgSuccess("启用成功")
-          this.getList()
-        })
         }else{
-        disable(row.id).then((res)=>{
+          alert("连接失败")
-          this.$modal.msgSuccess("禁用成功")
-          this.getList()
-        })
         }
-    },
-
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加支付单客户信息";
-    },
-
-    /** 删除按钮操作*/
-    handleDelete(orderCustomerId) {
-      del(orderCustomerId).then((res)=>{
-        this.$modal.msgSuccess("删除成功")
-        this.getList()
       })
     },
-    /** 修改按钮操作 */
+    //测试连接
-    handleUpdate(orderCustomerId) {
+    findSelectTaskList(){
-      this.reset();
+      selectTaskList(this.taskReq).then(res=>{
-      get(orderCustomerId).then((res)=>{
+        this.taskList=res.data.rows;
-        this.form=res.data
-        this.open = true;
-        this.title = "修改支付单客户信息";
       })
     },
-    /** 重置按钮操作 */
+    handleSelectionChange(row){
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.getList();
-    },
-    //搜索
-    getList(){
-      selectList(this.queryParams).then((res)=>{
-        this.customerList=res.data
-      })
-    },
-    reset() {
-      this.form = {
-        "appName": "",
-        "appCode": "",
-        "appDesc": "",
-        "status": "Y",
-        "remark": ""
-      };
-      this.resetForm("form");
-      this.appCodeList = [];
-      customerAll().then((res)=>{
-        this.appCodeList = res.data
-      })
 
     },
-
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            update(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            save(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
-    this.getList()
+    this.findSelectSourceList();
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {
@@ -363,8 +224,4 @@ export default {
 </script>
 <style scoped>
 
-.el-card{
-  margin: 10px 0;
-}
-
 </style>