From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
src/views/mdc/base/MdcDriveTypeParamConfigList.vue | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/src/views/mdc/base/MdcDriveTypeParamConfigList.vue b/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
index ccfabc9..0af6e3b 100644
--- a/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
+++ b/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
@@ -14,10 +14,15 @@
:sm="24"
>
<a-form-item label="鎺у埗绯荤粺绫诲瀷">
- <j-dict-select-tag
- placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
+ <!--<j-dict-select-tag-->
+ <!--placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"-->
+ <!--v-model="queryParam.controlSystemType"-->
+ <!--/>-->
+ <a-auto-complete
v-model="queryParam.controlSystemType"
- dictCode="mdc_driveType"
+ :data-source="driveTypeList"
+ placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
+ :filter-option="filterOption"
/>
</a-form-item>
</a-col>
@@ -55,11 +60,15 @@
:sm="24"
>
<a-form-item label="鏄剧ず鏍囧織">
- <j-switch
- placeholder="璇烽�夋嫨鏄剧ず鏍囧織"
- v-model="queryParam.showFlag"
- query
- ></j-switch>
+ <!--<j-switch-->
+ <!--placeholder="璇烽�夋嫨鏄剧ず鏍囧織"-->
+ <!--v-model="queryParam.showFlag"-->
+ <!--query-->
+ <!--></j-switch>-->
+ <a-select v-model='queryParam.showFlag' placeholder="璇烽�夋嫨鏄剧ず鏍囧織">
+ <a-select-option value="Y">鏄�</a-select-option>
+ <a-select-option value="N">鍚�</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col
@@ -69,11 +78,15 @@
:sm="24"
>
<a-form-item label="宸ヤ綔鏇茬嚎鏍囧織">
- <j-switch
- placeholder="璇烽�夋嫨宸ヤ綔鏇茬嚎鏍囧織"
- v-model="queryParam.curveGenerationFlags"
- query
- ></j-switch>
+ <!--<j-switch-->
+ <!--placeholder="璇烽�夋嫨宸ヤ綔鏇茬嚎鏍囧織"-->
+ <!--v-model="queryParam.curveGenerationFlags"-->
+ <!--query-->
+ <!--></j-switch>-->
+ <a-select v-model='queryParam.curveGenerationFlags' placeholder="璇烽�夋嫨宸ヤ綔鏇茬嚎鏍囧織">
+ <a-select-option value="Y">鏄�</a-select-option>
+ <a-select-option value="N">鍚�</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
</template>
@@ -122,7 +135,7 @@
<a-button
type="primary"
icon="download"
- @click="handleExportXls('璁惧椹卞姩鍙傛暟閰嶇疆')"
+ @click="handleExportXls('椹卞姩鍙傛暟绠＄悊')"
>瀵煎嚭</a-button>
<a-upload
name="file"
@@ -261,6 +274,7 @@
<mdc-drive-type-param-config-modal
ref="modalForm"
@ok="modalFormOk"
+ :driveTypeList="driveTypeList"
></mdc-drive-type-param-config-modal>
</a-card>
</template>
@@ -273,6 +287,7 @@
import MdcDriveTypeParamConfigModal from './modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigModal'
import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
import { filterObj } from '@/utils/util';
+import api from '@/api/mdc'
export default {
name: 'MdcDriveTypeParamConfigList',
mixins: [JeecgListMixin, mixinDevice],
@@ -345,16 +360,22 @@
deleteBatch: "/mdc/mdcDriveTypeParamConfig/deleteBatch",
exportXlsUrl: "/mdc/mdcDriveTypeParamConfig/exportXls",
importExcelUrl: "mdc/mdcDriveTypeParamConfig/importExcel",
-
},
dictOptions: {},
superFieldList: [],
+ driveTypeList:[]
+ }
+ },
+ provide(){
+ return {
+ driveTypeList:this.driveTypeList
}
},
created() {
this.$set(this.dictOptions, 'showFlag', [{ text: '鏄�', value: 'Y' }, { text: '鍚�', value: 'N' }])
this.$set(this.dictOptions, 'curveGenerationFlags', [{ text: '鏄�', value: 'Y' }, { text: '鍚�', value: 'N' }])
this.getSuperFieldList();
+ this.getDriveTypeByApi()
},
computed: {
importExcelUrl: function () {
@@ -372,7 +393,6 @@
fieldList.push({ type: 'int', value: 'sortNo', text: '搴忓彿', dictCode: '' })
fieldList.push({ type: 'switch', value: 'showFlag', text: '鏄剧ず鏍囧織' })
fieldList.push({ type: 'switch', value: 'curveGenerationFlags', text: '宸ヤ綔鏇茬嚎鏍囧織' })
-
this.superFieldList = fieldList
},
@@ -389,6 +409,25 @@
param.pageSize = this.ipagination.pageSize
return filterObj(param)
},
+ /**
+ * 璋冪敤鎺ュ彛鑾峰彇鎺у埗绯荤粺绫诲瀷
+ */
+ getDriveTypeByApi(){
+ api.getDriveTypeApi().then((res)=>{
+ this.driveTypeList=res.result.map(item=>item.value)
+ })
+ },
+ /**
+ * 鑱旀兂杈撳叆妗嗙瓫閫夊姛鑳�
+ * @param input 杈撳叆鐨勫唴瀹�
+ * @param option 閰嶇疆
+ * @returns {boolean} 鍒ゆ柇鏄惁绛涢��
+ */
+ filterOption(input, option) {
+ return (
+ option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
+ );
+ },
}
}
--
Gitblit v1.9.3