From 716e7cfabbd3759b66aa1aceba4c4914512d50d4 Mon Sep 17 00:00:00 2001 From: yuxc <yuxc@vci-tech.com> Date: 星期三, 08 一月 2025 15:08:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 296 ++++++++-------------------------------------------------- 1 files changed, 42 insertions(+), 254 deletions(-) diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue index 3cf1cd1..38f627e 100644 --- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue +++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue @@ -205,8 +205,8 @@ 浣跨敤鏋氫妇 </template> <div> - <el-tag :type="lastItem.enumFlag ? 'success' : 'danger'"> - {{ lastItem.enumFlag ? '鏄�' : '鍚�' }} + <el-tag :type="lastItem.enumId ? 'success' : 'danger'"> + {{ lastItem.enumId ? '鏄�' : '鍚�' }} </el-tag> </div> </el-descriptions-item> @@ -215,7 +215,7 @@ 鏋氫妇绫诲瀷 </template> <div> - {{ lastItem.enumFlag }} + {{ lastItem.enumId }} </div> </el-descriptions-item> <el-descriptions-item> @@ -320,18 +320,19 @@ </el-col> <el-col :span="8"> <el-form-item label="閫夋嫨鍙傜収绫诲瀷锛�" prop="referValue"> - <el-input v-model="form.referValue" :clearable="true" @focus="referFormFocusHandler"></el-input> + <avue-input-tree key="businessReferValue" v-if="form.attributeSelectType === 'business'" default-expand-all :clearable="true" v-model="form.referValue" placeholder="璇烽�夋嫨鍐呭" :dic="businessData" @change="referValueChange"></avue-input-tree> + <avue-input-tree key="linkReferValue" v-else default-expand-all v-model="form.referValue" placeholder="璇烽�夋嫨鍐呭" :clearable="true" :dic="linkTypeData" @change="referValueChange"></avue-input-tree> </el-form-item> </el-col> <el-col :span="8"> - <el-form-item v-if="form.attributeSelectType === 'link'" label="鐗堟湰娆★細" prop="version"> + <el-form-item v-show="form.attributeSelectType === 'link'" label="鐗堟湰娆★細" prop="version"> <el-select v-model="form.version" placeholder="璇烽�夋嫨鐗堟湰娆�"> <el-option :value="1" label="褰撳墠鐗堟湰娆�"></el-option> <el-option :value="3" label="鏈�鏂扮増鏈"></el-option> </el-select> </el-form-item> </el-col> - <div v-if="!form.referValue" style="clear: both"> + <div v-show="showEnumSwitch" style="clear: both"> <el-col :span="8"> <el-form-item label="浣跨敤鏋氫妇锛�" prop="enumSwitch"> <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch> @@ -513,58 +514,6 @@ </div> </div> </el-form> - - <!-- 涓氬姟绫诲瀷瀵硅瘽妗� --> - <el-dialog - v-dialogDrag - :visible.sync="businessVisible" - append-to-body="true" - class="avue-dialog" - title="涓氬姟绫诲瀷閫夋嫨" - width="70%" - > - <avue-crud - ref="businessCrud" - :data="businessData" - :option="businessOption" - :table-loading="businessLoading" - @search-change="businessHandleSearch" - @search-reset="businessHandleReset" - @row-click="businessRowClick" - > - </avue-crud> - <span slot="footer" class="dialog-footer"> - <el-button type="primary" @click="businessSaveHandler">纭� 瀹�</el-button> - <el-button @click="businessEmpty">娓� 绌�</el-button> - <el-button @click="businessVisible = false">鍙� 娑�</el-button> - </span> - </el-dialog> - - <!-- 閾炬帴绫诲瀷瀵硅瘽妗� --> - <el-dialog - v-dialogDrag - :visible.sync="linkTypeVisible" - append-to-body="true" - class="avue-dialog" - title="閾炬帴绫诲瀷閫夋嫨" - width="70%" - > - <avue-crud - ref="linkTypeCrud" - :data="linkTypeData" - :option="linkTypeOption" - :table-loading="linkTypeLoading" - @search-change="linkHandleSearch" - @search-reset="linkHandleReset" - @row-click="linkRowClick" - > - </avue-crud> - <span slot="footer" class="dialog-footer"> - <el-button @click="linkEmpty">娓� 绌�</el-button> - <el-button @click="linkTypeVisible = false">鍙� 娑�</el-button> - <el-button type="primary" @click="linkSaveHandler">纭� 瀹�</el-button> - </span> - </el-dialog> </div> <span slot="footer" class="dialog-footer"> <el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button> @@ -625,73 +574,8 @@ ] }, dialogTitle: "", - businessRow: {}, - linkRow: {}, - linkDataSearch: [], - businessSearchParams: {}, - linkTypeSearchParams: {}, - businessLoading: false, - linkTypeLoading: false, - businessVisible: false, - linkTypeVisible: false, businessData: [], linkTypeData: [], - businessOption: { - ...basicOption, - addBtn: false, - menu: false, - searchMenuSpan: 8, - selection: false, - refreshBtn: false, - searchLabelWidth: 100, - highlightCurrentRow: true, - column: [ - { - label: '涓氬姟绫诲瀷鍚�', - prop: 'name', - sortable: true, - search: true - }, - { - label: '鏍囩', - prop: 'label', - sortable: true, - }, - { - label: '鐖剁被', - prop: 'fName', - sortable: true, - }, - { - label: '鐗堟湰瑙勫垯', - prop: 'revRuleName', - sortable: true, - }, - { - label: '鐢熷懡鍛ㄦ湡', - prop: 'lifeCycle', - sortable: true, - }, - ] - }, - linkTypeOption: { - ...basicOption, - addBtn: false, - menu: false, - searchMenuSpan: 8, - selection: false, - refreshBtn: false, - searchLabelWidth: 100, - highlightCurrentRow: true, - column: [ - { - label: '閾炬帴绫诲瀷鍚�', - prop: 'name', - sortable: true, - search: true - }, - ] - }, tableData: [], option: { ...basicOption, @@ -744,6 +628,8 @@ }, addVisible: false, addLoading: false, + referValueDic:[], + showEnumSwitch:false, form: { id: "", name: "", @@ -833,9 +719,24 @@ this.tableData = data; this.page.total = res.data.total; this.tableLoading = false; - }).catch(err => { - this.$message.error(err) }); + //鑾峰彇涓氬姟绫诲瀷鏁版嵁 + getBizTypes().then(res => { + const data = res.data.data.map(item => ({ + label: item.name, + value:item.name, + desc:item.label + })); + this.businessData = data; + }) + //鑾峰彇閾炬帴绫诲瀷鏁版嵁 + getAllLtName().then(res => { + const data = res.data.data.map(item => ({ + label: item, + value:item + })); + this.linkTypeData = data; + }) }, // 琛ㄦ牸澶撮儴鍒锋柊 @@ -844,7 +745,7 @@ }, // 鎼滅储 - handleSearch(params, done) { + handleSearch(params, done) {debugger; this.searchParams = { "conditionMap[id]": "*" + params.id + "*" }; @@ -1184,136 +1085,13 @@ }, // 鍊煎煙绫诲瀷鍒囨崲 attributeSelectTypeChange() { + this.form.referValue = ''; // 鍒囨崲鍊煎煙绫诲瀷 娓呯┖褰撳墠鍙傜収 this.$forceUpdate(); // 寮哄埗鏇存柊form缁勪欢 - this.form.referValue = null; // 鍒囨崲鍊煎煙绫诲瀷 娓呯┖褰撳墠鍙傜収 }, - - // 閫夋嫨鍙傜収 - referFormFocusHandler() { - const handlers = { - business: () => { - this.businessVisible = true; - this.businessLoading = true; - this.businessGetTable(); - }, - link: () => { - this.linkTypeVisible = true; - this.linkTypeLoading = true; - this.linkGetTable(); - } - }; - - const {attributeSelectType} = this.form; - const handler = handlers[attributeSelectType]; - - if (handler) { - handler(); - } - ; + //鍙傜収绫诲瀷鏁版嵁鍙樺寲 + referValueChange(data){ + this.showEnumSwitch=!data.value; }, - - // 涓氬姟绫诲瀷琛ㄦ牸鏁版嵁璇锋眰 - businessGetTable() { - getBizTypes(this.businessSearchParams).then(res => { - const data = res.data.data; - this.businessData = data; - this.businessLoading = false; - }) - }, - - // 涓氬姟绫诲瀷鍙傜収鎼滅储 - businessHandleSearch(val, done) { - this.businessSearchParams = { - btmName: val.name - } - this.businessGetTable(); - done() - }, - - // 涓氬姟绫诲瀷鍙傜収娓呯┖鎼滅储 - businessHandleReset() { - this.businessSearchParams = {}; - this.businessGetTable(); - }, - - // 閾炬帴绫诲瀷琛ㄦ牸鏁版嵁璇锋眰 - linkGetTable() { - getAllLtName(this.linkTypeSearchParams).then(res => { - const data = res.data.data.map(item => ({name: item})); - ; - this.linkTypeData = data; - this.linkDataSearch = data; - this.linkTypeLoading = false; - }) - }, - - // 閾炬帴绫诲瀷鍙傜収鎼滅储 - linkHandleSearch(params, done) { - const {name} = params; - - if (!params.name) { - this.linkTypeData = this.linkDataSearch; - return done(); - } - ; - - this.linkTypeData = this.linkDataSearch.filter(item => { - console.log(item) - return item.name && item.name.includes(name); - }); - - done(); - }, - - // 閾炬帴绫诲瀷鍙傜収娓呯┖鎼滅储 - linkHandleReset() { - this.linkTypeData = this.linkDataSearch; - }, - - // 涓氬姟绫诲瀷琛ㄦ牸琛岀偣鍑� - businessRowClick(row) { - this.businessRow = row; - }, - - // 涓氬姟绫诲瀷纭畾淇濆瓨 - businessSaveHandler() { - if (func.isEmptyObject(this.businessRow)) { - this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹紒') - return; - } - - this.form.referValue = this.businessRow.name; - this.businessVisible = false; - }, - - // 涓氬姟绫诲瀷娓呯┖ - businessEmpty() { - this.form.referValue = null; - this.businessVisible = false; - }, - - // 閾炬帴绫诲瀷纭畾淇濆瓨 - linkRowClick(row) { - this.linkRow = row; - }, - - // 涓氬姟绫诲瀷纭畾淇濆瓨 - linkSaveHandler() { - if (func.isEmptyObject(this.linkRow)) { - this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹紒') - return; - } - - this.form.referValue = this.linkRow.name; - this.linkTypeVisible = false; - }, - - // 閾炬帴绫诲瀷娓呯┖ - linkEmpty() { - this.form.referValue = null; - this.linkTypeVisible = false; - }, - // 鍏抽棴鏂板瀵硅瘽妗� addEscHandler() { this.addVisible = false; @@ -1334,7 +1112,7 @@ attributeSelectType: "business", version: 1, defaultValue: "",//榛樿鍊� - referValue: "", + referValue: null, btmTypeId: "", linkTypeName: "", rangeValue: "" @@ -1347,6 +1125,16 @@ addSaveHandler() { this.$refs.form.validate((valid) => { if (valid) { + if(this.form.attributeDataType === 'VTString'){ + if(!this.form.referValue){ + //鍙傜収绫诲瀷娌℃湁鍊� + + }else { + this.form.enumSwitch=false; + this.form.rangeValue='' + } + } + this.form.range = this.form.rangeValue ? this.form.rangeValue.replace(/\n/g, ';') : ''; if (this.form.attributeSelectType === 'business') { this.form.btmTypeId = this.form.referValue; -- Gitblit v1.9.3