Merge branch 'master' of https://gitea.qinmian.online/TreeData/cloud-web

src/api/task/task.js

@@ -89,7 +89,7 @@ export function addTaskJoin(data) {
 //添加数据输出节点
 export function addTaskOutPut(data) {
   return request({
-    url: "/task/taskOutPut/addTaskOutPut",
+    url: "/task/taskOutPut/addTaskOutput",
     method: "POST",
     data:data
   })
@@ -104,6 +104,15 @@ export function executeTask(id) {
 }
 
 
+export function addNodeRule(data) {
+  return request({
+    url: "/task/nodeRule/addNodeRule/",
+    method: "POST",
+    data:data
+  })
+}
+
+
 
 
 

src/components/ImageUpload/index.vue

@@ -1,27 +1,27 @@
 <template>
   <div class="component-upload-image">
     <el-upload
-      ref="imageUpload"
+      multiple
       :action="uploadImgUrl"
+      list-type="picture-card"
+      :on-success="handleUploadSuccess"
       :before-upload="handleBeforeUpload"
-      :class="{hide: this.fileList.length >= this.limit}"
-      :file-list="fileList"
-      :headers="headers"
       :limit="limit"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
-      :on-preview="handlePictureCardPreview"
+      ref="imageUpload"
       :on-remove="handleDelete"
-      :on-success="handleUploadSuccess"
       :show-file-list="true"
-      list-type="picture-card"
+      :headers="headers"
-      multiple
+      :file-list="fileList"
+      :on-preview="handlePictureCardPreview"
+      :class="{hide: this.fileList.length >= this.limit}"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
 
     <!-- 上传提示 -->
-    <div v-if="showTip" slot="tip" class="el-upload__tip">
+    <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
       <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
       <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
@@ -30,9 +30,9 @@
 
     <el-dialog
       :visible.sync="dialogVisible"
-      append-to-body
       title="预览"
       width="800"
+      append-to-body
     >
       <img
         :src="dialogImageUrl"
@@ -149,13 +149,13 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
-      if (res.data.code === 200) {
+      if (res.code === 200) {
         this.uploadList.push({ name: res.data.url, url: res.data.url });
         this.uploadedSuccessfully();
       } else {
         this.number--;
         this.$modal.closeLoading();
-        this.$modal.msgError(res.data.msg);
+        this.$modal.msgError(res.msg);
         this.$refs.imageUpload.handleRemove(file);
         this.uploadedSuccessfully();
       }
@@ -202,12 +202,11 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
+<style scoped lang="scss">  //123
 // .el-upload--picture-card 控制加号部分
 ::v-deep.hide .el-upload--picture-card {
   display: none;
 }
-
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {

src/views/components/task/formData.vue

@@ -212,7 +212,7 @@ export default {
           "nodeId":this.nodeId,
           "nodeName":this.nodeName,
           "taskId":this.tableInfo.taskId,
-          "databaseId":this.tableInfo.parentId,
+          "databaseId":this.tableInfo.basicId,
           "tableName":this.tableInfo.tableName,
           "tableAsName":this.tableInfo.tableAsName,
           "tableField": this.tableInfo.tableField.substring(1),

src/views/components/task/formDataOut.vue

@@ -4,7 +4,7 @@
     <span v-if="taskDataOutPut">
       <el-button @click="nb"></el-button><br>
 
-      <span v-for="(outPut,index) in dataOutPut.tableField.split(',')">
+      <span v-for="(outPut,index) in dataOutPut.tableAsField.split(',')">
          <el-checkbox :label=outPut :value=outPut v-model="twoInputList">字段名： {{ outPut }} 字段别名：{{dataOutPut.tableField.split(',')[index]}}</el-checkbox><br>
       </span>
 
@@ -146,9 +146,15 @@ export default {
 
         console.log(this.oneNode)
       })
+      if(this.neighbors[0] !=null){
+
+      }
       findByNodeId(this.neighbors[1]).then(res=>{
+        if(res.data == null){
+          this.dataOutPut.tableField = this.oneNode.tableField
+          return;
+        }
         this.twoNode = res.data;
-        console.log(this.twoNode)
       })
 
       this.dataOutPut.tableField = this.oneNode.tableField + ',' + this.twoNode.tableField
@@ -164,6 +170,8 @@ export default {
 
     //选择要将数据存入的表中
     handleNodeClick(data) {
+      console.log('amanaman')
+      console.log(data)
       this.tableId = data.id
       this.basicId = data.basicId
       findStructureByTableId(data.id).then((res)=>{

src/views/components/task/formJoin.vue

@@ -99,12 +99,12 @@ export default {
     findAllTable(){
       findByNodeId(this.neighbors[0]).then(res=>{
         this.oneFieldList = res.data.tableAsField;
-        this.leftId = res.data.id;
+        this.leftId = res.data.nodeId;
         console.log(this.oneFieldList)
       })
       findByNodeId(this.neighbors[1]).then(res=>{
         this.twoFieldList = res.data.tableAsField;
-        this.rightId = res.data.id;
+        this.rightId = res.data.nodeId;
         console.log(this.twoFieldList)
       })
     },

src/views/port/port/assets.vue

@@ -51,17 +51,25 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作">
+      <el-table-column
+        label="购买次数"
+        width="180">
         <template slot-scope="scope">
-          <el-button
+          <span style="margin-left: 10px">{{ scope.row.textNumber }}</span>
-            size="mini"
-            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-          <el-button
-            size="mini"
-            type="danger"
-            @click="handleDelete(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>
+
+<!--      <el-table-column label="操作">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="danger"-->
+<!--            @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
   </div>
 </template>

src/views/port/port/index.vue

@@ -42,7 +42,7 @@
         width="180">
         <template slot-scope="scope">
           <!--          <image-preview :src="scope.row.connectorPicture" width="50" height="50"/>-->
-          <el-image style="width: 100px; height: 100px" :src="scope.row.connectorPicture" :fit="fit"></el-image>
+          <el-image style="width: 100px; height: 100px" :src="scope.row.connectorPicture"></el-image>
         </template>
       </el-table-column>
 
@@ -88,13 +88,13 @@
     </el-table>
     <!--  新增接口-->
     <el-dialog title="新增接口" :visible.sync="dialogFormVisible">
-      <el-form :model="form">
+      <el-form  ref="form" :model="form">
         <el-form-item label="接口名称" :label-width="formLabelWidth">
-          <el-input v-model="formLabelAlign.connectorName" autocomplete="off"></el-input>
+          <el-input v-model="form.connectorName" autocomplete="off"></el-input>
         </el-form-item>
 
         <el-form-item label="接口分类">
-          <el-select v-model="formLabelAlign.connectorSort" placeholder="请选择活动区域">
+          <el-select v-model="form.connectorSort" placeholder="请选择活动区域">
             <el-option label="生活服务" value="生活服务">生活服务</el-option>
             <el-option label="金融科技" value="金融科技">金融科技</el-option>
             <el-option label="数据智能" value="数据智能">数据智能</el-option>
@@ -107,11 +107,11 @@
         </el-form-item>
 
         <el-form-item label="接口描述" :label-width="formLabelWidth">
-          <el-input v-model="formLabelAlign.connectorDescribe" autocomplete="off"></el-input>
+          <el-input v-model="form.connectorDescribe" autocomplete="off"></el-input>
         </el-form-item>
 
         <el-form-item label="接口图片" :label-width="formLabelWidth">
-          <image-upload v-model="formLabelAlign.connectorPicture" autocomplete="off"/>
+          <image-upload v-model="form.connectorPicture" autocomplete="off"/>
         </el-form-item>
 
 
@@ -128,23 +128,23 @@
         <!--        </el-form-item>-->
 
         <el-form-item label="公司" :label-width="formLabelWidth">
-          <el-input v-model="formLabelAlign.connectorCompany" autocomplete="off"></el-input>
+          <el-input v-model="form.connectorCompany" autocomplete="off"></el-input>
         </el-form-item>
 
         <el-form-item label="价格" :label-width="formLabelWidth">
-          <el-input v-model="formLabelAlign.connectorPrice" autocomplete="off"></el-input>
+          <el-input v-model="form.connectorPrice" autocomplete="off"></el-input>
         </el-form-item>
 
         <el-form-item label="API_URL" :label-width="formLabelWidth">
-          <el-input v-model="formLabelAlign.connectorApiurl" autocomplete="off"></el-input>
+          <el-input v-model="form.connectorApiurl" autocomplete="off"></el-input>
         </el-form-item>
 
         <el-form-item label="API_EYE" :label-width="formLabelWidth">
-          <el-input v-model="formLabelAlign.connectorApikey" autocomplete="off"></el-input>
+          <el-input v-model="form.connectorApikey" autocomplete="off"></el-input>
         </el-form-item>
 
         <el-form-item label="请求方式" :label-width="formLabelWidth">
-          <el-input v-model="formLabelAlign.connectorRequest" autocomplete="off"></el-input>
+          <el-input v-model="form.connectorRequest" autocomplete="off"></el-input>
         </el-form-item>
 
       </el-form>
@@ -173,7 +173,6 @@
         </el-form-item>
 
 
-
         <el-form-item label="接口图片" :label-width="formLabelWidth">
           <image-upload v-model="formInline.connectorPicture" autocomplete="off"></image-upload>
         </el-form-item>
@@ -225,6 +224,7 @@ import {findConnectorList} from "@/api/port/port";
 import {addConnector} from "@/api/port/port";
 import {getDeleteConnector} from "@/api/port/port";
 import {updateConnector} from "@/api/port/port";
+
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},
@@ -235,8 +235,8 @@ export default {
       formInline: {},
       form: {},
       tableData: [],
-      formLabelWidth:180, //表单宽度
       formLabelAlign: {},
+      formLabelWidth: "120px",
       dialogFormVisible: false,
       dialogFormVisible1: false,
     };
@@ -269,7 +269,7 @@ export default {
       })
     },
     addConnector() {
-      addConnector(this.formLabelAlign).then((res) => {
+      addConnector(this.form).then((res) => {
         alert(res.msg);
         if (200 == res.code) {
           this.findConnectorList();

src/views/task/task/index.vue

@@ -146,10 +146,10 @@
         <el-form-item label="优先级选择">
           <el-select v-model="taskReq.weigh" placeholder="请选择等级">
             <el-option label="请选择" value=""></el-option>
-            <el-option label="紧急" value="1"></el-option>
+            <el-option label="低" value="1"></el-option>
-            <el-option label="低" value="2"></el-option>
+            <el-option label="中" value="2"></el-option>
-            <el-option label="中" value="3"></el-option>
+            <el-option label="高" value="3"></el-option>
-            <el-option label="高" value="4"></el-option>
+            <el-option label="紧急" value="4"></el-option>
           </el-select>
         </el-form-item>