src/api/market/orders.js

@@ -71,9 +71,6 @@ export function getOut(){
 
 export function updateByordersState1(data){
   return request({
-
-
-
     url:"/market/orders/updateByordersState1",
     method: "POST",
     data: data

src/api/property/asDisplay.js

@@ -2,15 +2,9 @@ import request from '@/utils/request'
 
 export function getExtractDataTableNameList() {
   return request({
-    url: '/property/dataRunName/extractDataTableNameShow',
+    url: '/property/dataRunName/extractDataTableName',
     method: 'post',
   })
 }
 
-export function tableStructureShow(data) {
+
-  return request({
-    url: '/property/dataRunName/tableStructureShow',
-    method: 'post',
-    data:data
-  })
-}

src/api/property/asauth.js

@@ -40,31 +40,3 @@ export function delUserAssetAuthorization(data) {
     data:data
   })
 }
-
-// --------------------------------------------------------
-
-/**
- * 查询资产赋权用户信息
- * @param data 参数信息
- * @returns {*} 响应结果
- */
-export function findUserIdList(data) {
-  return request({
-    url: '/property/dataRunName/findUserIdList',
-    method: 'POST',
-    data
-  })
-}
-
-/**
- * 查询资产赋权部门信息
- * @param data 参数信息
- * @returns {*} 响应结果
- */
-export function findDeptIdList(data) {
-  return request({
-    url: '/property/dataRunName/findDeptIdList',
-    method: 'POST',
-    data
-  })
-}

src/api/property/astr.js

@@ -7,10 +7,16 @@ export function getExtractDataTableNameList() {
   })
 }
 
-export function tableStructureShow(data) {
+export function findTableValue(dataId,name) {
   return request({
-    url: '/property/dataRunName/tableStructureShow',
+    url: '/property/dataRunName/findTableValue?dataId='+dataId+"&tableName="+name,
+    method: 'post',
+  })
+}
+
+export function selectBasicList() {
+  return request({
+    url: '/property/dataRunName/selectBasicList',
     method: 'post',
-    data:data
   })
 }

src/api/property/property.js

@@ -47,3 +47,11 @@ export function selectHandleClick(data) {
     data: data
   })
 }
+
+export function extractDataName(data) {
+  return request({
+    url: '/property/dataRunName/extractDataName',
+    method: 'post',
+    data: data
+  })
+}

src/views/login.vue

@@ -152,7 +152,6 @@ export default {
         }
       });
     }
-
   }
 };
 </script>

src/views/market/apitest/index.vue

@@ -241,7 +241,6 @@
           <template slot-scope="scope">
             <el-popover trigger="hover" placement="top">
               <div slot="reference" class="name-wrapper">
-                <el-button >包年</el-button>
                 <el-tag size="medium">{{ scope.row.productSpecificationName }}</el-tag>
               </div>
             </el-popover>
@@ -286,7 +285,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="dialogVisible1 = false">确 定</el-button>
   </span>
     </el-dialog>
 
@@ -550,18 +549,15 @@ export default {
         });
       }},
       confirmSelection(row) {
+        this.dialogVisible1=false
         if (this.selectedRow) {
-
           // 这里假设你有一个发起支付的方法，传入所选行的数据
-          // startPayment(this.selectedRow);
+          startPayment(this.selectedRow);
           console.log(row)
-          window.open("http://localhost:9701/alipay/pay?ordersPrice=" + row.middlePrice)
+          window.open("http://localhost:9701 " +
+            "/alipay/pay?middlePrice="+row.middlePrice)
           this.$message.success('付款成功')
-        }
 
-      },
-
-show(){
             // 创建一个容器来展示数据
             var container = document.getElementById('news-list');
             // 清空容器内容
@@ -590,11 +586,10 @@ show(){
 
             // 将结果div添加到容器中
             container.appendChild(resultDiv);
-
+          }
         //测试次数-1
         reducetestcount(this.myapi).then(response=>{})
       }
