Merge remote-tracking branch 'origin/master'
# Conflicts:
# Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsPvolumesServiceI.java
| | |
| | | private String service; // æå¡å |
| | | private short type; //å·æå¡ç±»å 0:Unix,1:Win NT |
| | | private String path; //å·æå¡è·¯å¾ |
| | | private boolean isvalid; //æ¯å¦ä¸ºé¦éè·¯å¾ï¼å¦æä¿®æ¹äºè¿ä¸ªå¼ä¼æéï¼æ¨ç¡®å®è¦ä¿®æ¹å·çé¦éè·¯å¾åï¼ |
| | | private boolean isvalid; //æ¯å¦ä¸ºé¦éè·¯å¾ï¼å¦æä¿®æ¹äºè¿ä¸ªå¼ä¼æéï¼æ¨ç¡®å®è¦ä¿®æ¹å·çé¦éè·¯å¾åï¼false 为æªéæ©ï¼trueä¸ºéæ© |
| | | } |
| | |
| | | |
| | | /** |
| | | * å页æ¥è¯¢å· |
| | | * @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)); |
| | |
| | | * @return å é¤ç»æ |
| | | */ |
| | | @DeleteMapping("/deletePvolume") |
| | | public BaseResult deletePvolume(String[] ids){ |
| | | public BaseResult deletePvolume(String ids){ |
| | | try { |
| | | return osPvolumesServiceI.deletePvolume(ids); |
| | | } catch (PLException e) { |
| | |
| | | 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; |
| | |
| | | import java.util.ArrayList; |
| | | import java.util.Arrays; |
| | | import java.util.List; |
| | | import java.util.stream.Collectors; |
| | | |
| | | /** |
| | | * æä»¶æç®¡ççæå¡ |
| | |
| | | public interface OsPvolumesServiceI { |
| | | /** |
| | | * å页æ¥è¯¢å· |
| | | * @param pageSize é¡µæ° |
| | | * @param pageIndex 第å 页 |
| | | * @param pageSize 第å 页 |
| | | * @param pageIndex é¡µæ° |
| | | * @return åé¡µæ°æ® |
| | | */ |
| | | BaseResult getPvolumesPage(short pageSize, short pageIndex) throws PLException; |
| | |
| | | * @return |
| | | */ |
| | | boolean savePvolumeUser(String pvolumId ,String[] userIds) throws PLException; |
| | | BaseResult deletePvolume(String ids) throws PLException; |
| | | } |
| | |
| | | |
| | | /** |
| | | * å页æ¥è¯¢å· |
| | | * @param pageSize é¡µæ° |
| | | * @param pageIndex 第å 页 |
| | | * @param pageSize 第å 页 |
| | | * @param pageIndex é¡µæ° |
| | | * @return åé¡µæ°æ® |
| | | */ |
| | | @Override |
| | |
| | | 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(); |
| | |
| | | * @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[]{"éæ©æ°æ®ä¸ºé¦éè·¯å¾ï¼ä¸è½å é¤ï¼"}); |
| | |
| | | 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("å é¤å¤±è´¥ï¼"); |
| | | } |
| | |
| | | <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> |
| | | |
| | |
| | | .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> |
| | |
| | | <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> |
| | |
| | | </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> |
| | | |
| | |
| | | .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> |
| | |
| | | <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> |
| | | |
| | |
| | | |
| | | <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", |
| | |
| | | }, |
| | | nodeRow: {}, |
| | | treeData: [], |
| | | searchParams: { |
| | | }, |
| | | searchParams: {}, |
| | | tableLoading: false, |
| | | selectList: [], |
| | | option: { |
| | |
| | | //å建 |
| | | 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('请è³å°éæ©ä¸æ¡æ°æ®'); |
ÎļþÃû´Ó Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/dialog.vue ÐÞ¸Ä |
| | |
| | | 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" |
| | |
| | | </el-aside> |
| | | |
| | | <el-main> |
| | | <basic-container> |
| | | <basic-container style="height: 560px;"> |
| | | <div> |
| | | <avue-crud |
| | | ref="crud" |
| | |
| | | </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: { |
| | |
| | | option: { |
| | | ...basicOption, |
| | | addBtn: false, |
| | | height: 200, |
| | | height: 420, |
| | | highlightCurrentRow: true, |
| | | menu:false, |
| | | column: [ |
| | |
| | | created() { |
| | | }, |
| | | methods: { |
| | | openDialog(data) { |
| | | openDialog() { |
| | | this.dialog.showDialog = true; |
| | | this.getTreeList() |
| | | this.data = []; |
| | |
| | | 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('è¯·éæ©ä¸æ¡Action'); |
| | | return; |
| | | } |
| | | }) |
| | | this.$emit('updataAction', this.selectList[0]); |
| | | } |
| | | |
| | | this.cancelDialog(); |
| | | |
| | | }, |
| | | // 左侧æ è¯·æ± |
| | | getTreeList(status) { |
| | |
| | | nodeClick(row) { |
| | | this.treeNodeRow = row; |
| | | this.getRightTableList(row); |
| | | this.bottomData = []; |
| | | }, |
| | | |
| | | // 头é¨å·æ°æé® |
| | |
| | | const data = res.data.data; |
| | | this.data = data; |
| | | this.tableLoading = false; |
| | | |
| | | }) |
| | | }, |
| | | |
| | |
| | | import basicOption from "@/util/basic-option"; |
| | | import func from "@/util/func"; |
| | | import { |
| | | getBtmDatasByPage, |
| | | getPortalVIDatasByPage, |
| | | getQTInfoDatasByPage, |
| | | getLinkDatasByPage, |
| | | getPLPageDefinations, |
| | | getTabButtons, |
| | | addTapButton, |
| | |
| | | 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 { |
| | |
| | | |
| | | // 鿩action |
| | | actionFoucus() { |
| | | this.$refs.actionDialog.btnActionVisible = true; |
| | | this.$refs.actionDialog.openDialog(); |
| | | }, |
| | | |
| | | // ä¿åaction |