From 3f3f930b1d3fdad5a653e6213763e3528b87be83 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 02 十一月 2023 23:52:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 5 +-
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 21 +++++-----
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 3 +
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 25 ++++++------
Source/UBCS-WEB/src/views/modeling/Business.vue | 36 +++++------------
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 5 +-
Source/UBCS-WEB/src/views/modeling/classifyTree.vue | 25 ------------
7 files changed, 42 insertions(+), 78 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 17a4f13..d49490c 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -114,7 +114,7 @@
});
this.$emit("coderuleoid", this.coderuleoid)
this.$emit('Treedata', this.Treedata)
- console.log(this.Treedata)
+ // console.log(this.Treedata)
}
}
}).catch(res => {
@@ -152,6 +152,7 @@
TableHeadRend() {
const index = this.$route.query.id.indexOf('@');
const result = this.$route.query.id.substring(0, index);
+ // console.log(this.$route)
return new Promise((resolve, reject) => {
MasterTable({
codeClassifyOid: this.nodeClickList.oid,
@@ -190,7 +191,7 @@
async nodeClick(data) {
try {
// console.log(data)
- this.TreeValue = data.label.split(" ")[0].trim();
+ this.TreeValue = data.label.split("</span>")[1].trim();
// console.log('TreeValue',this.TreeValue)
this.$emit('TreeValue', this.TreeValue)
this.nodeClickList = data;
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index f98ce0f..af66e4b 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -941,7 +941,8 @@
limit: this.page.pageSize,
['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
}).then(res => {
- this.tableData = res.data.data
+ this.tableData = res.data.data;
+ // this.page.total = res.data.data.total;
})
}
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 50deca2..a4aab94 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -320,7 +320,7 @@
></refer-config-dialog>
</div>
- <div>
+
<el-table v-if="this.crudArrayFlag"
ref="referAttrCrud"
v-loading="loading"
@@ -395,7 +395,6 @@
</el-table-column>
</el-table>
</div>
- </div>
</template>
<script>
@@ -1555,7 +1554,6 @@
},
computed: {
...mapGetters(["permission"]),
- //椤甸潰鎸夐挳鏉冮檺
permissionList() {
return {
busineStatus: this.vaildData(this.permission.classifyTree.attr_add, false),
@@ -1800,6 +1798,7 @@
this.attrSelectList = [row];
this.$refs.referAttrCrud.setCurrentRow(row);
this.$refs.referAttrCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+
this.attrOid = row.oid;
this.attrRow = row;
},
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index a957de2..fdd81b1 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -3,7 +3,7 @@
<el-container>
<!-- 宸︿晶鑿滃崟-->
<el-aside>
- <basic-container style="overflow:hidden;">
+ <basic-container>
<div>
<div>
<div style="display: flex; flex-direction: column;">
@@ -23,6 +23,17 @@
<div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
</div>
</div>
+<!-- 宸︿晶鏍�-->
+ <div style="height: calc(100vh - 230px);overflow: auto">
+ <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ class="classifyTree"
+ @node-click="nodeClick"
+ >
+ </avue-tree>
+ </div>
+
<!-- 鏍戣妭鐐规坊鍔犲璇濇-->
<el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
:title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
@@ -69,15 +80,6 @@
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
-<!-- 宸︿晶鏍�-->
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- class="classifyTree"
- style="height: calc(100vh - 230px)"
- @node-click="nodeClick"
- >
- </avue-tree>
</div>
</basic-container>
</el-aside>
@@ -404,7 +406,6 @@
import {mapGetters} from "vuex";
export default {
name: "classifyTrees.vue",
- inject: ["crudTreeData"],
data() {
return {
masterRow: null,
@@ -1630,7 +1631,7 @@
}
.el-aside {
- height: calc(100% - 30px);
+ //height: calc(100% - 30px);
}
.el-main {
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 7a4f178..d02e376 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -68,20 +68,6 @@
</el-tag>
<span v-else></span>
</el-descriptions-item>
- <!-- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-s-ticket"></i>
- 鏍囩
- </template>
- {{obj.hashtag}}
- </el-descriptions-item> -->
- <!-- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-arrow-up"></i>
- 缁ф壙鑷�
- </template>
- {{ obj.sss }}
- </el-descriptions-item> -->
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
@@ -98,17 +84,17 @@
</template>
{{ obj.lifeCycleName ? obj.lifeCycleName + '(' + obj.lifeCycleId + ')' : '' }}
</el-descriptions-item>
- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
- :labelStyle="descriptionOption.labelStyle">
- <template slot="label">
- <i :class="icons.view"></i>
- 瑙嗗浘
- </template>
- <el-tag v-if="obj.viewText" size="small">
- {{ obj.viewText }}
- </el-tag>
- <span v-else></span>
- </el-descriptions-item>
+<!-- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"-->
+<!-- :labelStyle="descriptionOption.labelStyle">-->
+<!-- <template slot="label">-->
+<!-- <i :class="icons.view"></i>-->
+<!-- 瑙嗗浘-->
+<!-- </template>-->
+<!-- <el-tag v-if="obj.viewText" size="small">-->
+<!-- {{ obj.viewText }}-->
+<!-- </el-tag>-->
+<!-- <span v-else></span>-->
+<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>
<template slot="label">
<i class="el-icon-arrow-down"></i>
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index 8f23f75..b5cc7aa 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -48,14 +48,14 @@
placeholder="璇烽�夋嫨锛岀暀绌哄垯涓嶈繘琛岀鐞�">
</el-input>
</el-form-item>
- <div>
- <el-form-item label="寮�鍚鍥�" label-width="100px" class="viewFlag">
- <el-switch v-model="btmType.viewFlag" active-color="#13ce66" @change="viewChange"></el-switch>
- </el-form-item>
- <el-form-item label="瑙嗗浘璇彞" label-width="100px" class="viewInput">
- <el-input v-model="btmType.view" :prefix-icon="icons.view" :disabled="!btmType.viewFlag"></el-input>
- </el-form-item>
- </div>
+<!-- <div>-->
+<!-- <el-form-item label="寮�鍚鍥�" label-width="100px" class="viewFlag">-->
+<!-- <el-switch v-model="btmType.viewFlag" active-color="#13ce66" @change="viewChange"></el-switch>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="瑙嗗浘璇彞" label-width="100px" class="viewInput">-->
+<!-- <el-input v-model="btmType.view" :prefix-icon="icons.view" :disabled="!btmType.viewFlag"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </div>-->
<el-form-item label="鎻忚堪" label-width="100px" class="description">
<el-input v-model="btmType.description"
:prefix-icon="icons.desc"
@@ -203,7 +203,7 @@
watch: {
btmType: {
handler(newval, oldval) {
- console.log('鐩戝惉', newval, oldval)
+ // console.log('鐩戝惉', newval, oldval)
},
deep: true,
immediate: true
@@ -563,7 +563,7 @@
},
// 娣诲姞涓氬姟绫诲瀷
submitBtmType() {
- console.log(this.btmType);
+ // console.log(this.btmType);
if (!this.btmType.attributes){
this.$message.warning("杩樻病鏈変负涓氬姟绫诲瀷閫夋嫨灞炴��");
return;
@@ -611,7 +611,6 @@
},
// 鍒楄〃缂栬緫淇濆瓨
cellEditSave(row,index) {
- // console.log("1111111111111111111111")
this.btmType.attributes[index].name = row.name
this.btmType.attributes[index].defaultValue = row.defaultValue;
this.btmType.attributes[index].description = row.description;
diff --git a/Source/UBCS-WEB/src/views/modeling/classifyTree.vue b/Source/UBCS-WEB/src/views/modeling/classifyTree.vue
index 621ad5b..cbefe85 100644
--- a/Source/UBCS-WEB/src/views/modeling/classifyTree.vue
+++ b/Source/UBCS-WEB/src/views/modeling/classifyTree.vue
@@ -1,41 +1,18 @@
<template>
- <classifyTrees :crudData="crudTreeData"
- ></classifyTrees>
+ <classifyTrees></classifyTrees>
</template>
<script>
export default {
name: "classifyTree.vue",
- //浣跨敤provide浼犻�掔粰瀛愮粍浠�
- //鐖朵紶瀛愭湁闂锛屾殏鏃舵病瑙ｅ喅锛岀敤provide浠ｆ浛鐖朵紶瀛愶紝瀛愪紶鐖惰繕鏄敤$emit浼犻�掞紝娉ㄦ剰锛侊紒锛佸叾浠栫粍浠朵笉鑳戒娇鐢ㄥ悓鏍风殑绫诲悕鍚﹀垯浼氭姤閿欍��
provide() {
return {
- crudTreeData: this.crudTreeData,
}
},
data() {
return {
- aaa: 1,
- crudTreeData: [
- {
- value: 0,
- column: [
- {
- cash: "娴嬭瘯0"
- }
- ]
- },
- {
- value: 1,
- column: [
- {
- cash: "娴嬭瘯1"
- }
- ]
- }
- ],
arr : [
{
name: 'Alice',
--
Gitblit v1.9.3