-
     },
     //生命周期 - 创建完成（可以访问当前this实例）",
     created() {

src/views/market/orders/index.vue

@@ -97,7 +97,6 @@
                 <el-button
                   type="primary"
                   size="small"
-                  v-if="scope.row.ordersState !== 1"
                   @click="pay(scope.row)" >支付</el-button>
                 <!--              v-if="scope.row.status === '待支付'"-->
               </template>
@@ -161,11 +160,10 @@ import {
   ordersDelete,
   pay,
   getOut,
-  updateByeExist, updateByordersState1
+  updateByeExist
 } from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
 import axios from 'axios'
-import item from '@/layout/components/Sidebar/Item.vue'
 
 
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
@@ -219,11 +217,7 @@ export default {
     };
   },
   //计算属性 类似于data概念",
-  computed: {
+  computed: {},
-    item() {
-      return item
-    }
-  },
   //监控data中的数据变化",
   watch: {},
   //方法集合",
@@ -314,15 +308,8 @@ 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)
+      window.open("http://21.12.0.10:80/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
       this.$message.success('付款成功')
-      updateByordersState1(ordersForm).then(response=>{
-        alert(response.msg)
-        if (response.code==200){}
-        this.addordersoff=false
-      })
-
-
     },
 
     getOut(){
@@ -336,7 +323,6 @@ export default {
       this.$router.push({path:"/reclaim/index"})
     }
 
-
     // getOut(){
     //   axios.get('/market/orders/getOutAll').
     //   then(response =>{

src/views/property/asDisplay/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <h1>资产展示</h1>
+    <h1>测试4()- 资产展示</h1>
 
     <el-container>
       <el-aside width="400px">
@@ -26,7 +26,7 @@
               <el-descriptions class="margin-top" title="资产模型基本信息" :column="2"  border>
                 <el-descriptions-item>
                   <template slot="label">表名称</template>
-                  {{ tableBasic.name }}
+                  {{ tableBasic.tableName }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">表备注</template>
@@ -34,11 +34,11 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">数据量</template>
-                  {{ dataNum }}
+                  {{ tableBasic.dataNum }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">是否核心</template>
-                  <el-tag size="small" v-if="dataNum!=0">是</el-tag>
+                  <dict-tag :options="dict.type.sys_no" :value="tableBasic.isCenter"/>
                 </el-descriptions-item>
               </el-descriptions>
             </template>
@@ -51,13 +51,13 @@
           </div>
           <el-row :gutter="20">
 <!--            -->
-            <el-col :span="6" v-for="DataValue in  tableStructure" style="margin-top: 20px">
+            <el-col :span="6" v-for="DataValue in  assetShowList" style="margin-top: 20px">
-              <el-descriptions :title="测试+'.'+tableBasic.name+'.'+DataValue.field" direction="vertical"
+              <el-descriptions :title="tableBasic.tableRemark+'.'+tableBasic.tableName+'.'+DataValue.key" direction="vertical"
                                border :column="1">
                 <el-descriptions-item label="Type">
-                  <el-tag size="small">{{ DataValue.dataMapping}}</el-tag>
+                  <el-tag size="small">{{ DataValue.type }}</el-tag>
                 </el-descriptions-item>
-                <el-descriptions-item label="Value">{{ DataValue.dataValue }}</el-descriptions-item>
+                <el-descriptions-item label="Value">{{ DataValue.value }}</el-descriptions-item>
               </el-descriptions>
 
 
@@ -65,15 +65,15 @@
           </el-row>
         </el-card>
         <el-table
-          :data="tableStructure"
+          :data="DataValue"
           style="width: 100%">
           <el-table-column
-            prop="field"
+            prop="key"
             label="key"
             width="180">
           </el-table-column>
           <el-table-column
-            prop="annotation"
+            prop="label"
             label="label"
             width="180">
           </el-table-column>
@@ -82,10 +82,11 @@
             label="type">
           </el-table-column>
           <el-table-column
-            prop="dataValue"
+            prop="value"
             label="value">
           </el-table-column>
         </el-table>
+
       </el-main>
     </el-container>
 
@@ -99,7 +100,6 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 import { findTableValue, getExtractDataTableNameList, selectBasicList } from '@/api/property/asDisplay'
-import { tableStructureShow } from '@/api/property/astr'
 
 export default {
   //import引入的组件需要注入到对象中才能使用"
@@ -112,10 +112,10 @@ export default {
     return {
       data:[],
       defaultProps: {
-        children: 'tableNames',
+        children: 'children',
-        label: 'name'
+        label: 'tableName'
       },
-      tableBasic:[],
+      tableBasic:{},
       tableStructure:[],
       assetShowList: [
         // {key: "测试.sys_user.id", type: "String", value: 1},
@@ -124,8 +124,9 @@ export default {
         // {key: "测试.sys_user.email", type: "String", value: "123@136.com"},
         // {key: "测试.sys_user.sex", type: "String", value: "Y"},
       ],
+      kvtList: [],
       DataValue:[],
-      dataNum:'',
+
     };
   },
   //计算属性 类似于data概念",
@@ -142,16 +143,23 @@ export default {
     },
 
     handleNodeClick(data){
-      if (this.data.name!=data.name){
+      console.log("...."+data)
-        tableStructureShow(data).then(res=> {
       this.tableBasic=data
-          console.log(res)
+
-          this.dataNum = res.data.length
+      // findStructureByTableId(data.id).then((res)=>{
-          this.tableStructure = res.data
+      //   this.tableStructure=res.data
+      // })
+      if (data.children==null){
+        findTableValueList(data.basicId,data.tableName).then(res=>{
+          this.assetShowList=res.data;
+          this.DataValue=res.data;
         })
       }
+      console.log("-----"+this.DataValue);
+      console.log("...."+data.basicId)
 
-    },
+
+        }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
@@ -180,4 +188,5 @@ export default {
 <style scoped>
 
 
+
 </style>

src/views/property/asauth/index.vue

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

src/views/property/astr/index.vue

@@ -62,7 +62,7 @@
               </template>
             </el-table-column>
             <el-table-column label="类型" prop="type"></el-table-column>
-            <el-table-column label="映射类型" prop="dataMapping"></el-table-column>
+            <el-table-column label="映射类型" prop="types"></el-table-column>
             <el-table-column label="是否为空" prop="nullable"></el-table-column>
             <el-table-column label="是否字典" prop="isDictionary"></el-table-column>
             <el-table-column label="映射字典" prop="dictionaryTable"></el-table-column>
@@ -87,7 +87,7 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 
-import { getExtractDataTableNameList, tableStructureShow } from '@/api/property/astr'
+import { findTableValue, getExtractDataTableNameList } from '@/api/property/astr'
 
 export default {
   //import引入的组件需要注入到对象中才能使用"
@@ -124,17 +124,37 @@ export default {
       })
     },
     handleNodeClick(data){
-      console.log(data)
+      // console.log(data)
       this.tableBasic=data
+      this.dataNum=data.tableFie.length
+      this.tableStructure=data.tableFie
+      // console.log(this.tableStructure)
+        findTableValue(data.dataId,data.name).then(res=>{
+          let tableMapping=res.data
+          // console.log(res.data)
+
+          for (const index in tableMapping) {
+            for (const i in this.tableStructure) {
+              if (tableMapping[index].key === this.tableStructure[i].field) {
+
+                this.tableStructure[i].types.push(tableMapping[index].type)
+
+                console.log(this.tableStructure[i].types)
+                if (i!== 0&& this.tableStructure[i].types==this.tableStructure[0].types){
+
+                  alert("dawdwadad")
+                  return
+                }
+              }
+            }
+
+          }
+
 
-      tableStructureShow(data).then(res => {
-        console.log(res)
-        this.dataNum = res.data.length
-        this.tableStructure = res.data
         })
-
     },
 
+
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
@@ -163,4 +183,5 @@ export default {
 <style scoped>
 
 
+
 </style>