From 72085226bc9f82a9129b8fbcd17fab1edf9ef270 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 05 一月 2024 15:08:19 +0800 Subject: [PATCH] 1. 修复飞行巡检模块中有效率异常详情弹出框无法正常显示的bug; 2.优化各异常类型的折线图配置项生成逻辑; --- src/sfc/InputSearch.vue | 43 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/sfc/InputSearch.vue b/src/sfc/InputSearch.vue index 28757d2..d7d10d7 100644 --- a/src/sfc/InputSearch.vue +++ b/src/sfc/InputSearch.vue @@ -1,7 +1,10 @@ <!-- 杩滅▼鎼滅储 绔欑偣鍚嶇О 杈撳叆妗嗙粍浠� 鏍规嵁杈撳叆绔欑偣鐨勫唴瀹规彁渚涘搴旂殑杈撳叆寤鸿 - + 1.鍚戠埗缁勪欢浼犲叆绔欑偣鍚嶅瓧 鍜� 璁惧缂栫爜 + 2.鍙互閫夋嫨寤鸿鎴栬�呬换鎰忚緭鍏� + 3.鐖剁粍浠跺彲浠ヨ缃緭鍏ユ鏈夋棤榛樿鐨勭珯鐐瑰悕绉� + 4.鐖剁粍浠跺彲浠ヨ缃槸鍚﹂渶瑕佹牴鎹�変腑鐨勫紓甯哥被鍨嬫潵缁欏嚭绔欑偣寤鸿 ** 鍦ㄧ埗缁勪欢涓缃� <InputSearch :isNeedDefaultSite="1" @submit-value="(n)=>form.name=n"> </InputSearch> @@ -9,6 +12,9 @@ 鐖剁粍浠堕�氳繃娉ㄥ叆 :isNeedDefaultSite="1"鎴� :isNeedDefaultSite="0"鏉ヤ唬琛ㄨ杈撳叆妗嗘湁鏃犻粯璁ょ殑绔欑偣鍚嶇О 1浠h〃闇�瑕侀粯璁ゅ�� 锛�0浠h〃涓嶉渶瑕侀粯璁ゅ�� --> + + + <script> import exceptionApi from '@/api/exceptionApi.js'; export default { @@ -42,13 +48,15 @@ default:'-1' } }, - emits: ['submitValue', 'submitSiteNums'], + emits: ['submitValue', 'submitSiteNums','submitMncode'], data() { return { // 鐢ㄦ埛閫変腑鐨勫�� state: '', // 淇濆瓨杈撳叆寤鸿鐨勭珯鐐瑰悕绉� - siteNames: [] + siteNames: [], + // 淇濆瓨杈撳叆寤鸿鐨勭珯鐐硅澶囩紪鍙� + siteNamesAndMnCode:[] } }, watch:{ @@ -79,6 +87,12 @@ if(this.siteName != '-1' && this.siteName != ''){ this.state = this.siteName this.$emit('submitValue', this.state) + } + }, + state(){ + if(this.state != '' && this.state != null){ + // 鏌ユ壘瀵瑰簲鐨勮澶囩紪鍙� + this.onSiteNameSelected(this.state) } } }, @@ -116,19 +130,36 @@ const sites = res.data.data sites.filter((item) => { this.siteNames.push(item['name']) + let temp = {} + temp.name = item.name + temp.mnCode = item.mnCode + this.siteNamesAndMnCode.push(temp) }) }) }else if(this.isNeedRealTimeAdvice == '0'){ - this.$http.get('/dust/sitename').then((response) => { + exceptionApi.getSitesNum().then((response) => { const sites = response.data.data sites.filter((item) => { this.siteNames.push(item['name']) + let temp = {} + temp.name = item.name + temp.mnCode = item.mnCode + this.siteNamesAndMnCode.push(temp) }) this.$emit('submitSiteNums', this.siteNames.length) }) } }, + // 鏍规嵁閫変腑鐨勭珯鐐规煡璇㈣澶囩紪鍙� + onSiteNameSelected(siteName) { + const selectedSite = this.siteNamesAndMnCode.find((site) => site.name == siteName); + if (selectedSite) { + this.$emit('submitMncode',selectedSite.mnCode) + }else{ + this.$emit('submitMncode','') + } +}, // 鐐瑰嚮閫変腑寤鸿椤规椂瑙﹀彂 handleSelect(item) { @@ -139,7 +170,8 @@ clearSiteName() { this.state = '' this.$emit('submitValue', this.state) - } + }, + } } </script> @@ -153,6 +185,7 @@ popper-class="my-autocomplete" placeholder="璇疯緭鍏�" @select="handleSelect" + @change="handleSelect" clearable @clear="clearSiteName" > -- Gitblit v1.9.3