From a575c81a1265bf45652cd0ae93e554e94823ec20 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 31 五月 2024 14:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/system/menu/OperaMenuWindow.vue | 4 ++++
admin/src/components/business/OperaCarUseBookWindow.vue | 40 +++++++++++++++++++++++++---------------
admin/vue.config.js | 7 ++++---
admin/src/views/system/menu.vue | 1 +
admin/src/store/index.js | 4 ++--
5 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 146c5de..894234c 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -88,7 +88,7 @@
<div class="company">
{{ item.memberName }}
<div style="display: inline" v-if="item.statusInfo!=null && item.statusInfo!=''">
- <span class="status-green">{{item.statusInfo ||''}}</span>锛�
+ 锛�<span class="status-green">{{item.statusInfo ||''}}</span>锛�
</div>
</div>
</div>
@@ -98,10 +98,10 @@
{{ item.checkInfo || '' }}
</div>
<div v-if="item.approveType == 1 " class="childList">
- <div style="display: inline" v-for="item1 in item.approveList" :key="item1.id">
+ <div class="m_content" v-for="item1 in item.approveList" :key="item1.id">
<img v-if="item1.faceImg!=null && item1.faceImg !=''" :src="item1.faceImg" class="avatar" alt="" />
<img v-if="item1.faceImg ==null ||item1.faceImg ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
- <span style="display: inline-block"> {{item1.memberName}}</span>
+ <span > {{item1.memberName}}</span>
</div>
</div>
</div>
@@ -440,8 +440,27 @@
position: absolute;
border-left: 2px dashed #cccccc;
left: 31px;
- height: calc(100% - 24px);
- top: 34px;
+ height: calc(100% - 36px);
+ top: 49px;
+ }
+ .avatar {
+ width: 40px;
+ height: 40px;
+ border-radius: 50%;
+ margin: 0 12px 0 16px;
+ //border: 1px solid;
+ }
+ .childList{
+ display: flex;
+ flex-wrap: wrap;
+ margin-left: 100px;
+ }
+ .m_content{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 4px;
}
.info {
display: flex;
@@ -475,13 +494,6 @@
color:gray;
font-size: 24px;
}
- .avatar {
- width: 40px;
- height: 40px;
- border-radius: 50%;
- margin: 0 12px 0 16px;
- //border: 1px solid;
- }
.content {
flex: 1;
.line {
@@ -514,9 +526,7 @@
color: #666666;
margin-left: 120px;
}
- .childList {
- margin-left: 120px;
- }
+
}
}
}
diff --git a/admin/src/components/system/menu/OperaMenuWindow.vue b/admin/src/components/system/menu/OperaMenuWindow.vue
index 872bde2..a367642 100644
--- a/admin/src/components/system/menu/OperaMenuWindow.vue
+++ b/admin/src/components/system/menu/OperaMenuWindow.vue
@@ -17,6 +17,9 @@
<el-form-item label="璁块棶璺緞" prop="path">
<el-input v-model="form.path" placeholder="璇疯緭鍏ヨ闂矾寰�" v-trim maxlength="200"/>
</el-form-item>
+ <el-form-item label="鎼哄甫鍙傛暟" prop="params">
+ <el-input v-model="form.params" placeholder="璇疯緭鍏ユ惡甯﹀弬鏁�" v-trim maxlength="200"/>
+ </el-form-item>
<el-form-item label="鍥炬爣" prop="icon" class="form-item-icon">
<el-radio-group v-model="form.icon">
<el-radio :label="icon" v-for="icon in icons" :key="icon">
@@ -52,6 +55,7 @@
id: null,
parentId: null,
name: '',
+ params:'',
path: '',
icon: '',
remark: ''
diff --git a/admin/src/store/index.js b/admin/src/store/index.js
index 0782641..c97ca53 100644
--- a/admin/src/store/index.js
+++ b/admin/src/store/index.js
@@ -54,7 +54,7 @@
pushtags(state,val){
//濡傛灉绛変簬-1璇存槑tabs涓嶅瓨鍦ㄩ偅涔堟彃鍏ワ紝鍚﹀垯浠�涔堥兘涓嶅仛
//findindex鎵捐鏍囷紝寰幆鍒ゆ柇涓�涓嬶紝濡傛灉绛変簬閭ｄ箞灏变唬琛ㄦ湁鐩稿悓鐨勶紝灏变笉蹇呮坊鍔狅紝濡傛灉鎵句笉鍒伴偅灏辨槸-1.灏辨坊鍔�
- let result = state.tags.findIndex(item => item.label === val.label)
+ let result = state.tags.findIndex(item => item.index === val.index)
if (result === -1) {
state.tags.push({...val, keepAlive: false})
} else {
@@ -65,7 +65,7 @@
//鍏抽棴鏍囩
closeTab(state, val) {
//鍚屼笂锛屾壘瑙掓爣锛岀劧鍚庣敤瑙掓爣鐨勪綅缃搴斿垹闄や竴浣嶃�俿plice锛氳繖鏄暟缁勭殑鍒犻櫎鏂规硶
- let result = state.tags.findIndex(item => item.label === val.label)
+ let result = state.tags.findIndex(item => item.index === val.index)
state.tags.splice(result, 1)
},
//鍏抽棴鎵�鏈塼agsview鏍囩
diff --git a/admin/src/views/system/menu.vue b/admin/src/views/system/menu.vue
index 2e98085..27b05ad 100644
--- a/admin/src/views/system/menu.vue
+++ b/admin/src/views/system/menu.vue
@@ -27,6 +27,7 @@
</template>
</el-table-column>
<el-table-column prop="path" label="璁块棶璺緞" min-width="140px"></el-table-column>
+ <el-table-column prop="params" label="鍙傛暟" min-width="120px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="120px"></el-table-column>
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
diff --git a/admin/vue.config.js b/admin/vue.config.js
index b120104..c429385 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -12,15 +12,16 @@
lintOnSave: false,
devServer: {
host: '0.0.0.0',
- port: 10012
- /* proxy: {
+ port: 10012,
+ proxy: {
[process.env.VUE_APP_API_PREFIX]: {
target: process.env.VUE_APP_API_URL,
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
}
- } */
+ }
+ }
},
configureWebpack: {
resolve: {
--
Gitblit v1.9.3