From bf70f3cf825f44c457dba2bebd26e7af73e4b2a8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 06 九月 2024 15:02:09 +0800
Subject: [PATCH] 解决集成日志查询bug
---
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 93 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 85 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index e34488d..4216767 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -4,7 +4,7 @@
<!-- 闆嗘垚鏃ュ織 浠诲姟 鏁版嵁鍏ㄩ儴鍏敤-->
<el-form-item label="闆嗘垚鏌ヨ:" size="small">
<el-select v-model="formInline.type" placeholder="璇烽�夋嫨鍒嗙被" @change="SelectChange">
- <el-option :label="item.label" :value="item.value" v-for="item in SearchObject.searchData" ></el-option>
+ <el-option :label="item.label" :value="item.value" :key="item.value" v-for="(item,index) in SearchObject.searchData"></el-option>
</el-select>
</el-form-item>
<!-- 闆嗘垚鏃ュ織 鏄惁鎴愬姛-->
@@ -24,9 +24,13 @@
<el-option label="鍒嗙被鏌ヨ" value="queryClassify"></el-option>
<el-option label="鍚紪鐮佽鍒欑殑鍒嗙被鏌ヨ" value="queryClassifyRule"></el-option>
<el-option label="鏁版嵁鏌ヨ" value="queryData"></el-option>
+ <el-option label="鏍囧噯鐢宠" value="applyCodeForBZ"></el-option>
+ <el-option label="閮ㄩ棬鐢宠" value="syncDataForOrg"></el-option>
+ <el-option label="浜哄憳鐢宠" value="syncDataForPerson"></el-option>
</el-select>
</el-form-item>
-<!-- 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔� 闆嗘垚鏁版嵁 鏄惁鍒嗚В浠诲姟-->
+<!-- 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔�
+闆嗘垚鏁版嵁 鏄惁鍒嗚В浠诲姟-->
<el-form-item v-if="((status.type == 'task' || status.type == 'data')&& status.stateTaskDataFlag)" size="small">
<el-select v-model="formInline.stateTask" placeholder="璇烽�夋嫨鐘舵��">
<el-option label="鏄�" value="true"></el-option>
@@ -60,18 +64,20 @@
<!-- 鍏敤妯″潡-->
<!-- 杈撳叆鍐呭-->
<el-form-item size="small" v-if="shouldShowInput">
- <el-input v-model="formInline.text" placeholder="璇疯緭鍏ュ唴瀹�" @keyup.enter.native="SaveHandler"></el-input>
+ <el-input v-model="formInline.text" placeholder="鎸変笅鍥炶溅閿繘琛屾煡璇紒" @keyup.enter.native="SaveHandler"></el-input>
</el-form-item>
<!-- 鏌ヨ鎸夐挳-->
<el-form-item size="small" v-if="shouldShowButton">
- <el-button type="success" size="small">鏌ヨ</el-button>
+ <el-button type="success" size="small" @click="handleSearch">鏌ヨ</el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
-import {getList} from "@/api/docking/loge";
+import {getLogoList} from "@/api/docking/loge";
+import {getDataList} from "@/api/docking/data";
+import {getTaskList} from "@/api/docking/task";
export default {
name: "VciDockingSearch",
props:['SearchObject','page','formInline','status'],
@@ -117,9 +123,80 @@
},
SaveHandler(){
let name = this.SearchObject.searchData[this.formInline.type].prop;
- getList(this.page.currentPage, this.page.pageSize, {[name]: this.formInline.text}).then(res => {
- console.log(res);
- });
+ const requestApi = (api) => {
+ api(this.page.currentPage, this.page.pageSize,'createTime','desc',{[`conditionMap[${name}_like]`]: this.formInline.text}).then(res => {
+ if(!res.data.data.records){
+ this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
+ }else {
+ let Data=res.data.data;
+ this.$emit('getList',Data);
+ }
+ });
+ }
+ //鏃ュ織
+ if(this.status.type=='loge'){
+ requestApi(getLogoList);
+ }
+ //鏁版嵁
+ if(this.status.type=='data'){
+ requestApi(getDataList);
+ }
+ //浠诲姟
+ if(this.status.type=='task'){
+ requestApi(getTaskList);
+ }
+ },
+ handleSearch() {
+ const { type, typeFlag, stateFlag, stateTaskDataFlag, dateFlag, lastDateFlag ,sendTypeFlga } = this.status;
+ const { currentPage, pageSize } = this.page;
+ const { cut, state, stateTask, Date, lastDate, taskCut } = this.formInline;
+ const requestParams = {};
+ const requestApi = (api) => {
+ api(currentPage, pageSize,'createTime','desc',requestParams).then(res => {
+ if(!res.data.data.records){
+ this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�');
+ } else {
+ let Data=res.data.data;
+ this.$emit('getList',Data);
+ }
+ });
+ }
+ // 闆嗘垚鏃ュ織绫诲瀷
+ if (type === 'loge' && typeFlag) {
+ requestParams['conditionMap[type_like]'] = cut;
+ }
+ // 闆嗘垚鏃ュ織鏄惁鎴愬姛
+ if (type === 'loge' && stateFlag) {
+ requestParams['conditionMap[interfaceStatus_like]'] = state;
+ }
+ // 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔� 闆嗘垚鏁版嵁 鏄惁鍒嗚В浠诲姟
+ if ((type === 'task' || type === 'data') && stateTaskDataFlag) {
+ requestParams['conditionMap[sendFlag_like]'] = stateTask;
+ }
+ // 闆嗘垚浠诲姟 鍒涘缓鏃ユ湡 鍜� 闆嗘垚鏃ュ織 璁板綍鏃堕棿
+ if ((type === 'loge' || type === 'task') && dateFlag) {
+ const formattedDate = this.$moment(Date).format('YYYY-M-D');
+ requestParams['conditionMap[createTime_like]'] = formattedDate;
+ }
+ // 闆嗘垚浠诲姟 鏈�鍚庢帹閫佹椂闂�
+ if (type === 'task' && lastDateFlag) {
+ const formattedDate = this.$moment(lastDate).format('YYYY-M-D');
+ requestParams['conditionMap[lastModifyTime_like]'] = formattedDate;
+ }
+ // 闆嗘垚浠诲姟 闆嗘垚鏁版嵁 鎺ㄩ�佺被鍨�
+ if ((type === 'task' || type === 'data') && sendTypeFlga) {
+ requestParams['conditionMap[sendType_like]'] = taskCut;
+ }
+
+ if (type == 'loge') {
+ requestApi(getLogoList);
+ }
+ if (type == 'data') {
+ requestApi(getDataList);
+ }
+ if (type == 'task') {
+ requestApi(getTaskList);
+ }
}
}
}
--
Gitblit v1.9.3