From 126d17f1411bdbff6d65526083f87dfc1b23a4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?=
 <13694051+wangxizhao123@user.noreply.gitee.com>
Date: Sun, 12 May 2024 21:45:50 +0800
Subject: [PATCH] =?UTF-8?q?feat()=E5=89=8D=E7=AB=AF=E8=B0=83=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/goods/config.js                       | 18 ++--
 src/api/goods/cope.js                         |  8 +-
 src/api/goods/edition.js                      | 12 +--
 src/api/goods/engine.js                       | 22 ++---
 src/api/ranges/range.js                       | 10 ++
 src/api/system/access.js                      |  8 ++
 src/api/system/accredit.js                    | 14 +++
 .../authorization/auth/AuthDataSource.vue     |  3 -
 .../assets/authorization/auth/AuthTable.vue   |  2 -
 src/views/assets/show/index.vue               |  9 +-
 .../table/dashboard/OverallAssetStructure.vue | 30 ++++--
 .../assets/table/dashboard/OverallAssets.vue  | 93 +++++++++---------
 .../table/dashboard/OverallSpecificAssets.vue | 97 +++++++++++--------
 src/views/assets/table/index.vue              | 47 +++------
 src/views/engine/edition/index.vue            | 15 ++-
 src/views/engine/rule/index.vue               | 31 +++---
 src/views/good/index.vue                      | 10 ++
 17 files changed, 240 insertions(+), 189 deletions(-)
 create mode 100644 src/api/ranges/range.js

