作者 小范

新增部署定义管理界面,组织机构界面新增折叠展开功能按钮

@@ -18,4 +18,7 @@ export const allTaskHistory = params => { return http.get(`${baseUrl}/task/allTa @@ -18,4 +18,7 @@ export const allTaskHistory = params => { return http.get(`${baseUrl}/task/allTa
18 18
19 export const uploadPath = `/api/${baseUrl}/file/upload`; 19 export const uploadPath = `/api/${baseUrl}/file/upload`;
20 20
  21 +//部署定义管理
  22 +export const definitions = params => { return http.get(`${baseUrl}/deployment/definitions`, params); };
  23 +
21 24
@@ -92,6 +92,8 @@ import transit from './views/transit/transit.vue' @@ -92,6 +92,8 @@ import transit from './views/transit/transit.vue'
92 import technological from './views/technological/technological.vue' 92 import technological from './views/technological/technological.vue'
93 import example from './views/technological/example.vue' 93 import example from './views/technological/example.vue'
94 import task from './views/technological/task.vue' 94 import task from './views/technological/task.vue'
  95 +import definition from './views/technological/definition.vue'
  96 +
95 97
96 98
97 99
@@ -459,7 +461,7 @@ let routes = [ @@ -459,7 +461,7 @@ let routes = [
459 {path:'/technological',component:technological,name:'部署管理'}, 461 {path:'/technological',component:technological,name:'部署管理'},
460 {path:'/example',component:example,name:'部署实例管理'}, 462 {path:'/example',component:example,name:'部署实例管理'},
461 {path:'/task',component:task,name:'任务管理'}, 463 {path:'/task',component:task,name:'任务管理'},
462 - 464 + {path:'/definition',component:definition,name:'部署定义管理'},
463 ] 465 ]
464 466
465 }, 467 },
@@ -17,6 +17,11 @@ @@ -17,6 +17,11 @@
17 <el-form-item> 17 <el-form-item>
18 <el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0" icon="el-icon-delete">批量删除</el-button> 18 <el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0" icon="el-icon-delete">批量删除</el-button>
19 </el-form-item> 19 </el-form-item>
  20 + <el-form-item>
  21 + <el-button type="warning" @click="toggleRowExpansion" icon="el-icon-sort" size="mini">
  22 + 全部{{ isExpansion ? "折叠" : "展开" }}
  23 + </el-button>
  24 + </el-form-item>
20 </el-form> 25 </el-form>
21 </el-col> 26 </el-col>
22 27
@@ -44,11 +49,11 @@ @@ -44,11 +49,11 @@
44 <!--列表--> 49 <!--列表-->
45 <el-table :data="roles" highlight-current-row v-loading="listLoading" @selection-change="selsChange" 50 <el-table :data="roles" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
46 default-expand-all 51 default-expand-all
47 - row-key="roleId" 52 + ref="dataTreeList"
  53 + row-key="roleId"
