测试

# Conflicts:
#	src/views/market/orders/index.vue

src/api/background/apimanage.js

@@ -47,10 +47,3 @@ export function delapi(productId){
   })
 }
 
-export function getprice(productId){
-  return request({
-    url:"/background/apimanage/getprice/"+productId,
-    method: "POST",
-  })
-}
-

src/api/market/orders.js

@@ -71,10 +71,14 @@ export function getOut(){
 
 export function updateByordersState1(data){
   return request({
-
-
-
     url:"/market/orders/updateByordersState1",
+    method: "GET",
+    data: data
+  })}
+
+export function listreclaim(data){
+  return request({
+    url:"/market/orders/listreclaim",
     method: "POST",
     data: data
   })}

src/api/market/workbench.js

@@ -7,12 +7,3 @@ export function gethostportList(){
     method: "GET",
   })
 }
-
-export function getcompany(){
-  return request({
-    url:"/market/company/selectcompany",
-    method: "POST",
-  })
-}
-
-

src/router/index.js

@@ -148,31 +148,7 @@ export const constantRoutes = [
         path: 'index',
         name: 'apiupdmessage',
         component: () => import('@/views/background/apiupdmessage/index.vue'),
-        meta: { title: '接口信息修改页面', icon: 'form' }
+        meta: { title: '接口列表', icon: 'form' }
-      }
-    ]
-  },
-  {
-    path: '/product',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        name: 'product',
-        component: () => import('@/views/market/product/index.vue'),
-        meta: { title: '数据块', icon: 'form' }
-      }
-    ]
-  },
-  {
-    path: '/Workbench',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        name: 'Workbench',
-        component: () => import('@/views/market/workbench/index.vue'),
-        meta: { title: '信息', icon: 'form' }
       }
     ]
   },

src/views/background/apimanage/index.vue

@@ -116,12 +116,10 @@
       :total="total">
     </el-pagination>
 
-
-    <!--新增对话框-->
     <el-dialog
-      title="新增接口"
+      title="提示"
       :visible.sync="dialogVisible"
-      width="60%"
+      width="30%"
       :before-close="handleClose">
       <center>
         <el-form :model="api" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
@@ -134,6 +132,9 @@
           <el-form-item label="接口描述" prop="productContent" style="width: 70%">
             <el-input type="text" v-model="api.productContent" autocomplete="off"></el-input>
           </el-form-item>
+          <el-form-item label="接口价格" prop="productPrice" style="width: 70%">
+            <el-input type="text" v-model="api.productPrice" autocomplete="off"></el-input>
+          </el-form-item>
           <el-form-item label="接口来源" prop="productFrom" style="width: 70%">
             <el-input type="text" v-model="api.productFrom" autocomplete="off"></el-input>
           </el-form-item>
@@ -149,28 +150,6 @@
           <el-form-item label="请求方式" prop="requestMethod" style="width: 70%">
             <el-input type="text" v-model="api.requestMethod" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="选择默认规格" prop="requestMethod" style="width: 70%">
-            <el-select v-model="api.productSpecification" placeholder="请选择默认规格">
-              <el-option label="按次查询" value="按次查询"></el-option>
-              <el-option label="包日" value="包日"></el-option>
-              <el-option label="包月" value="包月"></el-option>
-              <el-option label="包年" value="包年"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-divider></el-divider>
-          <span>价格</span>
-          <el-form-item label="按次查询" prop="requestMethod" style="width: 70%">
-            <el-input type="text" v-model="api.timemoney" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="包日" prop="requestMethod" style="width: 70%">
-            <el-input type="text" v-model="api.daymoney" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="包月" prop="requestMethod" style="width: 70%">
-            <el-input type="text" v-model="api.monthmoney" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="包年" prop="requestMethod" style="width: 70%">
-            <el-input type="text" v-model="api.yearmoney" autocomplete="off"></el-input>
-          </el-form-item>
         </el-form>
       </center>
       <span slot="footer" class="dialog-footer">
@@ -192,13 +171,14 @@
 //例如：import 《组件名称》 from '《组件路径》,
 import {
   addproduct,
-  delapi, getprice,
+  delapi,
+  productStateLis,
+  productStateList,
   selectapiList,
   UpdproductState
 } from "@/api/background/apimanage";
 import {resetForm} from "@/utils/muyu";
 import {add} from "lodash/math";