diff --git a/src/api/goods/config.js b/src/api/goods/config.js
index 3a894a5..03261f0 100644
--- a/src/api/goods/config.js
+++ b/src/api/goods/config.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询引擎列表
 export function listConfig(query) {
   return request({
-    url: '/goods/config/list',
+    url: '/rule/config/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listConfig(query) {
 // 查询引擎列表
 export function listConfigEs(ruleId) {
   return request({
-    url: '/goods/config/listConfigEs/' + ruleId,
+    url: '/rule/config/listConfigEs/' + ruleId,
     method: 'post'
   })
 }
@@ -20,7 +20,7 @@ export function listConfigEs(ruleId) {
 // 查询引擎详细
 export function getConfig(id) {
   return request({
-    url: '/goods/config/' + id,
+    url: '/rule/config/' + id,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getConfig(id) {
 // 新增引擎
 export function addConfig(data) {
   return request({
-    url: '/goods/config',
+    url: '/rule/config',
     method: 'post',
     data: data
   })
@@ -37,7 +37,7 @@ export function addConfig(data) {
 // 修改引擎
 export function updateConfig(data) {
   return request({
-    url: '/goods/config',
+    url: '/rule/config',
     method: 'put',
     data: data
   })
@@ -46,14 +46,14 @@ export function updateConfig(data) {
 // 删除引擎
 export function delConfig(id) {
   return request({
-    url: '/goods/config/' + id,
+    url: '/rule/config/' + id,
     method: 'delete'
   })
 }
 // 测试
 export function textData(data) {
   return request({
-    url: '/goods/config/testData',
+    url: '/rule/config/testData',
     method: 'post',
     data
   })
@@ -61,14 +61,14 @@ export function textData(data) {
 // 通过引擎作用域编号获取引擎配置作用域信息
 export function getScopeInfo(id) {
   return request({
-    url: '/goods/config/getScopeInfo/' + id,
+    url: '/rule/config/getScopeInfo/' + id,
     method: 'post'
   })
 }
 
 export function queryConfigInfo(id) {
   return request({
-    url: '/goods/config/queryConfigInfo/' + id,
+    url: '/rule/config/queryConfigInfo/' + id,
     method: 'post'
   })
 }
diff --git a/src/api/goods/cope.js b/src/api/goods/cope.js
index cf5f17a..78ed7a5 100644
--- a/src/api/goods/cope.js
+++ b/src/api/goods/cope.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询规则引擎列表
 export function listCope(data) {
   return request({
-    url: '/goods/cope/list',
+    url: '/rule/cope/list',
     method: 'post',
     data
   })
@@ -11,7 +11,7 @@ export function listCope(data) {
 
 export function listCope2(data) {
   return request({
-    url: '/goods/cope/list2',
+    url: '/rule/cope/list2',
     method: 'post',
     data
   })
@@ -19,14 +19,14 @@ export function listCope2(data) {
 
 export function selType(name) {
   return request({
-    url: '/goods/cope/selType/' + name,
+    url: '/rule/cope/selType/' + name,
     method: 'post'
   })
 }
 
 export function selObject(data) {
   return request({
-    url: '/goods/cope/selObject',
+    url: '/rule/cope/selObject',
     method: 'post',
     data
   })
diff --git a/src/api/goods/edition.js b/src/api/goods/edition.js
index 92e0c49..36bca0e 100644
--- a/src/api/goods/edition.js
+++ b/src/api/goods/edition.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询规则引擎版本列表
 export function listEdition(data) {
   return request({
-    url: '/goods/edition/list',
+    url: '/rule/edition/list',
     method: 'get',
     data
   })
@@ -11,7 +11,7 @@ export function listEdition(data) {
 // 获取相应的规则引擎版本
 export function selectListRuleId(ruleId) {
   return request({
-    url: '/goods/edition/selectListRuleId/' + ruleId,
+    url: '/rule/edition/selectListRuleId/' + ruleId,
     method: 'post'
   })
 }
@@ -19,7 +19,7 @@ export function selectListRuleId(ruleId) {
 // 查询规则引擎版本详细
 export function getEdition(id) {
   return request({
-    url: '/goods/edition/' + id,
+    url: '/rule/edition/' + id,
     method: 'get'
   })
 }
@@ -27,7 +27,7 @@ export function getEdition(id) {
 // 新增规则引擎版本
 export function addEdition(data) {
   return request({
-    url: '/goods/edition',
+    url: '/rule/edition',
     method: 'post',
     data: data
   })
@@ -36,7 +36,7 @@ export function addEdition(data) {
 // 修改规则引擎版本
 export function updateEdition(data) {
   return request({
-    url: '/goods/edition',
+    url: '/rule/edition',
     method: 'put',
     data: data
   })
@@ -45,7 +45,7 @@ export function updateEdition(data) {
 // 删除规则引擎版本
 export function delEdition(id) {
   return request({
-    url: '/goods/edition/' + id,
+    url: '/rule/edition/' + id,
     method: 'delete'
   })
 }
diff --git a/src/api/goods/engine.js b/src/api/goods/engine.js
index 2168372..af67804 100644
--- a/src/api/goods/engine.js
+++ b/src/api/goods/engine.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询规则引擎列表
 export function listEngine(query) {
   return request({
-    url: '/goods/engine/list',
+    url: '/rule/engine/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listEngine(query) {
 // 查询规则引擎详细
 export function getEngine(ruleId) {
   return request({
-    url: '/goods/engine/' + ruleId,
+    url: '/rule/engine/' + ruleId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getEngine(ruleId) {
 // 新增规则引擎
 export function addEngine(data) {
   return request({
-    url: '/goods/engine',
+    url: '/rule/engine',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addEngine(data) {
 // 修改规则引擎
 export function updateEngine(data) {
   return request({
-    url: '/goods/engine',
+    url: '/rule/engine',
     method: 'put',
     data: data
   })
@@ -38,35 +38,35 @@ export function updateEngine(data) {
 // 删除规则引擎
 export function delEngine(ruleId) {
   return request({
-    url: '/goods/engine/' + ruleId,
+    url: '/rule/engine/' + ruleId,
     method: 'delete'
   })
 }
 
 export function selectRuleEngineByRuleId(ruleId) {
   return request({
-    url: '/goods/engine/' + ruleId,
+    url: '/rule/engine/' + ruleId,
     method: 'get'
   })
 }
 
 export function description(ruleId) {
   return request({
-    url: '/goods/engine/description/' + ruleId,
+    url: '/rule/engine/description/' + ruleId,
     method: 'post'
   })
 }
 
 export function selectRuleEngineOne(ruleId) {
   return request({
-    url: '/goods/engine/selectRuleEngineOne/' + ruleId,
+    url: '/rule/engine/selectRuleEngineOne/' + ruleId,
     method: 'post'
   })
 }
 
 export function updateRuleIsActivate(data) {
   return request({
-    url: '/goods/engine/updateRuleIsActivate',
+    url: '/rule/engine/updateRuleIsActivate',
     method: 'put',
     data: data
   })
@@ -74,7 +74,7 @@ export function updateRuleIsActivate(data) {
 
 export function updateRuleStatus(data) {
   return request({
-    url: '/goods/engine/updateRuleStatus',
+    url: '/rule/engine/updateRuleStatus',
     method: 'put',
     data: data
   })
@@ -82,7 +82,7 @@ export function updateRuleStatus(data) {
 
 export function spliceNameToCode(name, code, level) {
   return request({
-    url: '/goods/engine/spliceNameToCode?name=' + name + "&code=" + code + "&level=" + level,
+    url: '/rule/engine/spliceNameToCode?name=' + name + "&code=" + code + "&level=" + level,
     method: 'post'
   })
 }
diff --git a/src/api/ranges/range.js b/src/api/ranges/range.js
new file mode 100644
index 0000000..8b45815
--- /dev/null
+++ b/src/api/ranges/range.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询引擎列表
+export function sel(data) {
+  return request({
+    url: '/rule/range/sel',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/system/access.js b/src/api/system/access.js
index 5cf0f0d..a5d3e31 100644
--- a/src/api/system/access.js
+++ b/src/api/system/access.js
@@ -9,6 +9,14 @@ export function listAccess(query) {
   })
 }
 
+export function lists(data) {
+  return request({
+    url: '/system/access/lists',
+    method: 'post',
+    data
+  })
+}
+
 // 查询数据接入详细
 export function getAccess(id) {
   return request({
diff --git a/src/api/system/accredit.js b/src/api/system/accredit.js
index 15e33e5..48abb51 100644
--- a/src/api/system/accredit.js
+++ b/src/api/system/accredit.js
@@ -89,6 +89,13 @@ export function selectFrimary(data) {
     })
 }
 
+export function selStatus(databaseName,tableName) {
+    return request({
+        url: '/system/accredit/selStatus?databaseName=' + databaseName + '&tableName=' + tableName,
+        method: 'post'
+    })
+}
+
 export function listMiddle(tableName,databaseName) {
     return request({
         url: '/system/accredit/listMiddle?tableName=' + tableName + '&databaseName=' + databaseName,
@@ -146,4 +153,11 @@ export function selTotalNum(data) {
     })
 }
 
+export function selTotal(name) {
+    return request({
+      url: '/system/accredit/selTotal/' + name,
+      method: 'post'
+    })
+}
+
 
diff --git a/src/views/assets/authorization/auth/AuthDataSource.vue b/src/views/assets/authorization/auth/AuthDataSource.vue
index 1df47d0..2eb5e70 100644
--- a/src/views/assets/authorization/auth/AuthDataSource.vue
+++ b/src/views/assets/authorization/auth/AuthDataSource.vue
@@ -35,7 +35,6 @@
           <el-table-column align="center" label="创建时间" prop="createTime"></el-table-column>
           <el-table-column align="center" label="操作" >
             <template slot-scope="scope">
-              {{scope.row.statusId}}
               <el-switch
                 style="display: block"
                 v-model="scope.row.statusId"
@@ -62,7 +61,6 @@
           <el-table-column align="center" label="创建时间" prop="createTime" />
           <el-table-column align="center" label="操作" >
             <template slot-scope="scope">
-              {{scope.row.statusId}}
               <el-switch
                 style="display: block"
                 v-model="scope.row.statusId"
@@ -143,7 +141,6 @@ export default {
 
     },
     updUser(row) {
-        console.log(row.statusId)
         updateUserMiddle(row.mid,row.statusId).then(res => {
           this.$message.success(res.data)
         })
diff --git a/src/views/assets/authorization/auth/AuthTable.vue b/src/views/assets/authorization/auth/AuthTable.vue
index b15a675..daff7f0 100644
--- a/src/views/assets/authorization/auth/AuthTable.vue
+++ b/src/views/assets/authorization/auth/AuthTable.vue
@@ -50,7 +50,6 @@
           <el-table-column label="创建时间" prop="createTime" ></el-table-column>
           <el-table-column align="center" label="操作" prop="statusId" >
             <template slot-scope="scope">
-              {{scope.row.statusId}}
               <el-switch
                 style="display: block"
                 v-model="scope.row.statusId"
@@ -77,7 +76,6 @@
           <el-table-column align="center" label="创建时间" prop="createTime" />
           <el-table-column align="center" label="操作" prop="statusId" >
             <template slot-scope="scope">
-              {{scope.row.statusId}}
               <el-switch
                 style="display: block"
                 v-model="scope.row.statusId"
diff --git a/src/views/assets/show/index.vue b/src/views/assets/show/index.vue
index bb98fbd..fe9ab21 100644
--- a/src/views/assets/show/index.vue
+++ b/src/views/assets/show/index.vue
@@ -86,13 +86,16 @@ export default {
     showName(data) {
       console.log(data)
       this.showAuth = data.type
+      if (data.type === 'dataSource'){
+        this.table = data
+        selectShow(data.databaseName).then(res => {
+          this.assetShowList = res.data
+        })
+      }
       if (data.type === 'dataTable'){
         this.table = data
-        console.log(data.tableName)
         selectShow(data.tableName).then(res => {
-          console.log(res)
           this.assetShowList = res.data
-          console.log(res.data)
         })
       }
     },
diff --git a/src/views/assets/table/dashboard/OverallAssetStructure.vue b/src/views/assets/table/dashboard/OverallAssetStructure.vue
index 47dd747..58407c8 100644
--- a/src/views/assets/table/dashboard/OverallAssetStructure.vue
+++ b/src/views/assets/table/dashboard/OverallAssetStructure.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="tableParams!= null">
     <el-card>
       <div slot="header" class="clearfix">
         <span>资产模型基本信息</span>
@@ -164,7 +164,7 @@
 <script>
 import {
   selNameListStructure,
-  updateListStructure
+  updateListStructure,selStatus
 } from '@/api/system/accredit'
 import { listDictType, selectDictType } from "@/api/system/dicts";
 
@@ -172,16 +172,17 @@ export default {
   props: {
     tableParams: {
       type: Object
-    },
-    stats: {
-      type: Object
     }
   },
   watch: {
-    handler(val) {
-      if (val != null) {
-        this.init()
-      }
+    tableParams: {
+      handler(val) {
+        if (val != null){
+          this.init()
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   name: 'OverallAssetStructure',
@@ -208,6 +209,11 @@ export default {
         yesOrNo: '',
         dictionary: ''
       },
+      stats: {
+        tableName: '',
+        asas: '',
+        dataTotal: 0,
+      },
       formStatus: false,
       dictMap2:{
         dictType: '',
@@ -233,10 +239,16 @@ export default {
       })
     },
     init() {
+      console.log(this.tableParams.databaseName)
+      console.log(this.tableParams.tableName)
       this.table =
         selNameListStructure(this.tableParams.tableName,this.tableParams.databaseName).then(res => {
           this.childrenList = res.data
         })
+      selStatus(this.tableParams.databaseName,this.tableParams.tableName).then(res => {
+        this.stats = res.data
+        console.log(res.data)
+      })
       listDictType().then(res => {
         this.dictOut = res.data
       })
diff --git a/src/views/assets/table/dashboard/OverallAssets.vue b/src/views/assets/table/dashboard/OverallAssets.vue
index a99f285..caf9c6d 100644
--- a/src/views/assets/table/dashboard/OverallAssets.vue
+++ b/src/views/assets/table/dashboard/OverallAssets.vue
@@ -1,47 +1,50 @@
 <template>
-  <el-form :model="totalNum">
-    <el-row>
-      <el-col :lg="8" :sm="12" :xs="12" class="card-panel-col">
-        <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
-          <div class="card-panel-icon-wrapper icon-people">
-            <svg-icon class-name="card-panel-icon" icon-class="database"/>
-          </div>
-          <div class="card-panel-description">
-            <div class="card-panel-text">
-              数据接入
-            </div>
-            <count-to :duration="2600" :end-val="totalNum.switchOns" :start-val="0" class="card-panel-num"/>
-          </div>
+  <el-row :gutter="40" class="panel-group">
+    <div class="title-header">
+      整体数据资产结构概述
+    </div>
+    <el-form :model="totalNum">
+    <el-col :lg="8" :sm="12" :xs="12" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+        <div class="card-panel-icon-wrapper icon-people">
+          <svg-icon class-name="card-panel-icon" icon-class="database"/>
         </div>
-      </el-col>
-      <el-col :lg="8" :sm="12" :xs="12" class="card-panel-col">
-        <div class="card-panel" @click="handleSetLineChartData('messages')">
-          <div class="card-panel-icon-wrapper icon-message">
-            <svg-icon class-name="card-panel-icon" icon-class="table"/>
-          </div>
-          <div class="card-panel-description">
-            <div class="card-panel-text">
-              资产模型
-            </div>
-            <count-to :duration="3000" :end-val="totalNum.assetsNum" :start-val="0" class="card-panel-num"/>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            数据接入
           </div>
+          <count-to :duration="2600" :end-val="totalNum.switchOns" :start-val="0" class="card-panel-num"/>
         </div>
-      </el-col>
-      <el-col :lg="8" :sm="12" :xs="12" class="card-panel-col">
-        <div class="card-panel" @click="handleSetLineChartData('purchases')">
-          <div class="card-panel-icon-wrapper icon-money">
-            <svg-icon class-name="card-panel-icon" icon-class="field"/>
-          </div>
-          <div class="card-panel-description">
-            <div class="card-panel-text">
-              数据模型
-            </div>
-            <count-to :duration="3200" :end-val="totalNum.fieldsNum" :start-val="0" class="card-panel-num"/>
-          </div>
+      </div>
+    </el-col>
+    <el-col :lg="8" :sm="12" :xs="12" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('messages')">
+        <div class="card-panel-icon-wrapper icon-message">
+          <svg-icon class-name="card-panel-icon" icon-class="table"/>
         </div>
-      </el-col>
-    </el-row>
-  </el-form>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            资产模型
+          </div>
+          <count-to :duration="3000" :end-val="totalNum.assetsNum" :start-val="0" class="card-panel-num"/>
+        </div>
+      </div>
+    </el-col>
+    <el-col :lg="8" :sm="12" :xs="12" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+        <div class="card-panel-icon-wrapper icon-money">
+          <svg-icon class-name="card-panel-icon" icon-class="field"/>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            数据模型
+          </div>
+          <count-to :duration="3200" :end-val="totalNum.fieldsNum" :start-val="0" class="card-panel-num"/>
+        </div>
+      </div>
+    </el-col>
+    </el-form>
+  </el-row>
 </template>
 
 <script>
@@ -49,17 +52,12 @@ import CountTo from 'vue-count-to'
 import { selTotalNum } from "@/api/system/accredit";
 
 export default {
-  // props: {
-  //   total:{
-  //     type: Object
-  //   }
-  // },
   data() {
     return {
       totalNum: {
-        switchOns: '',
-        assetsNum: '',
-        fieldsNum: ''
+        switchOns: 0,
+        assetsNum: 0,
+        fieldsNum: 0
       }
     }
   },
@@ -73,7 +71,6 @@ export default {
     init() {
       selTotalNum().then(res => {
         this.totalNum = res.data
-        console.log(res.data)
       })
     }
   },
diff --git a/src/views/assets/table/dashboard/OverallSpecificAssets.vue b/src/views/assets/table/dashboard/OverallSpecificAssets.vue
index 98e7754..d55659a 100644
--- a/src/views/assets/table/dashboard/OverallSpecificAssets.vue
+++ b/src/views/assets/table/dashboard/OverallSpecificAssets.vue
@@ -3,32 +3,34 @@
     <div class="title-header">
       {{title}} - 资产结构概述
     </div>
-    <el-col :sm="12" :xs="12" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
-        <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon class-name="card-panel-icon" icon-class="table"/>
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            资产模型
+    <el-form :model="totalNum">
+      <el-col :sm="12" :xs="12" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('messages')">
+          <div class="card-panel-icon-wrapper icon-message">
+            <svg-icon class-name="card-panel-icon" icon-class="table"/>
           </div>
-          <count-to :duration="3000" :end-val="15" :start-val="0" class="card-panel-num"/>
-        </div>
-      </div>
-    </el-col>
-    <el-col :sm="12" :xs="12" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon class-name="card-panel-icon" icon-class="field"/>
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            数据模型
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              资产模型
+            </div>
+            <count-to :duration="3000" :end-val="totalNum.assetsNum" :start-val="0" class="card-panel-num"/>
           </div>
-          <count-to :duration="3200" :end-val="230" :start-val="0" class="card-panel-num"/>
         </div>
-      </div>
-    </el-col>
+      </el-col>
+      <el-col :sm="12" :xs="12" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('purchases')">
+          <div class="card-panel-icon-wrapper icon-money">
+            <svg-icon class-name="card-panel-icon" icon-class="field"/>
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              数据模型
+            </div>
+            <count-to :duration="3200" :end-val="totalNum.fieldsNum" :start-val="0" class="card-panel-num"/>
+          </div>
+        </div>
+      </el-col>
+    </el-form>
     <el-col :span="24">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
@@ -130,7 +132,7 @@ import CountTo from 'vue-count-to'
 import OverallAssetStructure from './OverallAssetStructure.vue'
 import { listDictType, indexDictType, indexDictData, deleteDictData, selectDictData, deleteDictType } from "@/api/system/dicts"
 import val from "quill";
-
+import { selTotal } from "@/api/system/accredit";
 export default {
   props: {
     title: {
@@ -141,6 +143,17 @@ export default {
         type: Array
     }
   },
+  watch: {
+    overallName: {
+      handler(val) {
+        if (val != null){
+          this.init()
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   data() {
     return {
       activeName: null,
@@ -148,7 +161,10 @@ export default {
       dictMap: [],
       tableList: [],
       listStatus: [],
-      tableParams: null,
+      tableParams: {
+        tableName: '',
+        tableAsName: ''
+      },
       stats: null,
       dictData: {
         dictCode: '',
@@ -156,6 +172,10 @@ export default {
         dictLabel: '',
         dictValue: '',
         isEdit: false,
+      },
+      totalNum: {
+        assetsNum: 0,
+        fieldsNum: 0
       }
     }
   },
@@ -170,7 +190,7 @@ export default {
     checkTableName(checkTab){
       console.log(checkTab)
       this.tableParams = this.tableList.findLast(item => item.tableName === checkTab.name)
-      this.stats = this.type.find(item => item.tableName === checkTab.name)
+      console.log(this.tableParams)
     },
     updData(row) {
       selectDictData(row).then(res => {
@@ -214,23 +234,20 @@ export default {
       this.$emit('handleSetLineChartData', type)
     },
     init() {
+      // console.log(this.overallName.at(0).databaseName)
+      selTotal(this.overallName.at(0).databaseName).then(res => {
+        this.totalNum = res.data
+      })
       listDictType().then(res => {
         this.dictMap = res.data
       })
-      this.listStatus =this.overallName
-      // let rows = [
-      //   {
-      //     tableName: "sys_user",
-      //     asas: "用户表"
-      //   },
-      //   {
-      //     tableName: "sys_dept",
-      //     asas: "部门表"
-      //   },
-      // ];
-      this.tableList = this.listStatus;
-      this.activeName = this.listStatus[0].tableName;
-      this.tableParams = this.listStatus[0]
+      this.tableList = this.overallName;
+      this.activeName = this.tableList[0].tableName;
+      this.tableParams = {
+        tableName: this.tableList[0].tableName,
+        databaseName: this.tableList[0].databaseName
+      }
+      console.log(this.tableParams)
     }
   },
   // 生命周期 - 创建完成（可以访问当前this实例）",
diff --git a/src/views/assets/table/index.vue b/src/views/assets/table/index.vue
index 050c7cd..621b80f 100644
--- a/src/views/assets/table/index.vue
+++ b/src/views/assets/table/index.vue
@@ -16,21 +16,20 @@
     <el-container>
       <el-main>
         <OverallAssets v-if="showAssets == null"/>
-        <OverallAssets v-if="showAssets == 'dataSource'"  />
         <overall-specific-assets v-if="showAssets === 'dataSource'" :title="title" :overall-name="overallName"/>
-        <overall-asset-structure v-if="showAssets === 'dataTable'" :table-params="tableParams" :stats="stats" />
+        <overall-asset-structure v-if="showAssets === 'dataTable'" :table-params="tableParams"/>
       </el-main>
     </el-container>
   </el-container>
 </template>
 <script>
-
-import OverallSpecificAssets from "@/views/assets/table/dashboard/OverallSpecificAssets.vue";
-import OverallAssetStructure from "@/views/assets/table/dashboard/OverallAssetStructure.vue";
-import OverallAssets from "@/views/assets/table/dashboard/OverallAssets.vue";
+import OverallAssets from './dashboard/OverallAssets.vue'
+import OverallSpecificAssets from './dashboard/OverallSpecificAssets.vue'
+import OverallAssetStructure from './dashboard/OverallAssetStructure.vue'
 import { selectFrimary } from "@/api/system/accredit";
 
 export default {
+  name: 'assetStructure',
   components: { OverallAssetStructure, OverallSpecificAssets, OverallAssets },
   data() {
     return {
@@ -41,12 +40,10 @@ export default {
       },
       assetStructureList: [],
       childrenList: [],
+      overallName: [],
       showAssets: null,
-      tableParams: null,
-      stats: null,
       title: null,
-      total: null,
-      overallName: []
+      tableParams: null
     }
   },
   methods: {
@@ -55,20 +52,23 @@ export default {
       const {data} = node;
       this.showAssets = data.type;
       if (data.type === 'dataTable') {
+        this.tableParams = {
+          tableName: data.name,
+          tableAsName: data.as
+        }
         return resolve([])
       }
       setTimeout(() => {
         resolve(data.tableLists)
       }, 500);
     },
-    showAssetsFun(data) {
-      this.title = data.name + '(' + data.databaseName + '-' + data.systemName + ')'
+    showAssetsFun(data){
+      this.title = data.name + '('+data.databaseName + '-' + data.systemName+')'
       this.showAssets = data.type;
-      this.stats = data
       if (data.type === 'dataSource') {
         this.overallName = data.tableLists
       }
-      if (data.type === 'dataTable'){
+      if (data.type === "dataTable"){
         this.tableParams = {
           tableName: data.tableName,
           databaseName: data.databaseName
@@ -84,24 +84,7 @@ export default {
   // 生命周期 - 创建完成（可以访问当前this实例）",
   created() {
     this.init()
-  },
-  // 生命周期 - 挂载完成（可以访问DOM元素）",
-  mounted() {
-  },
-  beforeCreate() {
-  }, // 生命周期 - 创建之前",
-  beforeMount() {
-  }, // 生命周期 - 挂载之前",
-  beforeUpdate() {
-  }, // 生命周期 - 更新之前",
-  updated() {
-  }, // 生命周期 - 更新之后",
-  beforeDestroy() {
-  }, // 生命周期 - 销毁之前",
-  destroyed() {
-  }, // 生命周期 - 销毁完成",
-  activated() {
-  } // 如果页面有keep-alive缓存功能，这个函数会触发",
+  }
 }
 </script>
 <style scoped lang="scss">
diff --git a/src/views/engine/edition/index.vue b/src/views/engine/edition/index.vue
index 1935cd4..0f28ceb 100644
--- a/src/views/engine/edition/index.vue
+++ b/src/views/engine/edition/index.vue
@@ -20,10 +20,11 @@
           <dict-tag :options="dict.type.rule_engine_type" :value="ruleInfo.ruleType"></dict-tag>
         </el-descriptions-item>
         <el-descriptions-item label="是否激活">
-            <dict-tag :options="dict.type.rule_engine_is_test" :value="ruleInfo.ruleIsActivate"></dict-tag>
+            <dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleInfo.ruleIsActivate"></dict-tag>
         </el-descriptions-item>
         <el-descriptions-item label="规则状态">
-            <dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleInfo.ruleStatus"></dict-tag>
+          <span v-if="ruleInfo.ruleStatus === 'Y'">在用</span>
+          <span v-if="ruleInfo.ruleStatus === 'N'">停用</span>
         </el-descriptions-item>
       </el-descriptions>
 
@@ -107,7 +108,7 @@
             <editor v-model="form.editionContent" :min-height="180"/>
           </el-form-item>
       </el-form>
-      <el-card class="box-card" v-if="form.ruleContent != null">
+      <el-card class="box-card" v-if="form.ruleContent != ''">
         <div slot="header" class="clearfix">
           <span>引擎编码</span>
         </div>
@@ -215,7 +216,13 @@ export default {
       //测试表单
       ruleEngineTest:{},
       // 表单参数
-      form: {},
+      form: {
+        versionClass: "",
+        name: "",
+        versionCode: "",
+        editionContent: "",
+        ruleContent: ""
+      },
       // 表单校验
       rules: {
       }
diff --git a/src/views/engine/rule/index.vue b/src/views/engine/rule/index.vue
index 88d4a76..2bfa0d7 100644
--- a/src/views/engine/rule/index.vue
+++ b/src/views/engine/rule/index.vue
@@ -11,35 +11,30 @@
       </el-form-item>
         <el-form-item label="是否激活" prop="ruleIsActivate">
           <el-select v-model="queryParams.ruleIsActivate" placeholder="请选择规则类型" clearable>
-            <el-option v-for="activate in isActive"
-            :key="activate.val"
-            :label="activate.label"
-            :value="activate.val"
-            ></el-option>
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
           </el-select>
         </el-form-item>
       <el-form-item label="规则状态" prop="ruleStatus">
         <el-select v-model="queryParams.ruleStatus" placeholder="请选择规则状态" clearable>
-          <el-option v-for="status in ruleStatus"
-                     :key="status.val"
-                     :label="status.label"
-                     :value="status.val"></el-option>
+          <el-option label="在用" value="Y"></el-option>
+          <el-option label="停用" value="N"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="规则级别" prop="ruleLevel">
         <el-select v-model="queryParams.ruleLevel" placeholder="请选择规则级别" clearable>
-          <el-option v-for="level in ruleLevel"
-                     :key="level.val"
-                     :label="level.val"
-                     :value="level.val"></el-option>
+          <el-option v-for="(val,cod) in dict.type.rule_engine_level"
+                     :key="cod"
+                     :label="val.label"
+                     :value="Number(val.value)"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="规则类型" prop="ruleType">
-        <el-select v-model="queryParams.ruleType" placeholder="请选择规则类型">
-          <el-option v-for="typeis in ruleType"
-                     :key="typeis.val"
-                     :label="typeis.val"
-                     :value="typeis.val"></el-option>
+        <el-select v-model="queryParams.ruleType" placeholder="请选择规则类型" clearable>
+          <el-option v-for="(val,cod) in dict.type.rule_engine_type"
+                     :key="cod"
+                     :label="val.label"
+                     :value="Number(val.value)"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
diff --git a/src/views/good/index.vue b/src/views/good/index.vue
index b83cd99..149ec11 100644
--- a/src/views/good/index.vue
+++ b/src/views/good/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <el-button @click="yes()">按钮</el-button>
     <el-form :inline="true" :model="cope" class="demo-form-inline">
       <el-form-item label="标题">
         <el-input v-model="cope.type" placeholder="题目"></el-input>
@@ -27,6 +28,8 @@
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
 import { listCope, selType, selObject } from "@/api/goods/cope";
+import { sel } from "@/api/ranges/range";
+import { lists } from "@/api/system/access";
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
@@ -49,6 +52,10 @@ export default {
   watch: {},
   // 方法集合",
   methods: {
+    yes() {
+      sel().then(res => {
+      })
+    },
     onSubmit() {
       selObject(this.cope).then(res => {
         this.copeList = res.data
@@ -60,6 +67,9 @@ export default {
       })
     },
     init() {
+      lists().then(res => {
+        console.log(res.data)
+      })
       listCope().then(res => {
         this.copeList = res.data
       })