From fb4cb0e61775b2df5e493ad4ca19402d76f8bc6f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 18 九月 2023 16:17:39 +0800
Subject: [PATCH] 集成系统-查询修复
---
Source/UBCS-WEB/src/views/docking/data.vue | 4 +-
Source/UBCS-WEB/src/views/docking/loge.vue | 4 +-
Source/UBCS-WEB/src/page/login/index.vue | 4 --
Source/UBCS-WEB/src/views/wel/Statistic.vue | 2
Source/UBCS-WEB/src/api/docking/data.js | 2
Source/UBCS-WEB/src/api/docking/task.js | 2
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 62 +++++++++++++++++++++---------
Source/UBCS-WEB/src/api/docking/loge.js | 2
Source/UBCS-WEB/src/views/docking/task.vue | 4 +-
9 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/docking/data.js b/Source/UBCS-WEB/src/api/docking/data.js
index 5d1cf4e..94da0af 100644
--- a/Source/UBCS-WEB/src/api/docking/data.js
+++ b/Source/UBCS-WEB/src/api/docking/data.js
@@ -1,6 +1,6 @@
import request from '@/router/axios';
-export const getList = (page, size, params) => {
+export const getDataList = (page, size, params) => {
return request({
url: '/api/ubcs-code/dockingManagement/gridDockingData',
method: 'get',
diff --git a/Source/UBCS-WEB/src/api/docking/loge.js b/Source/UBCS-WEB/src/api/docking/loge.js
index 4553623..8450a85 100644
--- a/Source/UBCS-WEB/src/api/docking/loge.js
+++ b/Source/UBCS-WEB/src/api/docking/loge.js
@@ -1,6 +1,6 @@
import request from '@/router/axios';
-export const getList = (page, limit, params) => {
+export const getLogoList = (page, limit, params) => {
return request({
url: '/api/ubcs-code/dockingManagement/gridLoge',
method: 'get',
diff --git a/Source/UBCS-WEB/src/api/docking/task.js b/Source/UBCS-WEB/src/api/docking/task.js
index f398361..fcb0acc 100644
--- a/Source/UBCS-WEB/src/api/docking/task.js
+++ b/Source/UBCS-WEB/src/api/docking/task.js
@@ -1,6 +1,6 @@
import request from '@/router/axios';
-export const getList = (page, size, params) => {
+export const getTaskList = (page, size, params) => {
return request({
url: '/api/ubcs-code/dockingManagement/gridDockingTask',
method: 'get',
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 4294b66..5a018d8 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -72,7 +72,9 @@
</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'],
@@ -118,20 +120,41 @@
},
SaveHandler(){
let name = this.SearchObject.searchData[this.formInline.type].prop;
- getList(this.page.currentPage, this.page.pageSize, { [`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);
- }
- });
+ const requestApi = (api) => {
+ api(this.page.currentPage, this.page.pageSize, { [`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=='logo'){
+ 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 { 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, 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;
@@ -158,15 +181,16 @@
if ((type === 'task' || type === 'data') && sendTypeFlga) {
requestParams['conditionMap[sendType_like]'] = taskCut;
}
- // 璇锋眰
- getList(currentPage, pageSize, requestParams).then(res => {
- if(!res.data.data.records){
- this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
- }else {
- let Data=res.data.data;
- this.$emit('getList',Data);
- }
- });
+
+ if (type == 'logo') {
+ requestApi(getLogoList);
+ }
+ if (type == 'data') {
+ requestApi(getDataList);
+ }
+ if (type == 'task') {
+ requestApi(getTaskList);
+ }
}
}
}
diff --git a/Source/UBCS-WEB/src/page/login/index.vue b/Source/UBCS-WEB/src/page/login/index.vue
index 6a732cd..0e0b68e 100644
--- a/Source/UBCS-WEB/src/page/login/index.vue
+++ b/Source/UBCS-WEB/src/page/login/index.vue
@@ -12,10 +12,6 @@
<div style="font-size: 15px">
<el-image src="/img/pageLogo.jpeg" style="width: 360px; height: 280px"></el-image>
</div>
-<!-- <div style="font-size: 15px" class="image-container">-->
-<!-- <el-image class="background-image" src="/img/pageLogo.jpeg" ></el-image>-->
-<!-- </div>-->
- <!--<img class="img" src="/img/logo.png" alt="">-->
</div>
<div class="login-border">
<div class="login-main">
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index e4abbc5..c8f994d 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -23,7 +23,7 @@
</template>
<script>
-import {getList} from "@/api/docking/data";
+import {getDataList} from "@/api/docking/data";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
import website from "@/config/website";
@@ -242,7 +242,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ getDataList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 36a1bd8..91a235b 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -23,7 +23,7 @@
</template>
<script>
-import {getList} from "@/api/docking/loge";
+import {getLogoList} from "@/api/docking/loge";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
@@ -271,7 +271,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ getLogoList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 00c0348..31e4f0d 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -31,7 +31,7 @@
</template>
<script>
-import {getList,sendData} from "@/api/docking/task";
+import {getTaskList,sendData} from "@/api/docking/task";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
import {remove} from "@/api/code/codeSynonym";
@@ -295,7 +295,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params, this.params, query, this.query)).then(res => {
+ getTaskList(page.currentPage, page.pageSize, Object.assign(params, this.params, query, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index a0c587b..0341d74 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -84,7 +84,7 @@
if (!this.countByServer) {
// 鏄墠绔煡璇�
getList(record.countUrl, {}).then(res => {
- console.log('res',res)
+ // console.log('res',res)
if (res.data.data.success) {
record.count = res.data.data.obj;
} else {
--
Gitblit v1.9.3