-import api from "js-cookie";
 
 export default {
     name: "Apimanage",
@@ -209,13 +189,6 @@ export default {
       //这里存放数据"
       return {
         tableData:[],
-        moneyData:[],
-        money:{
-          timemoney:'',
-          daymoney:'',
-          monthmoney:'',
-          yearmoney:''
-        },
         ruleForm:{
           pageNum:1,
           pageSize:9,
@@ -280,21 +253,7 @@ export default {
       },
       //修改
       handleEdit(row){
-        //查询中间表，获取不同规格对应的价格
+        this.$router.push({path:"/apiupdmessage/index",query:{api:row}})
-        getprice(row.productId).then(response=>{
-          this.moneyData=response.data
-            this.money.timemoney=this.moneyData[0].middlePrice
-            this.money.daymoney=this.moneyData[1].middlePrice
-            this.money.monthmoney=this.moneyData[2].middlePrice
-            this.money.yearmoney=this.moneyData[3].middlePrice
-          row.timemoney = this.money.timemoney;
-          row.daymoney = this.money.daymoney;
-          row.monthmoney = this.money.monthmoney;
-          row.yearmoney = this.money.yearmoney;
-          this.$router.push({path:"/apiupdmessage/index",query:{api:row}})
-        })
-
-
       },
       //删除
       handleDelete(row){

src/views/background/apiupdmessage/index.vue

@@ -20,6 +20,9 @@
         <el-form-item label="接口销量" prop="productSales" style="width: 70%">
           <el-input type="text" v-model="api.productSales" autocomplete="off"></el-input>
         </el-form-item>
+        <el-form-item label="接口价格" prop="productPrice" style="width: 70%">
+          <el-input type="text" v-model="api.productPrice" autocomplete="off"></el-input>
+        </el-form-item>
         <el-form-item label="接口来源" prop="productFrom" style="width: 70%">
           <el-input type="text" v-model="api.productFrom" autocomplete="off"></el-input>
         </el-form-item>
@@ -35,28 +38,6 @@
         <el-form-item label="请求方式" prop="requestMethod" style="width: 70%">
           <el-input type="text" v-model="api.requestMethod" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="选择默认规格" prop="requestMethod" style="width: 70%">
-          <el-select v-model="api.productSpecification" placeholder="请选择默认规格">
-            <el-option label="按次查询" value="按次查询"></el-option>
-            <el-option label="包日" value="包日"></el-option>
-            <el-option label="包月" value="包月"></el-option>
-            <el-option label="包年" value="包年"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-divider></el-divider>
-        <span>价格</span>
-        <el-form-item label="按次查询" prop="requestMethod" style="width: 70%">
-          <el-input type="text" v-model="api.timemoney" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="包日" prop="requestMethod" style="width: 70%">
-          <el-input type="text" v-model="api.daymoney" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="包月" prop="requestMethod" style="width: 70%">
-          <el-input type="text" v-model="api.monthmoney" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="包年" prop="requestMethod" style="width: 70%">
-          <el-input type="text" v-model="api.yearmoney" autocomplete="off"></el-input>
-        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm(api)">修改</el-button>
           <el-button @click="resetForm('ruleForm')">重置</el-button>

src/views/components/task/index.vue

@@ -1,12 +1,6 @@
 <template>
   <div>
-    <div>
+     <span>
-      <el-dialog
-        title="提示"
-        :visible.sync="dialogVisible"
-        width="30%"
-      >
-      <span>
           <el-radio-group v-model="labelPosition" size="small">
           <el-radio-button label="left">左对齐</el-radio-button>
           <el-radio-button label="right">右对齐</el-radio-button>
@@ -15,7 +9,7 @@
         <div style="margin: 20px;"></div>
         <el-form :label-position="labelPosition" label-width="80px" :model="tableMsg">
           <el-form-item label="任务id">
-            <el-input v-model="tableMsg.id" :disabled="true"></el-input>
+            <el-input v-model="tableMsg.taskId" :disabled="true"></el-input>
           </el-form-item>
           <el-form-item label="数据库id">
             <el-input v-model="tableMsg.databaseId" :disabled="true"></el-input>
@@ -24,41 +18,104 @@
                   <el-cascader
                     v-model="tableMsg.tableName"
                     :options="tables"
-                    :props="{ expandTrigger: 'hover',value:'id',label:'name',children:'tableNames' }"
+                    :props="{ expandTrigger: 'hover',value:'name',label:'name',children:'tableNames' }"
                     @change="handleChange"></el-cascader>
           </el-form-item>
           <el-form-item label="表别名">
-            <el-input v-model="tableMsg.tableAsField"></el-input>
+            <el-input v-model="tableMsg.tableAsName"></el-input>
           </el-form-item>
         </el-form>
       </span>
-        <span slot="footer" class="dialog-footer">
+    <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible = false">取 消</el-button>
-    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    <el-button type="primary" @click="nextOne()">下一步</el-button>
   </span>
-      </el-dialog>
+
-    </div>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible1"
+      width="65%"
+    >
+      <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="ID" width="120">
+          <template slot-scope="scope">{{ scope.row.id }}</template>
+        </el-table-column>
+        <el-table-column prop="field" label="字段名称" width="120"/>
+        <el-table-column prop="type" label="字段类型" width="120"/>
+        <el-table-column prop="collation" label="编码格式" width="120"/>
+        <el-table-column prop="nullable" label="是否为空" width="120"/>
+        <el-table-column prop="primarys" label="主键" width="120"/>
+        <el-table-column prop="annotation" label="注释" width="120"/>
+        <el-table-column label="表别名" width="120">
+          <template slot-scope="scope">{{ scope.row.dataField }}</template>
+        </el-table-column>
+        <el-table-column label="规则" width="120">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.fieldEngineId" placeholder="无规则">
+              <el-option label="无规则" value="1"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible1 = false">取 消</el-button>
+    <el-button type="primary" @click="doSure()">确 定</el-button>
+  </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
-import {extractDataName} from "../../../api/etl/etl";
+import {addTableField, addTaskInfo, extractDataName, selectByTableName} from "../../../api/etl/etl";
+import node from "../../../components/ef/node.vue";
 
 export default {
   name: "task",
   //import引入的组件需要注入到对象中才能使用"
   components: {},
-  props: {},
+  props: ['nodesIds'],
   data() {
     //这里存放数据"
 
     return {
+      allFields:{
+        taskId: this.$route.query.id,
+        nodeId: this.nodesIds,
+        field:"",
+        asField:"",
+        isNull:"",
+        comment:""
+      },
+      tableData:[],
+      dataForm:true,
+      dialogVisible1: false,
+      tables:{},
+      tableMsg:{
+        //nodeId
+        nodeId: this.nodesIds,
+        //任务ID
+        taskId: this.$route.query.id,
+        //数据库ID
+        databaseId:"",
+        //表名
+        tableName:"",
+        //字段名
+        tableField:"",
+        //表别名
+        tableAsName:"",
+        //表别名字段
+        tableAsField:"",
+        //规则
+        fieldEngineId:""
+      },
       labelPosition: 'right',
       dialogVisible:false,
-      tableMsg:{},
+      multipleSelection: [],
-      tables:{}
+      fields:[]
     };
   },
   //计算属性 类似于data概念",
@@ -67,19 +124,66 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    doSure(){
+      this.dialogVisible1 = false
+      this.$emit('taskInputForm', false);
+      this.tableMsg.taskId = this.$route.query.id
+      let detailData = [...new Set(this.multipleSelection)]
+      this.tableMsg.tableAsField = detailData.join(',');
+
+      this.fields.forEach(item => {
+          this.allFields.asField = item.dataField
+          this.allFields.field = item.field
+          this.allFields.isNull = item.nullable
+          this.allFields.comment = item.annotation
+          addTableField(this.allFields).then(res => {
+            console.log(res);
+          })
+      })
+      addTaskInfo(this.tableMsg).then(res =>{
+        if (res.code == 200){
+          this.$message.success("节点安置成功")
+        }
+      })
+
+    },
+    handleSelectionChange(val) {
+      this.fields = val
+      val.forEach(res =>{
+        this.multipleSelection.push(res.dataField);
+      })
+      console.log(this.fields);
+    },
+
+    nextOne(){
+      let tableName = this.tableMsg.tableName.toString();
+      selectByTableName(tableName).then(res => {
+        this.dialogVisible1 = true
+        this.tableData = res.data
+        this.tableData.forEach(item => {
+          this.tableMsg.tableField += ","+item.field
+        })
+        this.tableMsg.tableField = this.tableMsg.tableField.substring(1)
+        res.data.forEach(response => {
+          response.dataField = this.tableMsg.tableAsName+"_"+response.field
+        })
+
+      })
+    },
     handleChange(value) {
-      console.log(value);
+      this.tableMsg.databaseId = value[0]
+      this.tableMsg.tableName = value[1]
     },
     getDatabaseMessage(){
       this.dialogVisible = true
       extractDataName().then(res => {
-        console.log(res);
         this.tables = res.data
       })
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
+    this.getDatabaseMessage()
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {

src/views/etl/task/index.vue

@@ -80,13 +80,9 @@
 
       <el-table-column label="操作" width="300">
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑节点</el-button>
-              size="mini"
+          <el-button size="mini" @click="todoTask(scope.$index, scope.row)">执行任务</el-button>
-              @click="handleEdit(scope.$index, scope.row)">编辑节点</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(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>
@@ -121,7 +117,7 @@
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
-import {addTask, delTask, showTask} from "../../../api/etl/etl";
+import {addTask, delTask, showTask, todoTask} from "../../../api/etl/etl";
 
 export default {
   name: "Task",
@@ -149,6 +145,15 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    todoTask(index,row){
+      todoTask(row.id).then(res => {
+        if (res.code == 200){
+          this.$message.success("操作成功")
+        }else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     onSubmit(){
        this.getData()
     },
@@ -172,8 +177,7 @@ export default {
        })
     },
     handleEdit(index, row) {
-        let url = `http://21.12.0.10/easyFlow`
+       this.$router.push({path:"/etl/active",query:{"id":row.id}})
-       window.open(url,"_blank")
     },
     handleDelete(index, row) {
       console.log(index, row);

src/views/etl/task/taskInfo.vue

@@ -15,90 +15,152 @@
         <div id="container" />
       </div>
     </div>
-    <el-dialog
+    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
-      title="提示"
+      <task v-if="taskOpen" @taskInputForm="findFormValue" :nodes-ids="nodesIds"/>
-      :visible.sync="dialogVisible"
+    </el-dialog>
-      width="30%"
+
-      >
+    <el-dialog title="提示" :visible.sync="dialogVisible1" width="30%">
-      <span>
+      <el-table :data="nodeList" style="width: 100%">
-          <el-radio-group v-model="labelPosition" size="small">
+        <el-table-column prop="databaseId" label="数据库" width="180"></el-table-column>
-          <el-radio-button label="left">左对齐</el-radio-button>
+        <el-table-column prop="tableAsName" label="表别名" width="180"></el-table-column>
-          <el-radio-button label="right">右对齐</el-radio-button>
+      </el-table>
-          <el-radio-button label="top">顶部对齐</el-radio-button>
+      <div style="margin: 20px;"></div>
-        </el-radio-group>
+      <el-form label-width="80px" :model="joinCheck">
-        <div style="margin: 20px;"></div>
+        <el-form-item label="联查方式">
-        <el-form :label-position="labelPosition" label-width="80px" :model="tableMsg">
+          <el-select v-model="joinCheck.joinId" placeholder="联查方式">
-          <el-form-item label="任务id">
+            <el-option label="左联查" value="1"></el-option>
-            <el-input v-model="tableMsg.id" :disabled="true"></el-input>
+            <el-option label="右联查" value="2"></el-option>
-          </el-form-item>
+            <el-option label="内联查" value="3"></el-option>
-          <el-form-item label="数据库id">
+          </el-select>
-            <el-input v-model="tableMsg.databaseId" :disabled="true"></el-input>
+        </el-form-item>
-          </el-form-item>
+        <el-form-item>
-          <el-form-item label="数据表">
+            <el-select v-model="joinCheck.firstCloumn" placeholder="请选择关联字段">
-                  <el-cascader
+              <el-option
-                    v-model="tableMsg.tableName"
+                v-for="item in options1"
-                    :options="tables"
+                :key="item.nodeMsg"
-                    :props="{ expandTrigger: 'hover',value:'name',label:'name',children:'tableNames' }"
+                :label="item.nodeMsg"
-                    @change="handleChange"></el-cascader>
+                :value="item.nodeMsg">
-          </el-form-item>
+              </el-option>
-          <el-form-item label="表别名">
+            </el-select>
-            <el-input v-model="tableMsg.tableAsField"></el-input>
+        </el-form-item>
-          </el-form-item>
+        <el-form-item>
-        </el-form>
+          <el-select v-model="joinCheck.secondCloumn" placeholder="请选择关联字段">
-      </span>
+            <el-option
+              v-for="item in options2"
+              :key="item.nodeMsg"
+              :label="item.nodeMsg"
+              :value="item.nodeMsg">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button @click="dialogVisible1 = false">取 消</el-button>
-    <el-button type="primary" @click="nextOne()">下一步</el-button>
+    <el-button type="primary" @click="todoSelect">确 定</el-button>
   </span>
     </el-dialog>
 
     <el-dialog
       title="提示"
-      :visible.sync="dialogVisible1"
+      :visible.sync="dialogVisible2"
-      width="30%"
+      width="40%"
       >
-      <el-table
+      <el-table ref="multipleTable" :data="fields" tooltip-effect="dark" style="width: 100%"
-        ref="multipleTable"
+        @selection-change="SelectionChange">
-        :data="tableData"
+        <el-table-column type="selection" width="55"/>
-        tooltip-effect="dark"
+        <el-table-column label="字段" width="120"><template slot-scope="scope">{{ scope.row.field }}</template></el-table-column>
-        style="width: 100%"
+        <el-table-column label="别名" width="120"><template slot-scope="scope">{{ scope.row.asField }}</template></el-table-column>
-        @selection-change="handleSelectionChange">
+        <el-table-column label="非空" width="120"><template slot-scope="scope">{{ scope.row.isNull }}</template></el-table-column>
-        <el-table-column
+        <el-table-column label="注释" width="120"><template slot-scope="scope">{{ scope.row.comment }}</template></el-table-column>
-          type="selection"
+      </el-table>
-          width="55">
+      <br>
+      <el-cascader
+        v-model="toTable"
+        :options="tt"
+        :props="{ expandTrigger: 'hover',value:'name',label:'name',children:'tableNames' }"
+        @change="handleChange"></el-cascader>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible2 = false">取 消</el-button>
+    <el-button type="primary" @click="showTableFields">确 定</el-button>
+  </span>
+    </el-dialog>
+
+    <el-dialog title="提示" :visible.sync="finalVisible" width="30%">
+      <el-table ref="multipleTable" :data="sqlList" tooltip-effect="dark" style="width: 100%"
+                @selection-change="SelectionChange">
+        <el-table-column label="输入字段" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.asField }}
+          </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="输出字段" width="120">
-          label="日期"
+          <el-select v-model="cloumns" placeholder="请选择">
-          width="120">
+            <el-option
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+              v-for="item in options"
-        </el-table-column>
+              :key="item.id"
-        <el-table-column
+              :label="item.field"
-          prop="name"
+              :value="item.field">
-          label="姓名"
+            </el-option>
-          width="120">
+          </el-select>
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="地址"
-          show-overflow-tooltip>
         </el-table-column>
       </el-table>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible1 = false">取 消</el-button>
+          <el-button @click="finalVisible = false">取 消</el-button>
-    <el-button type="primary" @click="dialogVisible1 = false">确 定</el-button>
+          <el-button type="primary" @click="addSql">确 定</el-button>
-  </span>
+        </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { Graph } from "@antv/x6";
-import {extractDataName, selectByTableName} from "../../../api/etl/etl";
+import {
-
+  addOutPut,
+  addSelect,
+  extractDataName, findBySelectId,
+  seeTableField, selectByAsField,
+  selectByNodeId,
+  selectByOne, selectByTableName,
+} from "../../../api/etl/etl";
+import task from "/src/views/components/task/index.vue"
 export default {
   name: "antvX6",
+  components:{
+    task
+  },
   data() {
     return {
+      sourceField:[],
+      outPuter:{
+        nodeId:"",
+        taskId:"",
+        tableFields:"",
+        tableAsFields:"",
+        targetDatabase:"",
+        targetTableName:""
+      },
+      options:{},
+      sqlList:[],
+      toTable:"",
+      tt:{},
+      fields:[],
+      finalVisible:false,
+      dialogVisible2:false,
+      options1:{},
+      options2:{},
+      nodeList:[],
+      neighbors:[],
+      nodesIds:"",
+      taskOpen:false,
+      joinCheck:{
+         nodeId:"",
+         joinId:"",
+         leftNodeId:"",
+         rightNodeId:"",
+         firstCloumn:"",
+         secondCloumn:""
+      },
+      asFields:[],
       tableData:[],
       dialogVisible1: false,
       tables:{},
@@ -106,18 +168,21 @@ export default {
         tableName:"",
         tableAsField:""
       },
+      cloumns:'',
       labelPosition: 'right',
       dialogVisible:false,
       curSelectNode: "",
+      tableFields:[],
+      tableDataNodeId:[],
       moduleList: [
         {
           id: 1,
-          name: "表1",
+          name: "开始",
           image: require("@/assets/img/1.png"),
         },
         {
           id: 8,
-          name: "表2",
+          name: "表",
           image: require("@/assets/img/2.png"),
         },
         {
@@ -127,37 +192,130 @@ export default {
         },
         {
           id: 3,
-          name: "节点4",
+          name: "导出",
           image: require("@/assets/img/4.png"),
         },
       ],
       graph: null
     };
   },
+  created() {
+    this.getDatabaseMessage()
+  },
   methods: {
-    handleSelectionChange(val) {
+    showTableFields(){
-      this.multipleSelection = val;
+      this.finalVisible = true
-    },
+      let fieldsList = [...new Set(this.tableFields)]
-    nextOne(){
+      selectByAsField(fieldsList).then(res => {
-      let tableAsField = this.tableMsg.tableAsField;
+          this.sqlList = res.data
-      let tableName = this.tableMsg.tableName.toString();
-      selectByTableName(tableName).then(res => {
-        this.dialogVisible1 = true
-        this.tableData = res.data
-        console.log(res);
       })
-      this.dialogVisible = false
-    },
-    handleChange(value) {
 
-      this.tableMsg.tableName = value[1]
+      selectByTableName(this.toTable).then(res => {
+        this.options = res.data
+      })
+
+    },
+    addSql(){
+      this.outPuter.taskId = this.$route.query.id
+      let fieldsList = [...new Set(this.tableFields)]
+      let tableAsFieldList = [...new Set(this.sourceField)]
+      this.outPuter.tableFields = fieldsList.toString()
+      this.outPuter.tableAsFields = tableAsFieldList.toString()
+      this.outPuter.targetTableName = this.toTable
+      addOutPut(this.outPuter).then(res => {
+        if (res.code == 200){
+          this.$message.success("输出节点放置成功")
+        }else {
+          this.$message.error("发生异常请联系管理员")
+        }
+      })
+      this.dialogVisible2 = false
+      this.finalVisible = false
+    },
+    handleChange(value){
+        this.outPuter.targetDatabase = value[0]
+        this.toTable = value[1]
     },
     getDatabaseMessage(){
-        this.dialogVisible = true
       extractDataName().then(res => {
-        this.tables = res.data
+        this.tt = res.data
       })
     },
+    SelectionChange(val){
+      val.forEach(res => {
+         this.tableFields.push(res.asField)
+         this.sourceField.push(res.field)
+      })
+    },
+    todoSelect(){
+      addSelect(this.joinCheck).then(res => {
+          if (res.code == 200){
+            this.$message.success("操作成功")
+          }else {
+            this.$message.error(res.msg)
+          }
+      })
+      this.dialogVisible1 = false
+    },
+    findFormValue(){
+      this.dialogVisible = false
+      this.taskOpen = false
+    },
+    openForm(data){
+      let textWrap = data.attrs.label.textWrap;
+      if (textWrap.text == "表"){
+        console.log("表节点ID=>"+data.id);
+        this.tableDataNodeId.push(data.id)
+        this.dialogVisible = true;
+        this.taskOpen=true;
+      }
+      if (textWrap.text == "联查"){
+        this.dialogVisible1 = true;
+        this.joinCheck.nodeId = data.id
+        console.log("联查节点ID=>"+data.id);
+        const edges = this.graph.getEdges().filter(edge => {
+          return edge.getSourceNode().id === data.id || edge.getTargetNode().id === data.id;
+        });
+
+        const neighbors = [];
+        edges.forEach(edge => {
+          const otherNodeId = edge.getSourceNode().id === data.id ? edge.getTargetNode().id : edge.getSourceNode().id;
+          if (!neighbors.includes(otherNodeId)) {
+            neighbors.push(otherNodeId);
+          }
+        });
+        this.neighbors = neighbors;
+        this.joinCheck.leftNodeId = neighbors[0]
+        this.joinCheck.rightNodeId = neighbors[1]
+        selectByOne(neighbors[0]).then(res =>{
+          this.options1 = res.data
+        })
+        selectByOne(neighbors[1]).then(res =>{
+          this.options2 = res.data
+        })
+        selectByNodeId(JSON.stringify(this.neighbors)).then(res => {
+            this.nodeList = res.data
+        })
+      }
+
+      if (textWrap.text == "导出"){
+        this.outPuter.nodeId = data.id
+        console.log("导出节点ID=>"+data.id);
+        this.dialogVisible2 = true
+        findBySelectId(this.neighbors[0]).then(res => {
+          if (res.data == null){
+             seeTableField(this.tableDataNodeId).then(res => {
+               this.fields = res.data
+             })
+          }else{
+            seeTableField(this.neighbors).then(res => {
+              this.fields = res.data
+            })
+          }
+        })
+      }
+
+    },
     //todo 鼠标划过节点在显示连接桩
     nodeAddEvent() {
       const { graph } = this;
@@ -174,8 +332,10 @@ export default {
       this.graph.on("node:mouseleave", () => {
         changePortsVisible(false);
       });
-      this.graph.on("node:dblclick",() =>{
+      this.graph.on("node:dblclick",(evt) =>{
-          this.getDatabaseMessage()
+          let data = evt.node.store.data;
+          this.nodesIds = data.id;
+          this.openForm(data)
       })
       //todo 节点绑定点击事件
       this.graph.on("node:click", ({ e, x, y, node, view }) => {
@@ -279,7 +439,7 @@ export default {
         }
       });
     },
-    // 拖动后松开鼠标触发事件
+    // todo 拖动后松开鼠标触发事件
     handleDragEnd(e, item) {
       // 可以获取到最后拖动后松开鼠标时的坐标和拖动的节点相关信息
       this.addHandleNode(

src/views/market/apitest/index.vue

@@ -130,20 +130,38 @@
                 </el-table>
               </el-form-item>
 
-
-
               <el-form-item label="返回参数说明:">
-
+                {{myapi.productContent}}
               </el-form-item>
               <el-form-item label="JSON返回示例:">
-
+                <div style="width: 80px ; height: 30px; " ></div>
+                  {{myapi}}
               </el-form-item>
               <el-form-item label="XML返回示例:">
-
               </el-form-item>
             </el-form>
           </el-tab-pane>
-          <el-tab-pane label="错误码参照" name="second">错误码参照</el-tab-pane>
+          <el-tab-pane label="错误码参照" name="second">
+            错误码参照
+            <el-table
+              :data="errCode"
+              style="width: 100%">
+              <el-table-column
+                prop="code"
+                label="错误码"
+                width="180">
+              </el-table-column>
+              <el-table-column
+                prop="message"
+                label="错误描述"
+                width="180">
+              </el-table-column>
+              <el-table-column
+                prop="mesg"
+                label="解决方案">
+              </el-table-column>
+            </el-table>
+           </el-tab-pane>
           <el-tab-pane label="数据统计" name="third">数据统计</el-tab-pane>
         </el-tabs>
       </div></el-col>
@@ -286,7 +304,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible1 = false">取 消</el-button>
-    <el-button type="primary" @click=" confirmSelection(row)">确 定</el-button>
+    <el-button type="primary" @click="confirmSelection(newapi)">确 定</el-button>
   </span>
     </el-dialog>
 
@@ -307,8 +325,9 @@ import {
 } from "@/api/apitest/apitest";
 import api from "js-cookie";
 import {companyauthentication, ifcompanyauthentication} from "@/api/authentication/authentication";
-import {selectproductspecification} from "@/api/market/product";
+import { selectproductspecification, showByproductId } from '@/api/market/product'
 import myapi from "@/views/market/myapi/index.vue";
+import { addordersup, updateOrders } from '@/api/market/orders'
 
 export default {
     name: "Apitest",
@@ -327,14 +346,46 @@ export default {
         activeName: 'first',
         dialogVisible: false,
         dialogVisible1: false,
+        productInfo: null,
         ruleForm:{},
         tableData:[],
         newapi:{},
+        products: [],
+        orders: [],
         //请求头部
         heanderData:[],
         //请求参数
-        requestData:[]
+        requestData:[],
+        errCode:[
+          {
+          code:'10000',
+          message:'服务调用成功',
+          mesg:'服务调用成功，不返回 subCode 和 subMessage'
+         },  {
+            code:'20000',
+            message:'服务不可用',
+            mesg:'错误信息详情查看错误码'
+          },  {
+            code:'40002',
+            message:'提示无效签名，isv.invalid-signature等字样',
+            mesg:'可查看 自助排查签名验签问题。'
+          },  {
+            code:'40006',
+            message:'isv.insufficient-isv-permissions',
+            mesg:'1.请联系IoT开放平台技术支持，并提供 IoT 开放平台上应用的 APPID。\n' +
+              '2.请联系IoT开放平台技术支持添加白名单。'
+          },  {
+            code:'E70201',
+            message:'system error',
+            mesg:'系统错误，请联系IoT开放平台技术支持协助解决。'
+          },  {
+            code:'E70202',
+            message:'invalid parameter',
+            mesg:'\t\n' +
+              '系统入参检查失败，请联系IoT开放平台技术支持。'
+          },  ]
       };
+
     },
     //计算属性 类似于data概念",
     computed: {},
@@ -426,6 +477,7 @@ export default {
           productPrice: row.middlePrice,
           productContent:this.myapi.productContent,
         }
+
       },
       //测试发送请求 无参数
       noForm(ruleForm){
@@ -550,15 +602,36 @@ export default {
         });
       }},
       confirmSelection(row) {
-        if (this.selectedRow) {
 
+        if (this.selectedRow) {
           // 这里假设你有一个发起支付的方法，传入所选行的数据
           // startPayment(this.selectedRow);
           console.log(row)
-          window.open("http://localhost:9701/alipay/pay?ordersPrice=" + row.middlePrice)
+          window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?ordersPrice=" + row.middlePrice)
           this.$message.success('付款成功')
-        }
 
+          showByproductId(row).then(
+            res =>{
+              this.$message.success(res.msg)
+            }
+          ),
+            showByproductId().then(
+              response => {
+                this.productInfo = response.data;
+                const orderData = {
+                  ordersProduct:this.productInfo.productId,
+                  productName: this.productInfo.productName,
+                  ordersPrice: this.productInfo.productPrice,
+                  ordersSpecification : this.productInfo.productSpecification
+                };
+                return addordersup(orderData);
+                if (response.code==200){}
+                this.addordersoff=false
+              }).then(() => {
+              this.$message.success('订单添加成功');
+            })
+            location.reload();
+        }
       },
 
 show(){

src/views/market/myapi/index.vue

@@ -8,18 +8,19 @@
           <el-row>
             <el-col :span="20"><div class="grid-content bg-purple">
               <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-<!--                  <el-select v-model="ruleForm.productState" placeholder="请选择状态">-->
+                  <el-select v-model="ruleForm.productState" placeholder="请选择状态">
-<!--                    <el-option-->
+                    <el-option
-<!--                      v-for="item in options"-->
+                      v-for="item in options"
-<!--                      :key="item.value"-->
+                      :key="item.value"
-<!--                      :label="item.label"-->
+                      :label="item.label"
-<!--                      :value="item.value">-->
+                      :value="item.value">
-<!--                    </el-option>-->
+                    </el-option>
-<!--                  </el-select>-->
+                  </el-select>
                   <el-input type="text" v-model="ruleForm.productName" style="width: 200px" autocomplete="off" placeholder="名称搜索"></el-input>
                   <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
               </el-form>
             </div></el-col>
+            <el-col :span="4"><div class="grid-content bg-purple-light"><el-button type="primary">新增数据</el-button></div></el-col>
           </el-row>
 
           <el-row :gutter="12">
@@ -38,7 +39,7 @@
                     </el-form-item>
                     <el-row>
                       <el-col :span="6"><div class="grid-content bg-purple">
-                        <el-button type="success" @click="test(myapi)">使用</el-button>
+                        <el-button type="info" @click="test(myapi)">测试</el-button>
                       </div></el-col>
                     </el-row>
                   </el-form>

src/views/market/orders/index.vue

@@ -78,6 +78,7 @@
             </el-table-column>
             <el-table-column label="订单款项状态" width="110" align="center">
               <template slot-scope="scope">
+
                 <span style="margin-left: 10px" v-if="scope.row.ordersState==0">待支付</span>
                 <span style="margin-left: 10px" v-if="scope.row.ordersState==1">已付款</span>
                 <span style="margin-left: 10px" v-if="scope.row.ordersState==2">未付款</span>
@@ -161,11 +162,14 @@ import {
   ordersDelete,
   pay,
   getOut,
-  updateByeExist, updateByordersState1
+  updateByeExist,
+  updateByordersState1
 } from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
 import axios from 'axios'
 import item from '@/layout/components/Sidebar/Item.vue'
+import { showByproductId } from '@/api/market/product'
+import product from '@/views/market/product/index.vue'
 
 
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
@@ -182,7 +186,8 @@ export default {
         pageNum:1,
         pageSize:10,
         total:1,
-        typeId:0
+        ordersId:3,
+        productId:3
       },
       arr:[],
       type:[],
@@ -196,6 +201,7 @@ export default {
       addtitle:'',
       addordersoff:false,
       ordersForm:{},
+      productInfo: null,
 
       options: [{
         value: ' ',
@@ -313,17 +319,17 @@ export default {
     },
 
     pay(row){
+
       console.log(row)
-      window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
+      updateByordersState1(this.orders).then(res =>{
-      this.$message.success('付款成功')
+          this.orders.ordersId=this.orders.ordersId;
-      updateByordersState1(ordersForm).then(response=>{
+          this.orders.productId=this.orders.productId;
-        alert(response.msg)
+        window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
-        if (response.code==200){}
+        this.$message.success('付款成功')
-        this.addordersoff=false
+        }
-      })
+      )
 
-
+      },
-    },
 
     getOut(){
       this.download('system/operlog/export', {

src/views/market/pay/index.vue

@@ -11,94 +11,94 @@
 
 
 
-        <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 30px">
+    <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 30px">
-          <el-table :data="arr" style="width: 100%" @selection-change="handleSelectionChange">
+      <el-table :data="arr" style="width: 100%" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column label="编号" width="80" align="center">
+        <el-table-column label="编号" width="80" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <span style="margin-left: 10px">{{ scope.row.id }}</span>
+            <span style="margin-left: 10px">{{ scope.row.id }}</span>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="商品图片" width="150" align="center">
+        <el-table-column label="商品图片" width="150" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <img :src="scope.row.picImg" alt="图片损坏">
+            <img :src="scope.row.picImg" alt="图片损坏">
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="商品名称" width="400" align="center">
+        <el-table-column label="商品名称" width="400" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <span style="margin-left: 10px">{{ scope.row.shopName }}</span>
+            <span style="margin-left: 10px">{{ scope.row.shopName }}</span>
-                <br>
+            <br>
-                品牌：<span style="margin-left: 10px">{{ scope.row.brandName }}</span>
+            品牌：<span style="margin-left: 10px">{{ scope.row.brandName }}</span>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="货号" width="150" align="center">
+        <el-table-column label="货号" width="150" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <span style="margin-left: 10px">货号：{{ scope.row.shopNum }}</span>
+            <span style="margin-left: 10px">货号：{{ scope.row.shopNum }}</span>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="标签" width="150" align="center">
+        <el-table-column label="标签" width="150" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                上架：
+            上架：
-                <el-switch
+            <el-switch
-                  v-model="scope.row.publishStatus"
+              v-model="scope.row.publishStatus"
-                  @change="updateShop(scope.row)"
+              @change="updateShop(scope.row)"
-                  active-color="#409EFF"
+              active-color="#409EFF"
-                  inactive-color="#C0CCDA"
+              inactive-color="#C0CCDA"
-                  :active-value="1"
+              :active-value="1"
-                  :inactive-value="0">
+              :inactive-value="0">
-                </el-switch>
+            </el-switch>
-                <br>
+            <br>
-                新品：
+            新品：
-                <el-switch
+            <el-switch
-                  v-model="scope.row.newStatus"
+              v-model="scope.row.newStatus"
-                  @change="updateShop(scope.row)"
+              @change="updateShop(scope.row)"
-                  active-color="#409EFF"
+              active-color="#409EFF"
-                  inactive-color="#C0CCDA"
+              inactive-color="#C0CCDA"
-                  :active-value="1"
+              :active-value="1"
-                  :inactive-value="0">
+              :inactive-value="0">
-                </el-switch>
+            </el-switch>
-                <br>
+            <br>
-                推荐：
+            推荐：
-                <el-switch
+            <el-switch
-                  v-model="scope.row.recommandStatus"
+              v-model="scope.row.recommandStatus"
-                  @change="updateShop(scope.row)"
+              @change="updateShop(scope.row)"
-                  active-color="#409EFF"
+              active-color="#409EFF"
-                  inactive-color="#C0CCDA"
+              inactive-color="#C0CCDA"
-                  :active-value="1"
+              :active-value="1"
-                  :inactive-value="0">
+              :inactive-value="0">
-                </el-switch>
+            </el-switch>
-                <br>
+            <br>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="排序" width="150" align="center">
+        <el-table-column label="排序" width="150" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <span style="margin-left: 10px">{{ scope.row.sort }}</span>
+            <span style="margin-left: 10px">{{ scope.row.sort }}</span>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="销量" width="150" align="center">
+        <el-table-column label="销量" width="150" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <span style="margin-left: 10px">{{ scope.row.sale }}</span>
+            <span style="margin-left: 10px">{{ scope.row.sale }}</span>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="审核状态" width="150" align="center">
+        <el-table-column label="审核状态" width="150" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <span style="margin-left: 10px" v-if="scope.row.verifyStatus==0">未审核</span>
+            <span style="margin-left: 10px" v-if="scope.row.verifyStatus==0">未审核</span>
-                <span style="margin-left: 10px" v-if="scope.row.verifyStatus==1">审核通知</span>
+            <span style="margin-left: 10px" v-if="scope.row.verifyStatus==1">审核通知</span>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <el-button
+            <el-button
-                  size="mini"
+              size="mini"
-                  @click="handleEdit(scope.row)">编辑</el-button>
+              @click="handleEdit(scope.row)">编辑</el-button>
-                <el-button
+            <el-button
-                  size="mini"
+              size="mini"
-                  type="danger"
+              type="danger"
-                  @click="handleDelete(scope.row)">删除</el-button>
+              @click="handleDelete(scope.row)">删除</el-button>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-          </el-table>
+      </el-table>
-        </el-card>
+    </el-card>
 
 
 

src/views/market/product/index.vue

@@ -61,10 +61,6 @@
       </el-container>
     </el-container>
 
-
-
-
-
   </div>
 </template>
 
@@ -73,13 +69,14 @@
 //例如：import 《组件名称》 from '《组件路径》,
 
 
-import {ifbuy, selectList, selectTypeList} from "@/api/market/product";
+import {selectList, selectTypeList} from "@/api/market/product";
 
 export default {
     name: 'Product',
     //import引入的组件需要注入到对象中才能使用"
     components: {},
     props: {},
+
     data() {
       //这里存放数据"
       return {
@@ -131,12 +128,6 @@ export default {
       },
       //接口测试页面
       test(product){
-        //判断是否已购买
-        ifbuy(product).then(response=>{
-          if (response.code!=200) {
-            alert(response.msg)
-          }
-        })
         this.$router.push({path:"/apitest/index",query:{myapi:JSON.stringify(product)}})
       },
       // test(product) {

src/views/market/reclaim/index.vue

@@ -9,8 +9,7 @@
       <div class="text item">
         <el-form ref="form" :model="orders" label-width="100px">
           <el-form-item>
-
+            订单编号：<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 130px;margin-right: 50px"></el-input>
-            订单编号：<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 180px;margin-right: 50px"></el-input>
             订单款项状态：
             <el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
               <el-option v-for="item in options"
@@ -19,24 +18,21 @@
                          :value="item.value">
               </el-option>
             </el-select>
-            <br/> <br/>
             选择时间:
-            <el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" />
+            <el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" style="width: 130px;"/>
             -----
-            <el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间"/>
+            <el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间" style="width: 130px;"/>
-
           </el-form-item>
         </el-form>
       </div>
     </el-card>
-
+    <br>
-<br>
+    <button style="float: right; padding: 3px 10px" type="text" @click="orderslist">返回订单列表</button>
+    <br>
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 10px">
       <div slot="header" class="clearfix">
         <span>回收站列表</span>
-        <button @click="add(1)" style="float: right; padding: 3px 10px" type="text">添加</button>
       </div>
-
       <el-table :data="arr" style="width: 100%" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column   label="日期" width="150" align="center">
@@ -44,120 +40,81 @@
             <span style="margin-left: 10px">{{ scope.row.ordersLaunchdate }}</span>
           </template>
         </el-table-column>
-       <el-table-column label="购买信息">
+        <el-table-column label="购买信息">
-        <el-table-column  label="订单编号" width="120" align="center">
+          <el-table-column  label="订单编号" width="150" align="center">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px"> {{ scope.row.ordersNum }}</span>
-          </template>
-        </el-table-column>
-         <el-table-column label="订单所属人" width="100" align="center">
-           <template slot-scope="scope">
-             <span style="margin-left: 10px">{{ scope.row.userName }}</span>
-           </template>
-         </el-table-column>
-
-        <el-table-column label="购买详情">
-          <el-table-column prop="province" label="购买接口" width="150" align="center">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.productName }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="订单金额" width="100" align="center">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.ordersPrice }}</span>
-          </template>
-        </el-table-column>
-          <el-table-column label="订单规格" width="300" align="center">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.ordersSpecification }}</span>
+              <span style="margin-left: 10px"> {{ scope.row.ordersNum }}</span>
             </template>
           </el-table-column>
-        <el-table-column label="订单款项状态" width="110" align="center">
+          <el-table-column label="订单所属人" width="100" align="center">
-          <template slot-scope="scope">
+            <template slot-scope="scope">
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==0">待支付</span>
+              <span style="margin-left: 10px">{{ scope.row.userName }}</span>
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==1">已付款</span>
+            </template>
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==2">未付款</span>
+          </el-table-column>
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==4">售后(申请退款)</span>
+
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==5">已退款</span>
+          <el-table-column label="购买详情">
-          </template>
+            <el-table-column prop="province" label="购买接口" width="200" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{ scope.row.productName }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="订单金额" width="100" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{ scope.row.ordersPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单规格" width="300" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{ scope.row.ordersSpecification }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单款项状态" width="130" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==0">待支付</span>
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==1">已付款</span>
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==2">未付款</span>
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==4">售后(申请退款)</span>
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==5">已退款</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.row)">恢复</el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="ordersDelete(scope.row)">彻底删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table-column>
         </el-table-column>
-        <el-table-column label="操作" align="center">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              @click="ordersDelete(scope.row)">删除</el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click="pay(scope.row)" >支付</el-button>
-<!--              v-if="scope.row.status === '待支付'"-->
-          </template>
-        </el-table-column>
-        </el-table-column>
-       </el-table-column>
       </el-table>
-    <el-pagination style="float: right"
+      <el-pagination style="float: right"
-                   @size-change="handleSizeChange"
+                     @size-change="handleSizeChange"
-                   @current-change="handleCurrentChange"
+                     @current-change="handleCurrentChange"
-                   :current-page="orders.pageNum"
+                     :current-page="orders.pageNum"
-                   :page-sizes="[2, 4, 6, 8]"
+                     :page-sizes="[5, 10, 50, 100]"
-                   :page-size="orders.pageSize"
+                     :page-size="orders.pageSize"
-                   layout="total, sizes, prev, pager, next, jumper"
+                     layout="total, sizes, prev, pager, next, jumper"
-                   :total="orders.total">
+                     :total="orders.total">
-    </el-pagination>
+      </el-pagination>
     </el-card>
 
-    <el-dialog
+  </div>
-      :title="addtitle"
-      :visible.sync="addordersoff"
-      width="50%"
-      :before-close="handleClose">
-      <div v-if="this.index==1">
-        <h2>管理员慎重填写</h2><br>
-        <el-form :model="ordersForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="订单编号：" prop="ordersNum">
-            <el-input type="text" v-model="ordersForm.ordersNum" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单产品：" prop="ordersProduct">
-            <el-input type="text" v-model="ordersForm.ordersProduct" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单所属人：" prop="ordersUser">
-            <el-input type="text" v-model="ordersForm.ordersUser" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单金额：" prop="ordersPrice">
-            <el-input type="text" v-model="ordersForm.ordersPrice" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单规格：" prop="ordersSpecification">
-            <el-input type="text" v-model="ordersForm.ordersSpecification" autocomplete="off"></el-input>
-          </el-form-item>
-        </el-form>
-        <center>
-          <el-button @click="addordersoff = false">取 消</el-button>
-          <el-button type="primary" @click="addorders(ordersForm)">提交</el-button>
-        </center>
-      </div>
-      <span slot="footer" class="dialog-footer">
-  </span>
-    </el-dialog>
-
-</div>
 </template>
 
 
 <script>
-import { selectList, update, addordersup, ordersDelete ,pay} from '@/api/market/orders'
+import { ordersDelete, listreclaim, updateByExist} from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
 
 
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 export default {
-  dicts:['product_name','orders_num','orders_state','orders_launchdate'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
@@ -172,15 +129,9 @@ export default {
       },
       arr:[],
       type:[],
-
-      Cascader:{ expandTrigger:'hover',value:'id',label:'typeName',children:'parentPOS' },
-      typeId:[],
       startDate: null,
       endDate: null,
-
       index:'',
-      addtitle:'',
-      addordersoff:false,
       ordersForm:{},
 
       options: [{
@@ -210,110 +161,83 @@ export default {
   watch: {},
   //方法集合",
   methods: {
-    // 删除
-    ordersDelete(row){
-      ordersDelete(row.ordersId).then(
-        res => {
-          this.$message.success(res.msg)
-          this.selectList()
-        }
-      )
-    },
-    // 重置
-    chong(){
-      this.orders={}
-      this.selectList()
-    },
-    // 分页
-    handleSizeChange(val) {
-      this.orders.pageSize=val
-      this.selectList()
-    },
-    handleCurrentChange(val) {
-      this.orders.pageNum=val
-      this.selectList()
-    },
-
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {});
-    },
-
-
-      pay(row){
-        window.open("http://localhost:9701/alipay/pay?subject=" + row.name
-          + "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
-      this.$message.success('付款成功')
-      this.load();
-
-      }
-      ,
-    // 上架，新品，推荐修改
-    updateShop(orders){
-      update(orders).then(
-        res => {
-          this.$message.success(res.msg)
-          this.selectList()
-        }
-      )
-    },
-    // 修改跳转路径
-    handleEdit(orders){
-      if (this.orders.serviceIds && typeof this.orders.serviceIds === 'string') {
-        orders.serviceid = this.orders.serviceIds.split(',');
-        // ... 后续操作
-      }
-      console.log(JSON.stringify(orders))
-      orders.serviceid=orders.serviceIds.split(',').map(id => parseInt(id, 10));
-      console.log(JSON.stringify(orders))
-      this.$router.push({path:'/product/info/update',query:{orders:orders}})
-    },
-
-    addorders(ordersForm){
-      addordersup(ordersForm).then(response=>{
-        alert(response.msg)
-        if (response.code==200){}
-        this.addordersoff=false
-      })
-      location.reload();
-    },
-    // 查询
-    findShop(){
-      this.selectList()
-    },
-    // 添加跳转路径
-    add(index){
-        this.index=index
-        if (this.index === 1) {
-          this.addtitle= '添加订单';
-        }
-        // else if (this.index === 2) {
-        //   this.dialogtitle= '';
-        // }
-        this.addordersoff=true
-    },
-    // 多选框
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
     //商品列表
-    selectList() {
+    listreclaim() {
-      selectList(this.orders).then(
+      listreclaim(this.orders).then(
         res => {
           console.log(res)
           this.arr = res.data.list
           this.orders.total = res.data.total
         }
       )
+    },
+    //复原
+    handleEdit(row){
+      const result = window.confirm(`你确定要执行此操作吗？`);
+      if (result) {
+        updateByExist(row.ordersId).then(
+          res =>{
+            this.$message.success(res.msg)
+            this.listreclaim()
+          }
+        )
+        location.reload();
+        // 用户点击确定后的逻辑处理，这里可以使用传入的 id
+        console.log(`用户点击了确定，ID 为 ${id}`);
+      } else {
+        // 用户点击取消后的逻辑处理
+        console.log('用户点击了取消');
+      }
+
+    },
+    // 删除
+    ordersDelete(row){
+      const result = window.confirm(`你确定要执行此操作吗？`);
+      if (result) {
+        ordersDelete(row.ordersId).then(
+          res => {
+            this.$message.success(res.msg)
+            this.listreclaim()
+          }
+        )
+        location.reload();
+        // 用户点击确定后的逻辑处理，这里可以使用传入的 id
+        console.log(`用户点击了确定，ID 为 ${id}`);
+      } else {
+        // 用户点击取消后的逻辑处理
+        console.log('用户点击了取消');
+      }
+    },
+    // 重置
+    chong(){
+      this.orders={}
+      this.listreclaim()
+    },
+    // 多选框
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.orders.pageSize=val
+      this.listreclaim()
+    },
+    handleCurrentChange(val) {
+      this.orders.pageNum=val
+      this.listreclaim()
+    },
+    orderslist(){
+      this.$router.push({path:"/market/orders"})
+    },
+    // 查询
+    findShop(){
+      this.listreclaim()
     }
+
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
-    // this.diGui()
+    this.listreclaim()
-    this.selectList()
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {

src/views/market/updorders/index.vue

@@ -1,44 +1,43 @@
 <template>
   <div>
     {{orders}}
-
+    <br><br><br>
     <center>
-      <el-form :model="api" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="orders" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-        <el-form-item label="序号" prop="productId" style="width: 70%">
+        <el-form-item label="订单编号" prop="ordersNum" style="width: 70% " >
-          {{orders.productId}}
+          {{orders.ordersNum}}
         </el-form-item>
-        <el-form-item label="接口名称" prop="productName" style="width: 70%">
+        <el-form-item label="订单产品" prop="productName" style="width: 70%">
-          {{orders.productName}}
+          <el-select v-model="orders.productName" placeholder="请选择产品">
+            <el-option v-model="orders.productName" :value="orders.productId"></el-option>
+            <el-option v-for="item in product" :label="item.productName" :key="item.productId" :value="item.productId" ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="接口类型" prop="productType" style="width: 70%">
+        <el-form-item label="订单所属人" prop="userName" style="width: 70%">
-          {{orders.productType}}
+          {{orders.userName}}
         </el-form-item>
-        <el-form-item label="接口描述" prop="productContent" style="width: 70%">
+        <el-form-item label="订单金额" prop="ordersPrice" style="width: 70%">
-          {{orders.productContent}}
+          <el-input type="text" v-model="orders.ordersPrice" autocomplete="off" style="width: 100px"></el-input>
         </el-form-item>
-        <el-form-item label="接口销量" prop="productSales" style="width: 70%">
+        <el-form-item label="订单规格" prop="ordersSpecification" style="width: 70%">
-          {{orders.productSales}}
+          <el-input type="text" v-model="orders.ordersSpecification" autocomplete="off" style="width: 250px"></el-input>
         </el-form-item>
-        <el-form-item label="接口价格" prop="productPrice" style="width: 70%">
+        <el-form-item label="订单款项状态" prop="ordersState" style="width: 70%">
-          {{orders.productPrice}}
+
+          <el-select v-model="orders.ordersState" placeholder="订单款项状态" >
+            <el-option label="待支付-0" value="0"></el-option>
+            <el-option label="已支付-1" value="1"></el-option>
+            <el-option label="未支付-2" value="2"></el-option>
+            <el-option label="售后(审核退款)-3" value="3"></el-option>
+            <el-option label="退款成功-4" value="4"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="接口来源" prop="productFrom" style="width: 70%">
+        <el-form-item label="订单日期" prop="ordersLaunchdate" style="width: 70%">
-          {{orders.productFrom}}
+          {{orders.ordersLaunchdate}}
-        </el-form-item>
-        <el-form-item label="重要路由" prop="apiRouter" style="width: 70%">
-          {{orders.apiRouter}}
-        </el-form-item>
-        <el-form-item label="接口地址" prop="apiAddress" style="width: 70%">
-          {{orders.apiAddress}}
-        </el-form-item>
-        <el-form-item label="返回格式" prop="returnFormat" style="width: 70%">
-          {{orders.returnFormat}}
-        </el-form-item>
-        <el-form-item label="请求方式" prop="requestMethod" style="width: 70%">
-          {{orders.requestMethod}}
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm('ruleForm')">返回</el-button>
+          <el-button type="primary" @click="update(row)">提交</el-button>
         </el-form-item>
       </el-form>
     </center>
@@ -48,15 +47,18 @@
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
+import { updateOrders } from '@/api/market/orders'
+
 export default {
-  name: "Apidetailmessage",
+
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
   data() {
     //这里存放数据"
     return {
-      orders:{}
+      orders:{},
+      product:[]
     };
   },
   //计算属性 类似于data概念",
@@ -66,7 +68,15 @@ export default {
   //方法集合",
   methods: {
     submitForm(){
-      this.$router.push("/apimanage/index")
+      this.$router.push("/market/orders")
+    },
+
+    update(row){
+      updateOrders(this.orders).then(
+        res =>{
+          this.$message.success(res.msg)
+        }
+      )
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
@@ -74,7 +84,7 @@ export default {
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {
-    this.api = this.$route.query.api
+    this.orders = this.$route.query.orders
   },
   beforeCreate() {
   }, //生命周期 - 创建之前",

src/views/property/asDisplay/index.vue

@@ -44,13 +44,13 @@
             </template>
           </div>
         </el-card>
-<!--        v-if="dataType === 'dataTable'-->
+        <!--        v-if="dataType === 'dataTable'-->
         <el-card class="box-card"  style="margin-top: 20px">
           <div slot="header" class="clearfix">
             <span>模型数据</span>
           </div>
           <el-row :gutter="20">
-<!--            -->
+            <!--            -->
             <el-col :span="6" v-for="DataValue in  tableStructure" style="margin-top: 20px">
               <el-descriptions :title="测试+'.'+tableBasic.name+'.'+DataValue.field" direction="vertical"
                                border :column="1">
@@ -99,6 +99,7 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 import { findTableValue, getExtractDataTableNameList, selectBasicList } from '@/api/property/asDisplay'
+import { tableStructureShow } from '@/api/property/astr'
 
 export default {
   //import引入的组件需要注入到对象中才能使用"
@@ -141,11 +142,15 @@ export default {
     },
 
     handleNodeClick(data){
-      this.tableBasic=data
+      if (this.data.name!=data.name){
-      console.log(this.tableBasic)
+        tableStructureShow(data).then(res=> {
-      this.dataNum=data.tableFie.length
+          this.tableBasic = data
-      this.tableStructure=data.tableFie
+          console.log(res)
-      console.log(this.tableStructure)
+          this.dataNum = res.data.length
+          this.tableStructure = res.data
+        })
+      }
+
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
@@ -175,5 +180,4 @@ export default {
 <style scoped>
 
 
-
 </style>

src/views/property/asauth/index.vue

@@ -189,12 +189,14 @@ export default {
     parseTime,
     //部门switch状态变化
     handleDeptAccreditChange(deptId, value) {
-      this.AssetImPowerListReq.basicId = this.tableBasic.basicId
+
-      this.AssetImPowerListReq.tableId = this.tableBasic.id
-      this.AssetImPowerListReq.deptId = deptId
       if (this.tableBasic.children != null) {
+        this.AssetImPowerListReq.basicId = this.tableBasic.basicId
+        this.AssetImPowerListReq.deptId = deptId
         this.AssetImPowerListReq.tableId = null;
       } else {
+        this.AssetImPowerListReq.tableId = this.tableBasic.id
+        this.AssetImPowerListReq.deptId = deptId
         this.AssetImPowerListReq.basicId = null;
       }
 
@@ -227,12 +229,13 @@ export default {
     handleAccreditChange(userId, value) {
       console.log("userId的值：:" + userId);
       console.log("value的值：" + value)
-      this.AssetImPowerListReq.basicId = this.tableBasic.basicId
-      this.AssetImPowerListReq.tableId = this.tableBasic.id
-      this.AssetImPowerListReq.userId = userId
       if (this.tableBasic.children != null) {
+        this.AssetImPowerListReq.basicId = this.tableBasic.basicId
+        this.AssetImPowerListReq.userId = userId
         this.AssetImPowerListReq.tableId = null;
       } else {
+        this.AssetImPowerListReq.tableId = this.tableBasic.id
+        this.AssetImPowerListReq.userId = userId
         this.AssetImPowerListReq.basicId = null;
       }
 
@@ -334,14 +337,16 @@ export default {
      */
     handleNodeClick(data) {
       this.tableBasic = data
-      this.AssetImPowerListReq.tableId = this.tableBasic.id
-      this.AssetImPowerListReq.basicId = this.tableBasic.basicId
-      this.AssetImPowerListReq.deptId = this.tableBasic.deptId
       if (this.tableBasic.children != null) {
+        this.AssetImPowerListReq.basicId = this.tableBasic.basicId
+        this.AssetImPowerListReq.deptId = this.tableBasic.deptId
         this.AssetImPowerListReq.tableId = null;
       } else {
+        this.AssetImPowerListReq.tableId = this.tableBasic.id
         this.AssetImPowerListReq.basicId = null;
       }
+
+
       /**
        * 查询资产赋权用户信息
        * @param data 参数信息

src/views/property/astr/index.vue

@@ -87,7 +87,7 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 
-import { getExtractDataTableNameList } from '@/api/property/astr'
+import { getExtractDataTableNameList, tableStructureShow } from '@/api/property/astr'
 
 export default {
   //import引入的组件需要注入到对象中才能使用"
@@ -123,14 +123,18 @@ export default {
         this.data = res.data
       })
     },
-    handleNodeClick(data){
+    handleNodeClick(data) {
-      this.tableBasic=data
+      console.log(data)
-      this.dataNum=data.tableFie.length
+      this.tableBasic = data
-      this.tableStructure=data.tableFie
+
+      tableStructureShow(data).then(res => {
+        console.log(res)
+        this.dataNum = res.data.length
+        this.tableStructure = res.data
+      })
 
     },
 
-
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
@@ -159,5 +163,4 @@ export default {
 <style scoped>
 
 
-
 </style>