48 border 54 border
49 - height="600px"  
50 tooltip-effect="dark" 55 tooltip-effect="dark"
51 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;" 56 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
52 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" 57 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
53 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 58 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
54 <el-table-column type="selection" width="55"> 59 <el-table-column type="selection" width="55">
@@ -260,7 +265,8 @@ @@ -260,7 +265,8 @@
260 mqcode: '' 265 mqcode: ''
261 266
262 }, 267 },
263 - permForm: { 268 + isExpansion:true,
  269 + permForm: {
264 roleId: 1, 270 roleId: 1,
265 description: '', 271 description: '',
266 roleName: '', 272 roleName: '',
@@ -271,6 +277,18 @@ @@ -271,6 +277,18 @@
271 } 277 }
272 }, 278 },
273 methods: { 279 methods: {
  280 + toggleRowExpansion() {
  281 + this.isExpansion = !this.isExpansion;
  282 + this.toggleRowExpansionAll(this.roles, this.isExpansion);
  283 + },
  284 + toggleRowExpansionAll(data, isExpansion) {
  285 + data.forEach((item) => {
  286 + this.$refs.dataTreeList.toggleRowExpansion(item, isExpansion);
  287 + if (item.children !== undefined && item.children !== null) {
  288 + this.toggleRowExpansionAll(item.children, isExpansion);
  289 + }
  290 + });
  291 + },
274 treeMerge: function (expand) { 292 treeMerge: function (expand) {
275 this.treeExpand = expand; 293 this.treeExpand = expand;
276 for(var i=0;i<this.$refs.tree.store._getAllNodes().length;i++){ 294 for(var i=0;i<this.$refs.tree.store._getAllNodes().length;i++){
@@ -639,6 +657,7 @@ @@ -639,6 +657,7 @@
639 _this.getRoles(); 657 _this.getRoles();
640 } 658 }
641 }; 659 };
  660 + this.isExpansion=true;
642 } 661 }
643 } 662 }
644 663
@@ -649,6 +668,10 @@ @@ -649,6 +668,10 @@
649 </style> 668 </style>
650 669
651 <style lang="scss"> 670 <style lang="scss">
  671 + .grid-content {
  672 + height: 36px;
  673 + line-height: 36px;
  674 + }
