From f25bfa08191591e5e768240802fad5afa4a82cdf Mon Sep 17 00:00:00 2001
From: chao <3072464591@QQ.com>
Date: Mon, 29 Apr 2024 15:21:42 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E6=95=B0=E6=8D=AE=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data/structure.js                     |  17 +++
 .../dashlboard/OverallAssetStructure.vue      | 119 ++++--------------
 .../dashlboard/OverallSpecificAssets.vue      |   6 +-
 3 files changed, 49 insertions(+), 93 deletions(-)

diff --git a/src/api/data/structure.js b/src/api/data/structure.js
index 297fd9b..b9581cc 100644
--- a/src/api/data/structure.js
+++ b/src/api/data/structure.js
@@ -15,3 +15,20 @@ export function selectAssetSouructureTableList(id) {
     method: 'post'
   })
 }
+
+// 修改数据源信息
+export function editAssetTableDetails(data) {
+  return request({
+    url: '/data/details',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询数据源信息详细
+export function findByAssetStructureTableIdlist(assetStructureTableId) {
+  return request({
+    url: '/data/details/' + assetStructureTableId,
+    method: 'get'
+  })
+}
diff --git a/src/views/data/structure/dashlboard/OverallAssetStructure.vue b/src/views/data/structure/dashlboard/OverallAssetStructure.vue
index 3cb19d9..d43ad14 100644
--- a/src/views/data/structure/dashlboard/OverallAssetStructure.vue
+++ b/src/views/data/structure/dashlboard/OverallAssetStructure.vue
@@ -20,6 +20,7 @@
       <el-table
         :data="assetTableDetailsList"
         style="width: 100%;">
+        <el-table-column prop="assetStructureTableId" label="资产表id" v-if="false"/>
         <el-table-column prop="name" label="名称" />
         <el-table-column prop="annotation" label="注释" />
         <el-table-column prop="primaryOrNot" label="是否主键" >
@@ -43,15 +44,15 @@
         <el-table-column prop="defaultValue" label="默认值" />
         <el-table-column prop="yesNoDictionary" label="是否字典" >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.isDict === 'Y'" size="small" type="success">
-              {{scope.row.isDict}}
+            <el-tag v-if="scope.row.yesNoDictionary === 'Y'" size="small" type="success">
+              {{scope.row.yesNoDictionary}}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="dictKey" label="映射字典" >
+        <el-table-column prop="mappingDictionary" label="映射字典" >
           <template slot-scope="scope">
             <el-popover
-              v-if="scope.row.isDict === 'Y'"
+              v-if="scope.row.yesNoDictionary === 'Y'"
               placement="left"
               width="200"
               trigger="hover">
@@ -63,7 +64,7 @@
                 <el-table-column property="label" label="字典标签"/>
                 <el-table-column property="value" label="字典值"/>
               </el-table>
-              <el-tag slot="reference">{{scope.row.dictKey}}</el-tag>
+              <el-tag slot="reference">{{scope.row.mappingDictionary}}</el-tag>
             </el-popover>
           </template>
         </el-table-column>
@@ -137,7 +138,7 @@
           <el-col :span="12">
             <el-form-item label="是否字典">
               <el-switch
-                v-model="form.isDict"
+                v-model="form.yesNoDictionary"
                 active-value="Y"
                 inactive-value="N"
                 active-color="#13ce66"
@@ -146,19 +147,19 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.isDict === 'Y'">
+        <el-row v-if="form.yesNoDictionary === 'Y'">
           <el-col :span="24">
             <el-form-item label="字典">
-              <el-select v-model="form.dictKey">
-                <el-option v-for="(value, key) in dictMap" :key="key" :label="key" :value="key"></el-option>
+              <el-select v-model="form.mappingDictionary">
+                <el-option v-for="item in dictionaryList" :key="item.name" :label="item.name" :value="item.name + '(' + item.type + ')'"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-for="item in dictionaryList" v-if="form.mappingDictionary === item.name + '(' + item.type + ')'">
             <el-form-item>
-              <el-table :data="dictMap[form.dictKey]" striped border>
+              <el-table :data="item.dataDictionaryTypeList" striped border>
                 <el-table-column property="label" label="字典标签"/>
-                <el-table-column property="val" label="字典值"/>
+                <el-table-column property="value" label="字典值"/>
               </el-table>
             </el-form-item>
           </el-col>
@@ -166,108 +167,42 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="formStatus = false">取 消</el-button>
-        <el-button type="primary" @click="formStatus = false">确 定</el-button>
+        <el-button type="primary" @click="detailsUpdate">确 定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
+import {editAssetTableDetails, findByAssetStructureTableIdlist} from "@/api/data/structure";
+
 export default {
   props: {
     tableName: null,
     tableNameAnnotation: null,
     tableDataCount: null,
-    assetTableDetailsList: []
+    assetTableDetailsList: [],
+    dictionaryList: []
   },
   name: 'OverallAssetStructure',
   data() {
     return {
-      tableData: [
-        {
-          id: 1,
-          name: "id",
-          comment: "主键",
-          isPrimaryKey: "Y",
-          type: "bigint",
-          mappingType: "Long",
-          length: "-",
-          decimalPlaces: "-",
-          isNull: "N",
-          defaultValue: "-",
-          isDict: "N",
-          dictKey: "-",
-        }, {
-          id: 2,
-          name: "name",
-          comment: "姓名",
-          isPrimaryKey: "N",
-          type: "varchar",
-          mappingType: "String",
-          length: "64",
-          decimalPlaces: "-",
-          isNull: "N",
-          defaultValue: "-",
-          isDict: "N",
-          dictKey: "-",
-        }, {
-          id: 3,
-          name: "sex",
-          comment: "性别",
-          isPrimaryKey: "N",
-          type: "char",
-          mappingType: "String",
-          length: "1",
-          decimalPlaces: "-",
-          isNull: "N",
-          defaultValue: "-",
-          isDict: "Y",
-          dictKey: "system_sex",
-        }, {
-          id: 4,
-          name: "price",
-          comment: "金额",
-          isPrimaryKey: "N",
-          type: "double",
-          mappingType: "BigDecimal",
-          length: "10",
-          decimalPlaces: "2",
-          isNull: "N",
-          defaultValue: "0.00",
-          isDict: "N",
-          dictKey: "-",
-        }, {
-          id: 5,
-          name: "create_time",
-          comment: "创建时间",
-          isPrimaryKey: "N",
-          type: "datetime",
-          mappingType: "Date",
-          length: "-",
-          decimalPlaces: "-",
-          isNull: "Y",
-          defaultValue: "-",
-          isDict: "N",
-          dictKey: "-",
-        }, ],
       form: {},
       formStatus: false,
-      dictMap: {
-        "system_sex": [
-          { label: '男', val: '1', isEdit: false },
-          { label: '女', val: '2', isEdit: false },
-          { label: '未知', val: '0', isEdit: false },
-        ],
-        "system_y_n": [
-          { label: '是', val: '1', isEdit: false },
-          { label: '否', val: '0', isEdit: false }
-        ],
-      }
     }
   },
   methods: {
     update(row) {
+      console.log(row)
       this.form = row;
       this.formStatus = true;
+    },
+    detailsUpdate() {
+      editAssetTableDetails(this.form).then(response => {
+        findByAssetStructureTableIdlist(this.form.assetStructureTableId).then(res => {
+          this.dictionaryList = res.data;
+          this.formStatus = false;
+        })
+      })
     }
   }
 }
diff --git a/src/views/data/structure/dashlboard/OverallSpecificAssets.vue b/src/views/data/structure/dashlboard/OverallSpecificAssets.vue
index a12f31e..43447e3 100644
--- a/src/views/data/structure/dashlboard/OverallSpecificAssets.vue
+++ b/src/views/data/structure/dashlboard/OverallSpecificAssets.vue
@@ -114,7 +114,9 @@
       <el-tabs v-model="activeName" type="border-card">
         <el-tab-pane v-for="(item,index) in structureTableDataCount.childrenList"
                      :label="item.tableName + '(' + item.tableNameAnnotation + ')'" :name="index">
-          <overall-asset-structure :assetTableDetailsList="item.assetTableDetailsList" :tableName="item.tableName"
+          <overall-asset-structure :assetTableDetailsList="item.assetTableDetailsList"
+                                   :dictionaryList="dictionaryList"
+                                   :tableName="item.tableName"
                                    :tableNameAnnotation="item.tableNameAnnotation"
                                    :tableDataCount="item.tableDataCount"/>
         </el-tab-pane>
@@ -186,6 +188,8 @@ export default {
           this.dictionaryList = response.data
         })
       })
+      this.name = null;
+      this.type = null;
     },
     controlsDictionaryType(row, id) {
       if (!row.label) {