From 5db4c4f167c5353c257c5b890b6ba6ccecbdfc07 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 02 十二月 2024 14:35:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
index 1412b4f..3ed864f 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
@@ -19,7 +19,7 @@
     </el-aside>
 
     <el-main>
-      <basic-container>
+      <basic-container cardBodyStyle="padding-bottom:0;">
         <avue-crud
           ref="crud"
           :data="data"
@@ -34,8 +34,8 @@
             <el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅鎺堟潈缁撴灉</el-button>
           </template>
         </avue-crud>
-        <div>
-          <data-view key="dataView" :btmNode="nodeRow" :data="viewData" :readOnly="true" height="400px"></data-view>
+        <div style="margin-top: 15px;">
+          <data-view key="dataView" :btmNode="nodeRow" :data="viewData" :actionDic="actionMap" :readOnly="true" :height="clientHeight-260-220"></data-view>
         </div>
         <!-- 鏂板 && 缂栬緫 -->
         <el-dialog
@@ -44,10 +44,10 @@
           :visible.sync="visible"
           append-to-body="true"
           class="avue-dialog"
-          width="75%"
+          width="70%"
           @close="addDialogClose">
             <div>
-              <data-view key="editView" :btmNode="nodeRow" :data="viewData" :readOnly="false" height="60vh"></data-view>
+              <data-view ref="editView" key="editView" :btmNode="nodeRow" :data="viewData" :actionDic="actionMap" :readOnly="false" :height="clientHeight-340"></data-view>
             </div>
             <span slot="footer" class="dialog-footer">
                <el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
@@ -84,15 +84,15 @@
 import {getBizTree} from "@/api/UI/uiDefine";
 import basicOption from "@/util/basic-option";
 import dataView from "./dataView";
-import {getTypeActionByType} from "@/api/authority/ui/typeAction";
+import {getData,saveGrand,delGrand} from "@/api/authority/ui/dataAuthor";
 import func from "@/util/func";
 import {getUsedEnumList} from "@/api/modeling/enumType/api";
-import {deleteTemplate, saveTemplate, updateTemplate} from "@/api/queryTemplate/queryDefine";
 export default {
   name: "index",
   components:{dataView},
   data:function (){
     return{
+      clientHeight:Math.max(document.body.clientHeight,700),
       treeOption: {
         height: 'auto',
         defaultExpandAll: true,
@@ -110,7 +110,7 @@
       selectList: [],
       option: {
         ...basicOption,
-        height:260,
+        height:280,
         addBtn: false,
         editBtn: false,
         delBtn: false,
@@ -137,7 +137,8 @@
       viewData:{},
       title: '',
       visible: false,
-      form:{}
+      form:{},
+      actionMap:{}
     }
   },
   created() {
@@ -162,12 +163,13 @@
       }
     },
     getTableList() {
-      getTypeActionByType({
+      getData({
         'typeName': this.nodeRow.attributes.name,
       }).then(res => {
-        this.data = res.data.data;
+        this.data = res.data.obj.rowList;
         this.$refs.crud.clearSelection();
         this.tableLoading = false;
+        this.actionMap=res.data.obj.actionMap
       })
     },
     handleRefresh() {
@@ -194,7 +196,9 @@
     },
     //鑾峰彇涓嬫柟鏁版嵁
     getViewData(row){
-      this.viewData={};
+      this.viewData={
+        oid:row.plOId
+      };
     },
     // 鏌ョ湅鎺堟潈缁撴灉
     chekView() {
@@ -224,7 +228,6 @@
         this.checkViewData = this.checkViewDataSearch;
         return done();
       }
-      ;
 
       this.checkViewData = this.checkViewData.filter(item => {
         return item.source && item.source.includes(source);
@@ -253,7 +256,7 @@
     },
     // 鏂板缂栬緫淇濆瓨
     addDialogSavaHandler() {
-      saveTemplate(this.viewData).then(res => {
+      saveGrand(this.viewData).then(res => {
         if (res.data.code === 200) {
           this.$message.success(res.data.obj);
           this.getTableList();
@@ -276,7 +279,7 @@
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(() => {
-        deleteTemplate({name:this.templateForm}).then(res => {
+        delGrand({name:this.templateForm}).then(res => {
           if (res.data.code === 200) {
             this.$message.success(res.data.obj);
             this.getTableList();

--
Gitblit v1.9.3