From f39ba77c47566938d9e93d9730171308ab17218a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 20 六月 2023 11:51:32 +0800
Subject: [PATCH] 修改高级查询组件
---
/dev/null | 11 -----
Source/UBCS-WEB/vue.config.js | 2
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 15 +++++--
Source/UBCS/service-stop.sh | 36 +++++++++---------
4 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 733f77b..2114700 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -192,8 +192,10 @@
// 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
const data = JSON.stringify(this.options);
this.initOptions = JSON.parse(data);
- //console.log(this.initOptions);
- this.initOptions.forEach((item,index) => {
+ //console.log(this.initOptions);
+ //console.log(this.initOptions);
+ if(this.initOptions.length > 0){
+ this.initOptions.forEach((item,index) => {
if(item.fieldType==='combox') {
let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
if(enumCach != null) {
@@ -235,6 +237,7 @@
}
this.searchFormArrays.push(add)
});
+ }
//console.log(this.initOptions);
//console.log(this.searchFormArrays);
}
@@ -284,8 +287,9 @@
resetInput(){
const data = JSON.stringify(this.options);
this.initOptions = JSON.parse(data);
- let array = [];
- this.initOptions.forEach((item,index) => {
+ if(this.initOptions.length > 0){
+ let array = [];
+ this.initOptions.forEach((item,index) => {
let add = {
queryField: String(item.queryField),
condition:item.fieldType=='text' ? String("_like"):String("_equal"),
@@ -293,7 +297,8 @@
}
array.push(add)
});
- this.searchFormArrays = array;
+ this.searchFormArrays = array;
+ }
//console.log(this.initOptions);
//console.log(this.searchFormArrays);
},
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 1a031f6..5b32d90 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,7 +26,7 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
+ target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
diff --git a/Source/UBCS/service-stop.sh b/Source/UBCS/service-stop.sh
index 344967f..3ec7333 100644
--- a/Source/UBCS/service-stop.sh
+++ b/Source/UBCS/service-stop.sh
@@ -7,7 +7,7 @@
containerName=ubcs-auth
#濡傛灉瀛樺湪锛屽氨鍏抽棴骞朵笖鍒犻櫎璇ュ鍣�
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -18,7 +18,7 @@
imagesName=vci-ubcs/ubcs-admin
containerName=ubcs-admin
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -29,7 +29,7 @@
imagesName=vci-ubcs/ubcs-auth
containerName=ubcs-auth
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -40,7 +40,7 @@
imagesName=vci-ubcs/ubcs-log
containerName=ubcs-log
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -51,7 +51,7 @@
imagesName=vci-ubcs/ubcs-desk
containerName=ubcs-desk
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -62,7 +62,7 @@
imagesName=vci-ubcs/ubcs-flow
containerName=ubcs-flow
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -73,7 +73,7 @@
imagesName=vci-ubcs/ubcs-develop
containerName=ubcs-develop
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -84,7 +84,7 @@
imagesName=vci-ubcs/ubcs-jobadmin
containerName=ubcs-jobadmin
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -95,7 +95,7 @@
imagesName=vci-ubcs/ubcs-job
containerName=ubcs-job
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -106,7 +106,7 @@
imagesName=vci-ubcs/ubcs-report
containerName=ubcs-report
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -117,7 +117,7 @@
imagesName=vci-ubcs/ubcs-resource
containerName=ubcs-resource
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -128,7 +128,7 @@
imagesName=vci-ubcs/ubcs-swagger
containerName=ubcs-swagger
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -139,7 +139,7 @@
imagesName=vci-ubcs/ubcs-system
containerName=ubcs-system
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -150,7 +150,7 @@
imagesName=vci-ubcs/ubcs-user
containerName=ubcs-user
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -161,7 +161,7 @@
imagesName=vci-ubcs/ubcs-gateway
containerName=ubcs-gateway
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -172,7 +172,7 @@
imagesName=vci-ubcs/ubcs-omd
containerName=ubcs-omd
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -183,7 +183,7 @@
imagesName=vci-ubcs/ubcs-code
containerName=ubcs-code
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
@@ -194,7 +194,7 @@
imagesName=vci-ubcs/ubcs-applyjtcodeservice
containerName=ubcs-applyjtcodeservice
if [[ -n $(docker ps -q -f "name=$containerName") ]];then
- echo $containerName"is up,we will stop and remove it !!!"
+ echo $containerName" is up,we will stop and remove it !!!"
docker stop $containerName
docker rm $containerName
docker rmi $imagesName
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/config/UBCSTenantSqlParser.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/config/UBCSTenantSqlParser.java
deleted file mode 100644
index a5041c0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/config/UBCSTenantSqlParser.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.vci.ubcs.code.config;
-
-
-
-/**
- * @author ludc
- * @date 2023/6/13 12:46
- */
-public class UBCSTenantSqlParser {
-
-}
--
Gitblit v1.9.3