From 69dbc35a84b948acc2166aef6876c300da03f2c6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 24 十月 2024 16:18:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 433 ------------------------------
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 8
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java | 16
Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue | 127 +++-----
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue | 52 +--
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java | 8
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 111 +++----
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java | 14
Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue | 27 +
10 files changed, 163 insertions(+), 635 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java
index 4995d63..680edac 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsPvolumeDTO.java
@@ -20,5 +20,5 @@
private String service; // 鏈嶅姟鍚�
private short type; //鍗锋湇鍔＄被鍨� 0:Unix,1:Win NT
private String path; //鍗锋湇鍔¤矾寰�
- private boolean isvalid; //鏄惁涓洪閫夎矾寰勶紝濡傛灉淇敼浜嗚繖涓�间細鎻愰啋锛氭偍纭疄瑕佷慨鏀瑰嵎鐨勯閫夎矾寰勫悧锛�
+ private boolean isvalid; //鏄惁涓洪閫夎矾寰勶紝濡傛灉淇敼浜嗚繖涓�间細鎻愰啋锛氭偍纭疄瑕佷慨鏀瑰嵎鐨勯閫夎矾寰勫悧锛焒alse 涓烘湭閫夋嫨锛宼rue涓洪�夋嫨
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
index 7fff70c..e103888 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
@@ -39,14 +39,20 @@
/**
* 鍒嗛〉鏌ヨ鍗�
- * @param pageSize 椤垫暟
- * @param pageIndex 绗嚑椤�
+ * @param pageSize 绗嚑椤�
+ * @param pageIndex 椤垫暟
* @return 鍒嗛〉鏁版嵁
*/
@GetMapping("/getPvolumesPage")
- public BaseResult getPvolumesPage(short pageSize, short pageIndex){
+ public BaseResult getPvolumesPage(Integer pageSize, Integer pageIndex){
try {
- return osPvolumesServiceI.getPvolumesPage(pageSize, pageIndex);
+ if(pageIndex == null){
+ pageIndex = 1000 ;
+ }
+ if(pageSize == null){
+ pageSize = 0;
+ }
+ return osPvolumesServiceI.getPvolumesPage(pageSize.shortValue(), pageIndex.shortValue());
} catch (PLException e) {
BaseResult objectBaseResult = new BaseResult<>();
objectBaseResult.setCode(Integer.parseInt(e.code));
@@ -95,7 +101,7 @@
* @return 鍒犻櫎缁撴灉
*/
@DeleteMapping("/deletePvolume")
- public BaseResult deletePvolume(String[] ids){
+ public BaseResult deletePvolume(String ids){
try {
return osPvolumesServiceI.deletePvolume(ids);
} catch (PLException e) {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java
index 548da33..3220e17 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java
@@ -1,10 +1,8 @@
package com.vci.web.service;
import com.vci.corba.common.PLException;
-import com.vci.corba.framework.data.PvolumeInfo;
import com.vci.dto.*;
import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.web.util.Func;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -12,7 +10,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 鏂囦欢鏌滅鐞嗙殑鏈嶅姟
@@ -22,8 +19,8 @@
public interface OsPvolumesServiceI {
/**
* 鍒嗛〉鏌ヨ鍗�
- * @param pageSize 椤垫暟
- * @param pageIndex 绗嚑椤�
+ * @param pageSize 绗嚑椤�
+ * @param pageIndex 椤垫暟
* @return 鍒嗛〉鏁版嵁
*/
BaseResult getPvolumesPage(short pageSize, short pageIndex) throws PLException;
@@ -66,4 +63,5 @@
* @return
*/
boolean savePvolumeUser(String pvolumId ,String[] userIds) throws PLException;
+ BaseResult deletePvolume(String ids) throws PLException;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
index 2bfe725..8d20ea9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
@@ -38,8 +38,8 @@
/**
* 鍒嗛〉鏌ヨ鍗�
- * @param pageSize 椤垫暟
- * @param pageIndex 绗嚑椤�
+ * @param pageSize 绗嚑椤�
+ * @param pageIndex 椤垫暟
* @return 鍒嗛〉鏁版嵁
*/
@Override
@@ -59,7 +59,7 @@
public BaseResult savePvolume(OsPvolumeDTO dto) throws PLException {
PvolumeInfo pvoInfo = new PvolumeInfo();
pvoInfo.service = dto.getService();
- pvoInfo.id = dto.getId();
+// pvoInfo.id = dto.getId();
pvoInfo.name = dto.getName();
pvoInfo.host = dto.getHost();
pvoInfo.isvalid = dto.isIsvalid();
@@ -127,11 +127,11 @@
* @return 鍒犻櫎缁撴灉
*/
@Override
- public BaseResult deletePvolume(String[] ids) throws PLException {
- if ( ids.length == 0){
+ public BaseResult deletePvolume(String ids) throws PLException {
+ if ( StringUtils.isBlank(ids)){
throw new PLException("500", new String[]{"璇烽�夋嫨鐩稿叧鏁版嵁锛侊紒"});
}
- for (String id : ids) {
+ for (String id : ids.split(",")) {
boolean isvalid = platformClientUtil.getFrameworkService().checkIsvalid(id);
if(isvalid) {
throw new PLException("500", new String[]{"閫夋嫨鏁版嵁涓洪閫夎矾寰勶紝涓嶈兘鍒犻櫎锛�"});
@@ -140,7 +140,7 @@
UserEntityInfo userInfo = new UserEntityInfo();
userInfo.setUserName(WebUtil.getCurrentUserId());
userInfo.setModules("com.vci.client.framework.systemConfig.volumn.PvolumePanel");
- boolean rs = platformClientUtil.getFrameworkService().deletePvolume(ids, userInfo);
+ boolean rs = platformClientUtil.getFrameworkService().deletePvolume(ids.split(","), userInfo);
if(!rs){
return BaseResult.fail("鍒犻櫎澶辫触锛�");
}
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
index 308c333..d87b584 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
@@ -1,50 +1,62 @@
<template>
<el-container>
-
- <el-aside>
- <basic-container>
- <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
- <div class="headerCon">
- <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
- </el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼
- </el-button>
- <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delClickHandler">鍒犻櫎
- </el-button>
- <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
- </el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
- </el-button>
- <el-button class="smallBtn" plain size="small" type="primary"
- @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
- </el-button>
- </div>
- <!-- 宸︿晶鏍� -->
- <div style="height: calc(100vh - 280px);">
- <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
- <span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
- <i class="el-icon-s-promotion"></i>
- {{ (node || {}).label }}
- </span>
- </span>
- </avue-tree>
- </div>
- </div>
- </basic-container>
- </el-aside>
-
- <el-main>
- <basic-container>
- </basic-container>
- </el-main>
-
+ <basic-container style="height: calc(100vh - 118px);width: 100%;">
+ <avue-form ref="form" v-model="form" :option="formOption" @submit="saveHandler"></avue-form>
+ </basic-container>
</el-container>
</template>
<script>
+import {deleteLog, getPeroid, savePeriod} from "@/api/system/log/logBasic";
+
export default {
- name: "index"
+ name: "index",
+ data: function () {
+ return {
+ form:{
+ type:[],
+ },
+ formOption:{
+ submitBtn: true,
+ submitText:"淇濆瓨",
+ emptyBtn: false,
+ menuPosition:'left',
+ column: [{
+ label: '鐢ㄦ埛\\鏈哄櫒瀵嗙骇鍋滃惎鐢ㄩ厤缃�',
+ labelWidth:185,
+ prop: 'type',
+ span: 24,
+ type: 'checkbox',
+ dicData: [
+ { label: '鐢ㄦ埛瀵嗙骇', value: 0 },
+ { label: '鏈哄櫒瀵嗙骇', value: 1 },
+ ]
+ }]
+ },
+ }
+ },
+ created() {
+ this.getPeroid()
+ },
+ methods:{
+ getPeroid:function (){
+ getPeroid().then(res => {
+ //this.form=res.data.data;
+ }).catch(error => {
+ })
+ },
+ saveHandler:function (form,done){
+ debugger;
+ savePeriod({'type':this.form.type}).then(res => {
+ if (res.data.success) {
+ this.$message.success('淇濆瓨鎴愬姛')
+ }
+ done()
+ }).catch(error=>{
+ done()
+ });
+ },
+ }
}
</script>
@@ -53,40 +65,5 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
- .headerCon{
- .el-button{
- width: 82px;
- }
- }
}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
-
-.smallBtn {
- width: 82px;
- text-align: center;
- padding-left: 4.5px;
-}
-
</style>
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 308c333..45507cf 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
@@ -1,33 +1,17 @@
<template>
<el-container>
-
<el-aside>
<basic-container>
- <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
- <div class="headerCon">
- <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
- </el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼
- </el-button>
- <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delClickHandler">鍒犻櫎
- </el-button>
- <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
- </el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
- </el-button>
- <el-button class="smallBtn" plain size="small" type="primary"
- @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
- </el-button>
- </div>
+ <div ref="TreeBox" style="height: calc(100vh - 154px);!important;">
<!-- 宸︿晶鏍� -->
- <div style="height: calc(100vh - 280px);">
+ <div style="height: calc(100vh - 190px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
- <span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
- <i class="el-icon-s-promotion"></i>
- {{ (node || {}).label }}
- </span>
- </span>
+ <span slot-scope="{ node, data }" class="el-tree-node__label">
+ <span style="font-size: 15px">
+ <i class="el-icon-s-promotion"></i>
+ {{ (node || {}).label }}
+ </span>
+ </span>
</avue-tree>
</div>
</div>
@@ -43,8 +27,51 @@
</template>
<script>
+import {getBizTree} from "@/api/UI/uiDefine";
export default {
- name: "index"
+ name: "index",
+ data:function (){
+ return{
+ treeOption: {
+ height: 'auto',
+ defaultExpandAll: true,
+ menu: false,
+ addBtn: false,
+ props: {
+ label: 'text',
+ value: 'oid',
+ children: 'children'
+ }
+ },
+ nodeRow: {},
+ treeData: [],
+ }
+ },
+ created() {
+ this.getTreeList();
+ },
+ methods: {
+ //鏍戣〃鏌ヨ
+ getTreeList() {
+ const loading = this.$loading({});
+ getBizTree().then(res => {
+ this.treeData = [res.data.obj];
+ loading.close();
+ }).catch(error => {
+ loading.close();
+ })
+ },
+ // 鏍戠偣鍑�
+ nodeClick(row) {
+ if (row.oid) {
+ this.nodeRow = row;
+ this.getTableList();
+ }
+ },
+ getTableList() {
+
+ },
+ }
}
</script>
@@ -53,40 +80,6 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
- .headerCon{
- .el-button{
- width: 82px;
- }
- }
-}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
-
-.smallBtn {
- width: 82px;
- text-align: center;
- padding-left: 4.5px;
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
index 1a286ff..2306f80 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
@@ -33,7 +33,7 @@
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">绉婚櫎</el-button>
</template>
</avue-crud>
- <action-dialog ref="actionDialog"></action-dialog>
+ <action-dialog ref="actionDialog" :is-muti="true" @updataAction="actionSaveHandler"></action-dialog>
</basic-container>
</el-main>
@@ -42,16 +42,9 @@
<script>
import basicOption from "@/util/basic-option";
-import {
- cloneUIContextData,
- delUIContextData, expUIContextData,
- getBizTree, getExpContextTree,
- gridUIContextData,
- saveUIContextData,
- updateUIContextData
-} from "@/api/UI/uiDefine";
+import { delUIContextData, getBizTree, gridUIContextData} from "@/api/UI/uiDefine";
import func from "@/util/func";
-import actionDialog from "@/views/modelingMenu/ui/Aciton/dialog"
+import actionDialog from "@/views/modelingMenu/ui/Aciton/components/dialog"
export default {
name: "index",
@@ -71,8 +64,7 @@
},
nodeRow: {},
treeData: [],
- searchParams: {
- },
+ searchParams: {},
tableLoading: false,
selectList: [],
option: {
@@ -191,11 +183,20 @@
//鍒涘缓
addHandler() {
if (this.nodeRow && this.nodeRow.oid && this.nodeRow.oid!='') {
- this.$refs.actionDialog.openDialog(this.nodeRow);
+ this.$refs.actionDialog.openDialog();
} else {
this.$message.error('璇烽�夋嫨涓氬姟绫诲瀷');
}
},
+ // 淇濆瓨action
+ actionSaveHandler(val) {
+ addAction(val).then(res => {
+ if(res.data.code == 200){
+ this.$message.success(res.data.obj);
+
+ }
+ })
+ },
delHandler() {
if (this.selectList.length <= 0) {
this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/dialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
similarity index 89%
rename from Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/dialog.vue
rename to Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
index b7d3214..c47afba 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/dialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
@@ -8,11 +8,11 @@
class="avue-dialog"
width="1400px"
@close="cancelDialog">
- <el-container>
+ <el-container style="height: 580px;">
<el-aside>
- <basic-container>
+ <basic-container style="height: 560px;">
<!-- 宸︿晶鏍� -->
- <div style="height: 200px;">
+ <div style="height: 520px;">
<avue-tree
ref="tree"
v-model="treeForm"
@@ -31,7 +31,7 @@
</el-aside>
<el-main>
- <basic-container>
+ <basic-container style="height: 560px;">
<div>
<avue-crud
ref="crud"
@@ -62,27 +62,13 @@
</template>
<script>
-import {
- getActionTree,
- getActionTableData,
- saveAction,
- updateAction,
- exportAction,
- deleteAction,
- getPLActionParam,
- savePLActionParam,
- updatePLActionParam,
- deletePLActionParam,
- saveActionCls,
- updateActionCls,
- deleteActionCls
-} from '@/api/UI/Action/api'
+import { getActionTree, getActionTableData} from '@/api/UI/Action/api'
import func from "@/util/func";
import basicOption from "@/util/basic-option";
-import {clonePageDef, cloneTabButton, clonetabPage} from "@/api/UI/uiDefine";
export default {
name: "index",
+ props:['isMuti'],
data() {
return {
dialog: {
@@ -99,7 +85,7 @@
option: {
...basicOption,
addBtn: false,
- height: 200,
+ height: 420,
highlightCurrentRow: true,
menu:false,
column: [
@@ -168,7 +154,7 @@
created() {
},
methods: {
- openDialog(data) {
+ openDialog() {
this.dialog.showDialog = true;
this.getTreeList()
this.data = [];
@@ -176,21 +162,25 @@
cancelDialog() {
this.dialog.loading = false;
this.dialog.showDialog = false;
+ this.$refs.tree.setCurrentKey(null);
},
submitDialog() {
if (this.selectList.length==0) {
this.$message.error('璇烽�夋嫨Action');
return;
}
- const saveFunction = {
- 'pageDef': ''
- };
- saveFunction[this.type](params).then(res => {
- if(res.data.code == 200){
- this.$message.success(res.data.obj);
- this.cancelDialog();
+ if(this.isMuti){
+ this.$emit('updataAction', this.selectList);
+ }else {
+ if(this.selectList.length>1){
+ this.$message.error('璇烽�夋嫨涓�鏉ction');
+ return;
}
- })
+ this.$emit('updataAction', this.selectList[0]);
+ }
+
+ this.cancelDialog();
+
},
// 宸︿晶鏍戣姹�
getTreeList(status) {
@@ -207,7 +197,6 @@
nodeClick(row) {
this.treeNodeRow = row;
this.getRightTableList(row);
- this.bottomData = [];
},
// 澶撮儴鍒锋柊鎸夐挳
@@ -228,6 +217,7 @@
const data = res.data.data;
this.data = data;
this.tableLoading = false;
+
})
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action.vue
deleted file mode 100644
index 20b15b6..0000000
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action.vue
+++ /dev/null
@@ -1,433 +0,0 @@
-<template>
- <el-dialog
- v-dialogDrag
- :visible.sync="btnActionVisible"
- append-to-body="true"
- class="avue-dialog"
- title="閫夋嫨Action"
- width="70%"
- @close="dialogClose">
- <el-container>
- <el-aside>
- <basic-container>
- <!-- 宸︿晶鏍� -->
- <div>
- <avue-tree
- ref="tree"
- v-model="treeForm"
- :data="treeData"
- :option="treeOption"
- node-key="value"
- @node-click="nodeClick">
- <span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
- <i class="el-icon-s-promotion"></i>
- {{ (node || {}).label }}
- </span>
- </span>
- </avue-tree>
- </div>
- </basic-container>
- </el-aside>
-
- <el-main>
- <basic-container>
- <div>
- <avue-crud
- ref="crud"
- v-model="form"
- :data="data"
- :option="option"
- :page.sync="page"
- :table-loading="tableLoading"
- @search-change="handleSearch"
- @search-reset="handleReset"
- @refresh-change="handleRefresh"
- @selection-change="selectChangeHandler"
- @row-click="rowClickHandler">
- <template slot="plTypeType" slot-scope="{row}">
- <el-tag :type="row.plTypeType === 'business' ? '' : 'success'">
- {{ row.plTypeType === 'business' ? '涓氬姟绫诲瀷' : '閾炬帴绫诲瀷' }}
- </el-tag>
- </template>
-
- </avue-crud>
- </div>
- </basic-container>
- </el-main>
-
-
- </el-container>
- <span slot="footer" class="dialog-footer">
- <el-button @click="btnActionVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="actionSaveHandler">纭� 瀹�</el-button>
- </span>
- </el-dialog>
-</template>
-
-<script>
-import {
- getActionTree,
- getActionTableData,
-} from '@/api/UI/Action/api'
-import func from "@/util/func";
-import basicOption from "@/util/basic-option";
-
-export default {
- name: "index",
- data() {
- return {
- btnActionVisible: false,
- currenRow: {}, // action褰撳墠琛屼俊鎭�
- topMethodsObj: {
- select: true,
- all: true,
- page: false
- },
- transferTitle: ['鏈�夋嫨', '宸查�夋嫨'],
- leftRoleData: [],
- rightRoleData: [],
- form: {},
- bottomTableLoading: false,
- bottomData: [],
- bottomOption: {
- ...basicOption,
- addBtn: false,
- calcHeight: -30,
- selection: false,
- refreshBtn: false,
- // height:'auto',
- column: [
- {
- label: '鍙傛暟鍚嶇О',
- prop: 'name',
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ュ弬鏁板悕绉�',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '榛樿鍊�',
- prop: 'defaultValue',
- },
- {
- label: '鎻愮ず淇℃伅',
- prop: 'description',
- span: 24,
- type: 'textarea',
- rows: 4
- },
- ],
- },
- tableLoading: false,
- lastIndex: null,
- selectList: [],
- data: [],
- option: {
- ...basicOption,
- addBtn: false,
- height: 500,
- highlightCurrentRow: true,
- menu:false,
- column: [
- {
- label: '缂栧彿',
- prop: 'plCode',
- search: true,
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ョ紪鍙�',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '鍚嶇О',
- prop: 'plName',
- search: true,
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ュ悕绉�',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '绫昏矾寰�',
- prop: 'plCSClass',
- search: true,
- overHidden: true,
- },
- {
- label: '鍒嗙被',
- prop: 'plActionCls',
- type: 'tree',
- hide: true,
- props: {
- label: 'name',
- value: 'id',
- children: 'childs'
- },
- rules: [
- {
- required: true,
- message: '璇烽�夋嫨鍒嗙被',
- trigger: 'blur'
- }
- ],
- dicData: []
- },
- {
- label: '閾炬帴鍦板潃',
- prop: 'plBSUrl',
- search: true,
- },
- {
- label: '绫诲瀷',
- prop: 'plTypeType',
- search: true,
- type: 'select',
- dicData: [{
- label: '涓氬姟绫诲瀷',
- value: 'business'
- }, {
- label: '閾炬帴绫诲瀷',
- value: 'link'
- }],
- rules: [
- {
- required: true,
- message: '璇烽�夋嫨绫诲瀷',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '鎻忚堪',
- prop: 'plDesc',
- search: true,
- overHidden: true,
- },
- ]
- },
- treeNodeRow: {},
- treeForm: {},
- treeOption: {
- addBtn: false,
- defaultExpandedKeys: ['root'],
- props: {
- label: 'name',
- value: 'id',
- children: 'childs'
- },
- formOption: {
- column: [
- {
- label: '鍒嗙被鍚嶇О',
- prop: 'name',
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ュ垎绫诲悕绉�',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '鍒嗙被搴忓彿',
- prop: 'serialno',
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ュ垎绫诲簭鍙�',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '鍒涘缓鑰�',
- prop: 'creator',
- readonly: true,
- },
- {
- label: '鍒涘缓鏃堕棿',
- prop: 'createTime',
- readonly: true,
- },
- {
- label: '鐖朵富绫�',
- prop: 'pidName',
- readonly: true,
- },
- {
- label: '澶囨敞',
- prop: 'description'
- },
- ],
- }
- },
- treeData: [],
- }
- },
- created() {
- this.getTreeList();
- },
- methods: {
- // 宸︿晶鏍戣姹�
- getTreeList(status) {
- const params = {
- isExp: status ? true : false
- }
- getActionTree(params).then(res => {
- const data = res.data.obj;
- this.treeData = [data];
- const selectTreeData = this.option.column.find(item => item.prop === 'plActionCls'); // 鎵惧埌action娣诲姞鍒嗙被鏍�
- selectTreeData.dicData = [data];
- })
- },
-
- // 宸︿晶鏍戣鐐瑰嚮
- nodeClick(row) {
- this.treeNodeRow = row;
- this.getRightTableList(row);
- this.bottomData = [];
- },
-
- // 澶撮儴鍒锋柊鎸夐挳
- handleRefresh() {
- if (func.isEmptyObject(this.treeNodeRow)) {
- return;
- }
- this.getRightTableList(this.treeNodeRow);
- },
-
- // 鍙充晶琛ㄦ牸淇℃伅
- getRightTableList(row) {
- this.tableLoading = true;
- const params = {
- plactioncls: row.id
- }
- getActionTableData(params).then(res => {
- const data = res.data.data;
- this.data = data;
- this.tableLoading = false;
- })
- },
-
- // 琛ㄦ牸澶氶��
- selectChangeHandler(row) {
- this.selectList = row;
- },
-
- // 琛岀偣鍑�
- rowClickHandler(row) {
- this.currenRow = row;
- func.rowClickHandler(
- row,
- this.$refs.crud,
- this.lastIndex,
- (newIndex) => {
- this.lastIndex = newIndex;
- },
- () => {
- this.selectList = [];
- }
- );
- },
-
- // 鎼滅储
- handleSearch(params, done) {
- if (func.isEmptyObject(this.treeNodeRow)) {
- this.$message.error('璇峰厛鍦ㄥ乏渚ч�夋嫨鑺傜偣鍚庢搷浣�');
- return done();
- }
- this.tableLoading = true;
- const apiParams = {
- plactioncls: this.treeNodeRow.id === 'root' ? '' : this.treeNodeRow.id,
- ...params
- }
-
- getActionTableData(apiParams).then(res => {
- const data = res.data.data;
- this.data = data;
- this.tableLoading = false;
- })
- done();
- },
-
- // 閲嶇疆鎼滅储鏉′欢
- handleReset() {
- if (func.isEmptyObject(this.treeNodeRow)) {
- this.$message.error('璇峰厛鍦ㄥ乏渚ч�夋嫨鑺傜偣鍚庢搷浣�');
- return;
- }
- this.getRightTableList(this.treeNodeRow);
- },
-
- // 淇濆瓨action
- actionSaveHandler() {
- if (this.selectList.length != 1) {
- this.$message.error('鍙兘閫夋嫨涓�鏉℃暟鎹�');
- return;
- }
- this.$emit('updataAction', this.selectList[0]);
- this.dialogClose();
- },
-
- dialogClose(){
- this.btnActionVisible = false;
- this.data = [];
- this.$refs.tree.setCurrentKey(null);
- }
-
- }
-}
-</script>
-
-<style lang="scss" scoped>
-::v-deep {
- .el-scrollbar__wrap {
- overflow: auto !important;
- }
-
- .headerCon {
- .el-button {
- width: 82px;
- }
- }
-}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
-.smallBtn {
- width: 82px;
- text-align: center;
- padding-left: 4.5px;
-}
-
-</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index a3aab36..00148aa 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -209,10 +209,6 @@
import basicOption from "@/util/basic-option";
import func from "@/util/func";
import {
- getBtmDatasByPage,
- getPortalVIDatasByPage,
- getQTInfoDatasByPage,
- getLinkDatasByPage,
getPLPageDefinations,
getTabButtons,
addTapButton,
@@ -223,7 +219,7 @@
joinBtn,
exitBtn
} from "@/api/UI/uiDefine";
-import actionDialog from '@/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action';
+import actionDialog from '@/views/modelingMenu/ui/Aciton/components/dialog';
import cloneDialog from "@/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog";
export default {
@@ -1195,7 +1191,7 @@
// 閫夋嫨action
actionFoucus() {
- this.$refs.actionDialog.btnActionVisible = true;
+ this.$refs.actionDialog.openDialog();
},
// 淇濆瓨action
--
Gitblit v1.9.3