From cf585780ca83908649c5fad7c07b5e45c4f12b67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 18 九月 2023 14:14:45 +0800
Subject: [PATCH] 首页样式修改
---
Source/UBCS-WEB/src/config/website.js | 1
Source/UBCS-WEB/src/views/modeling/original.vue | 2
Source/UBCS-WEB/src/page/login/index.vue | 7 +
Source/UBCS-WEB/src/views/code/code.vue | 8 +
Source/UBCS-WEB/src/views/wel/Statistic.vue | 153 +++++++++++++++++---------------------
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 4 +
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 3
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 3
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 22 +++++
9 files changed, 112 insertions(+), 91 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 14f0c2d..a5cb7ef 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -90,9 +90,13 @@
type: String,
default: "",
},
+ eventList:{
+ type:Array
+ }
},
data() {
return {
+ eventFlag:{},
TreeValueForm:'',
updateIndex: 0,
form: {},
@@ -120,9 +124,12 @@
slotColumnList: [],
};
},
- mounted() {
+ mounted() {
this.handleResize();
},
+ created() {
+
+ },
computed: {
localTrendsSpan() {
if (this.trendsSpan) {
@@ -157,6 +164,16 @@
methods: {
// 娓叉煋琛ㄥ崟妯℃澘
templateRender(formItemList,TreeValue) {
+ if (this.eventList) {
+ this.eventFlag= this.eventList.some(item => {
+ if (item.classifyInvokeEditFlag === 'true') {
+ console.log('even', item);
+ this.eventObject = item;
+ return true;
+ }
+ });
+ // console.log('add',add)
+ }
// 鏃犻渶鍒嗙粍鏁版嵁
let column = [];
let group = [];
@@ -165,6 +182,7 @@
let value=''
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
+ console.log(formItem)
// console.log('formItem.dicData.value',formItem.dicData)
if (formItem.type === "line") {
group.push({
@@ -222,7 +240,7 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
- (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
+ (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null) ,
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 04ea8ba..7c5fdee 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -15,6 +15,7 @@
:type="type"
:TreeValue="TreeValue"
:rowOid="rowOid"
+ :eventList="eventList"
:templateOid="templateOid"
v-if="dialogVisible"
ref="FormTemplate"
@@ -128,6 +129,7 @@
},
data() {
return {
+ eventList:[],
//鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
codeValueApplyStatus:'',
loading: false,
@@ -256,6 +258,8 @@
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
);
+ this.eventList=res.data.templateVO.attributes
+ // this.$refs.FormTemplate.$emit('eventList', res.data.templateVO.attributes);
if (Object.keys(this.setForm).length > 0) {
this.$refs.FormTemplate.form = this.setForm;
}
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 8813035..61ebc48 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -182,7 +182,8 @@
},
Treedata: {
type: Array
- }
+ },
+
},
data() {
return {
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 0edd298..4294b66 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -26,7 +26,8 @@
<el-option label="鏁版嵁鏌ヨ" value="queryData"></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>
diff --git a/Source/UBCS-WEB/src/config/website.js b/Source/UBCS-WEB/src/config/website.js
index cc399fe..b2c93fd 100644
--- a/Source/UBCS-WEB/src/config/website.js
+++ b/Source/UBCS-WEB/src/config/website.js
@@ -46,6 +46,7 @@
// 鎶ヨ〃璁捐鍣ㄥ湴鍧�(cloud绔彛涓�8108,boot绔彛涓�80)
reportUrl: 'http://localhost:8108/ureport',
// 鍗曠偣鐧诲綍绯荤粺璁よ瘉(ubcs-auth鏈嶅姟鐨勫湴)
+ ssoUrl:'',
// 鍗曠偣鐧诲綍鍥炶皟鍦板潃(Saber鏈嶅姟鐨勫湴鍧�)
redirectUri: 'http://localhost:1888',
}
diff --git a/Source/UBCS-WEB/src/page/login/index.vue b/Source/UBCS-WEB/src/page/login/index.vue
index 97f7c74..6a732cd 100644
--- a/Source/UBCS-WEB/src/page/login/index.vue
+++ b/Source/UBCS-WEB/src/page/login/index.vue
@@ -25,7 +25,12 @@
</h4>
<userLogin v-if="activeName==='user'"></userLogin>
<thirdLogin v-else-if="activeName==='third'"></thirdLogin>
-
+ <div class="login-menu">
+ <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>
+ <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
+ <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>
+ <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>
+ </div>
</div>
</div>
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 942065e..52edda4 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1324,6 +1324,7 @@
export default {
data() {
return {
+ crudOption:{...optionRule},
ruleForm: {},
query: {},
loading: true,
@@ -2546,7 +2547,7 @@
this.query = {};
this.onLoad(this.page);
},
- // 缂栫爜瑙勫垯蹇�熸煡璇�
+ // 缂栫爜瑙勫垯蹇�熸煡璇earchChange
searchChange(params, done) {
this.page.currentPage = 1;
// 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
@@ -2559,6 +2560,11 @@
}
this.query = requestData;
this.onLoad(this.page, this.query);
+ // console.log( this.findObject(this.optionRule.column,'id'))
+ // console.log(this.crudOption.column[0])
+ // this.crudOption.column && this.crudOption.column.length > 0
+ // ? (this.crudOption.column[0].value = '')
+ // : null;
done();
},
/** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index d701e74..349cb2f 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -12,7 +12,7 @@
<el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)">缂栬緫</el-button>
<el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)">鍒犻櫎</el-button>
</template>
- <template slot="menuLeft">
+ <template slot="menuLeft">
<el-button size="small" type="primary" icon="el-icon-plus" @click="addSave">鏂� 澧�
</el-button>
<el-button size="small" plain type="primary" icon="el-icon-zoom-in" @click="applyRangeOpen">鏌ョ湅浣跨敤鑼冨洿
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index 0d6556a..81a37cc 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -1,13 +1,6 @@
<template>
<div>
- <el-row :gutter="20">
- <el-col :xs="8" :sm="8" :md="8" :lg="6" :xl="4" v-for="item in listMyTask">
- <div class="box" :style="item.style" @click="goto(item)">
- {{item.name}}
- <div><avue-count-up class="value" :end="item.count"></avue-count-up></div>
- </div>
- </el-col>
- </el-row>
+ <avue-data-box :option="option" :animation="true"></avue-data-box>
</div>
</template>
@@ -21,99 +14,91 @@
data(){
return {
countByServer:true,
- listMyTask:[]
+ // listMyTask:[]
+ option: {
+ span:6,
+ data: [
+ {
+ click: this.handleItemAClick,
+ title: '鐗╁搧涓绘暟鎹�',
+ count: 0,
+ icon: 'iconfont iconicon_doc',
+ color: 'rgb(49, 180, 141)',
+ uiUrl: "/MasterData/items?id=wupin@name=鐗╁搧涓绘暟鎹�",
+ countUrl:'priceIndexController/countNeedConfirmPlan'
+ },
+ {
+ click: this.handleItemBClick,
+ title: '浜哄憳涓绘暟鎹�',
+ count: 0,
+ icon: 'iconfont iconicon_dispose',
+ color: 'rgb(56, 161, 242)',
+ uiUrl:'/MasterData/items?id=renyuan@@name=浜哄憳涓绘暟鎹�',
+ countUrl:'priceIndexController/countPricingPlan'
+ },
+ {
+ click: this.handleItemCClick,
+ title: '涓婚搴撳畾涔�',
+ count: 0,
+ icon: 'el-icon-setting',
+ color: 'rgb(117, 56, 199)',
+ uiUrl:'/modeling/classifyTree',
+ countUrl:'priceIndexController/countNeedFeedbackPlan'
+ },
+ {
+ click: this.handleItemDClick,
+ title: '渚涘簲鍟嗕富鏁版嵁',
+ count: 0,
+ icon: 'iconfont iconicon_work',
+ color: 'rgb(255, 102, 51)',
+ uiUrl:'/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁',
+ countUrl:'priceIndexController/countMyUnCreatePricePlan'
+ },
+ ]
+ },
}
},
created() {
- this.getList();
+ // this.getList();
},
computed(){
},
methods: {
+ handleItemAClick() {
+ this.$router.push({ path: "/MasterData/items?id=wupin@name=鐗╁搧涓绘暟鎹�"} );
+ },
+ handleItemBClick() {
+ this.$router.push({ path: '/MasterData/items?id=renyuan@@name=浜哄憳涓绘暟鎹�'} );
+ },
+ handleItemCClick() {
+ this.$router.push({ path: '/modeling/classifyTree'} );
+ },
+ handleItemDClick() {
+ this.$router.push({ path: '/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁'} );
+ },
getList() {
- let data = [{
- "backgroundColor": "#FF5722",
- "btmname": "hometask",
- "countUrl": "priceIndexController/countNeedConfirmPlan",
- "name": "鐗╁搧涓绘暟鎹�",
- "nameOid": "",
- "oid": "34aebfde-eb11-4555-87eb-0a779be9aad0",
- "uiUrl": "/MasterData/items?id=wupin@name=鐗╁搧涓绘暟鎹�",
- }, {
- "backgroundColor": "#5FB878",
- "btmname": "hometask",
- "countUrl": "priceIndexController/countPricingPlan",
- "name": "浜哄憳涓绘暟鎹�",
- "nameOid": "2C72EA23-8AA5-E5FC-9BC1-DE4AD182EF7B",
- "oid": "6256ae79-7765-4c66-afc7-f12fad350065",
- "uiUrl": "/MasterData/items?id=renyuan@@name=浜哄憳涓绘暟鎹�",
- },{
- "backgroundColor": "#1E9FFF",
- "btmname": "hometask",
- "countUrl": "priceIndexController/countNeedFeedbackPlan",
- "name": "涓婚搴撳畾涔�",
- "nameOid": "2536978C-CD1B-5B56-6529-A8C3456B5260",
- "oid": "3043cdf1-8479-4c2a-9eab-fc35e9f9d5a7",
- "uiUrl": "/modeling/classifyTree",
- },
- {
- "backgroundColor": "#FF5722",
- "btmname": "hometask",
- "countUrl": "priceIndexController/countMyUnCreatePricePlan",
- "name": "渚涘簲鍟嗕富鏁版嵁",
- "nameOid": "",
- "oid": "529634e7-1854-4f61-b911-a91e3c406757",
- "uiUrl": "/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁",
- }]
- this.listMyTask = data.map(record => {
- record.style=record.style || ''
- if(record.backgroundColor!=''){
- record.style = 'background-color:'+record.backgroundColor;
- }
- record.count=record.count || 0;
- if(!this.countByServer){
- //鏄墠绔煡璇�
- getList(record.countUrl,{}).then(res=>{
- if(res.data.data.success){
- record.count=res.data.data.obj;
- }else{
- record.count=0
+ Object.values(this.option.data).map(record => {
+ record.count = record.count || 0;
+ if (!this.countByServer) {
+ // 鏄墠绔煡璇�
+ getList(record.countUrl, {}).then(res => {
+ if (res.data.data.success) {
+ record.count = res.data.data.obj;
+ } else {
+ record.count = 0;
}
- })
-
+ });
}
return {
...record
- }
- })
+ };
+ });
},
- goto(item){
- this.$router.push({ path: item.uiUrl });
- }
}
}
</script>
<style scoped>
-.el-col{margin-bottom: 0}
-.box{
- text-align: center;
- background: rgb(235, 238, 245);
- color: #303133;
- height: 70px;
- margin: 10px 0!important;
- padding: 15px 10px;
- position: relative;
- border-radius: 4px;
- box-sizing: border-box;
- font-size: 14px;
-}
-.value{
- font-size: 12px;
- opacity: .69;
- line-height: 20px;
- margin-top: 5px;
- display: block;
-}
+
</style>
--
Gitblit v1.9.3