From 8b6565f10d356ae2cac83cfa2bbdcbcd5d99db40 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 九月 2023 15:48:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/config/website.js | 4 ++--
Source/UBCS-WEB/src/views/wel/Statistic.vue | 10 ++++++----
Source/UBCS-WEB/src/views/modeling/originalAdd.vue | 24 +++++++++++++-----------
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/config/website.js b/Source/UBCS-WEB/src/config/website.js
index b2c93fd..af0dc75 100644
--- a/Source/UBCS-WEB/src/config/website.js
+++ b/Source/UBCS-WEB/src/config/website.js
@@ -46,7 +46,7 @@
// 鎶ヨ〃璁捐鍣ㄥ湴鍧�(cloud绔彛涓�8108,boot绔彛涓�80)
reportUrl: 'http://localhost:8108/ureport',
// 鍗曠偣鐧诲綍绯荤粺璁よ瘉(ubcs-auth鏈嶅姟鐨勫湴)
- ssoUrl:'',
+ ssoUrl:'http://localhost:37000/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
// 鍗曠偣鐧诲綍鍥炶皟鍦板潃(Saber鏈嶅姟鐨勫湴鍧�)
- redirectUri: 'http://localhost:1888',
+ redirectUri: 'http://localhost:37000',
}
diff --git a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
index c6b6974..e400868 100644
--- a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
@@ -300,18 +300,20 @@
},
methods: {
onSubmit() {
- const conditionMap = {};
- if (this.form.name) {
- conditionMap[`conditionMap['name_like']`] = this.form.name;
+ if (this.form.name || this.form.label) {
+ const params = {};
+ if (this.form.name) {
+ params.name = this.form.name;
+ }
+ if (this.form.label) {
+ params.label = this.form.label;
+ }
+ getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize, params)
+ .then((res) => {
+ this.enumRefer.enumPage.total = res.data.data.total;
+ this.enumRefer.data = res.data.data.records;
+ });
}
- if (this.form.label) {
- conditionMap[`conditionMap['label_like']`] = this.form.label;
- }
- getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize, conditionMap)
- .then((res) => {
- this.enumRefer.enumPage.total = res.data.data.total;
- this.enumRefer.data = res.data.data.records;
- });
},
enumOnLoad(){
getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize).then(res => {
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index 81a37cc..a0c587b 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -21,7 +21,7 @@
{
click: this.handleItemAClick,
title: '鐗╁搧涓绘暟鎹�',
- count: 0,
+ count: 1723,
icon: 'iconfont iconicon_doc',
color: 'rgb(49, 180, 141)',
uiUrl: "/MasterData/items?id=wupin@name=鐗╁搧涓绘暟鎹�",
@@ -30,7 +30,7 @@
{
click: this.handleItemBClick,
title: '浜哄憳涓绘暟鎹�',
- count: 0,
+ count: 1225,
icon: 'iconfont iconicon_dispose',
color: 'rgb(56, 161, 242)',
uiUrl:'/MasterData/items?id=renyuan@@name=浜哄憳涓绘暟鎹�',
@@ -39,7 +39,7 @@
{
click: this.handleItemCClick,
title: '涓婚搴撳畾涔�',
- count: 0,
+ count: 523,
icon: 'el-icon-setting',
color: 'rgb(117, 56, 199)',
uiUrl:'/modeling/classifyTree',
@@ -59,7 +59,7 @@
}
},
created() {
- // this.getList();
+ this.getList();
},
computed(){
@@ -78,11 +78,13 @@
this.$router.push({ path: '/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁'} );
},
getList() {
+ // debugger
Object.values(this.option.data).map(record => {
record.count = record.count || 0;
if (!this.countByServer) {
// 鏄墠绔煡璇�
getList(record.countUrl, {}).then(res => {
+ console.log('res',res)
if (res.data.data.success) {
record.count = res.data.data.obj;
} else {
--
Gitblit v1.9.3