652 .toobar_analysis{ 675 .toobar_analysis{
653 padding-top: 0; 676 padding-top: 0;
654 .el-col{ 677 .el-col{
  1 +<template>
  2 + <el-container>
  3 + <el-main>
  4 + <!--检索条件-->
  5 + <el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
  6 + <el-col :span="6">
  7 + <el-input v-model="queryinfo.name" placeholder="名称" style="width: 200px" clearable>
  8 + <template slot="prepend">名称</template>
  9 + </el-input>
  10 + </el-col>
  11 + <el-col :span="6">
  12 + <el-input v-model="queryinfo.key" placeholder="部署关键字" style="width: 200px" clearable>
  13 + <template slot="prepend">部署关键字</template>
  14 + </el-input>
  15 + </el-col>
  16 +
  17 + <el-col :span="8">
  18 + <el-button type="primary" v-on:click="getList">查询</el-button>
  19 +<!-- <el-button type="success" v-on:click="toAddDialog">新增</el-button>-->
  20 + </el-col>
  21 + </el-row>
  22 + <el-row>
  23 + <el-table
  24 + v-loading="tableloading"
  25 + :data="tableData"
  26 + style="width: 100%"
  27 + :default-sort = "{prop: 'date', order: 'descending'}"
  28 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
  29 + <el-table-column type="expand">
  30 + <template slot-scope="props">
  31 + <el-form label-position="right" label-width="120px" style="text-align: left">
  32 + <el-row>
  33 + <el-form-item label="id:">
  34 + <span>{{ props.row.id}}</span>
  35 + </el-form-item>
  36 + </el-row>
  37 + <el-row>
  38 + <el-form-item label="关联部署id:">
  39 + <span>{{ props.row.deploymentId}}</span>
  40 + </el-form-item>
  41 + </el-row>
  42 + <el-row>
  43 + <el-form-item label="类别:">
  44 + <span>{{ props.row.category}}</span>
  45 + </el-form-item>
  46 + </el-row>
  47 + <el-row>
  48 + <el-form-item label="租户:">
  49 + <span>{{ props.row.tenantId}}</span>
  50 + </el-form-item>
  51 + </el-row>
  52 + <el-row>
  53 + <el-form-item label="定义流程xml:">
  54 + <span>{{ props.row.resourceName}}</span>
  55 + </el-form-item>
  56 + </el-row>
  57 + <el-row>
  58 + <el-form-item label="定义图像:">
  59 + <span>{{ props.row.diagramResourceName}}</span>
  60 + </el-form-item>
  61 + </el-row>
  62 + <el-row>
  63 + <el-form-item label="根据key生成:">
  64 + <span>{{ props.row.hasStartFormKey}}</span>
  65 + </el-form-item>
  66 + </el-row>
  67 + <el-row>
  68 + <el-form-item label="修订版本:">
  69 + <span>{{ props.row.revision}}</span>
  70 + </el-form-item>
  71 + </el-row>
  72 +<!-- <el-row>-->
  73 +<!-- <el-form-item label="瞬时变量:">-->
  74 +<!-- <span>{{ JSON.stringify(props.row.transientVariables) }}</span>-->
  75 +<!-- </el-form-item>-->
  76 +<!-- </el-row>-->
  77 + </el-form>
  78 + </template>
  79 + </el-table-column>
  80 + <el-table-column
  81 + label="名称"
  82 + prop="name "
  83 + width="160">
  84 + </el-table-column>
  85 + <el-table-column
  86 + label="描述"
  87 + prop="description "
  88 + width="160">
  89 + </el-table-column>
  90 + <el-table-column
  91 + label="关键字"
  92 + prop="key ">
  93 + </el-table-column>
  94 + <el-table-column
  95 + label="版本"
  96 + prop="version ">
  97 + </el-table-column>
  98 + <el-table-column
  99 + label="已升级"
  100 + prop="isUpdated ">
  101 + </el-table-column>
  102 + <el-table-column
  103 + label="删除状态"
  104 + prop="isDeleted ">
  105 +<!-- <template slot-scope="scope">-->
  106 +<!-- <span v-if="scope.row.suspensionState ==='1'">活跃</span>-->
  107 +<!-- <span v-if="scope.row.suspensionState ==='2'">中断</span>-->
  108 +<!-- </template>-->
  109 + </el-table-column>
  110 + </el-table>
  111 + </el-row>
  112 + <!--分页模块-->
  113 + <el-row style="float: right;margin-top: 20px">
  114 + <el-col>
  115 + <div class="block">
  116 + <el-pagination
  117 + @size-change="handleSizeChange"
  118 + @current-change="handleCurrentChange"
  119 + :current-page="queryinfo.pageNum"
  120 + :page-sizes="[10, 20, 30, 40]"
  121 + :page-size="queryinfo.pageSize"
  122 + layout="total, sizes, prev, pager, next, jumper"
  123 + :total="total">
  124 + </el-pagination>
  125 + </div>
  126 + </el-col>
  127 + </el-row>
  128 + </el-main>
  129 + </el-container>
  130 +</template>
  131 +
  132 +<script>
  133 + import {definitions} from "../../api/technological";
  134 +
  135 + export default {
  136 + name: "definition",
  137 + data() {
  138 + return {
  139 + queryinfo:{
  140 + name:'',
  141 + key:'',
  142 + pageNum:1,
  143 + pageSize:10,
  144 + },
  145 + total:0,
  146 + tableData: [],
  147 + tableloading:false,
  148 + }
  149 + },
  150 + mounted() {
  151 + this.getList();
  152 + },
  153 + methods:{
  154 + handleSizeChange(val) {
  155 + this.queryinfo.pageSize= val
  156 + this.getList()
  157 + },
  158 + handleCurrentChange(val) {
  159 + this.queryinfo.pageNum = val
  160 + this.getList()
  161 + },
  162 + getList() {
  163 + const _this = this
  164 + this.tableloading = true;
  165 + definitions(this.queryinfo).then((response) => {
  166 + const res = response.data
  167 + if (res.code != '200') {
  168 + return _this.$message.error('获取消息收发记录,失败!')
  169 + }
  170 + // 获取列表数据
  171 + _this.tableData = res.data;
  172 + // 获取列表的总记录数
  173 +
  174 + _this.total = res.total
  175 + this.tableloading = false;
  176 + _this.$message.success('获取消息收发记录,成功!')
  177 + }).catch(error => {
  178 +
  179 + // 关闭加载
  180 + _this.$message.error(error.toString())
  181 + this.tableloading = false;
  182 +
  183 + })
  184 + },
  185 + }
  186 + }
  187 +</script>
  188 +
  189 +<style scoped>
  190 +</style>
1 { 1 {
2 - "nmmsVer": "1.25" 2 + "nmmsVer": "1.26"
3 } 3 }