From cd5280e6bf2b54d509452393d378994b49eaacab Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 22 七月 2024 10:24:36 +0800 Subject: [PATCH] 图标样式调整 --- src/views/system/monitor/recovery/index.vue | 2 +- src/views/system/work-order/distribute/index.vue | 14 +++++++------- src/views/system/monitor/video/index.vue | 2 +- src/views/system/monitor/face/index.vue | 2 +- src/views/system/monitor/car/index.vue | 2 +- src/views/system/monitor/platform/index.vue | 2 +- src/views/system/work-order/index.vue | 7 +++++-- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue index ae62114..57d44f6 100644 --- a/src/views/system/monitor/car/index.vue +++ b/src/views/system/monitor/car/index.vue @@ -403,7 +403,7 @@ display: flex; justify-content: center; align-items: center; - border-radius: 20px; + border-radius: 4px; width: 130px; height: 80px; margin-left: 5%; diff --git a/src/views/system/monitor/face/index.vue b/src/views/system/monitor/face/index.vue index 1e6aaf9..830997a 100644 --- a/src/views/system/monitor/face/index.vue +++ b/src/views/system/monitor/face/index.vue @@ -443,7 +443,7 @@ display: flex; justify-content: center; align-items: center; - border-radius: 20px; + border-radius: 4px; width: 130px; height: 80px; margin-left: 5%; diff --git a/src/views/system/monitor/platform/index.vue b/src/views/system/monitor/platform/index.vue index 6609341..8713bd0 100644 --- a/src/views/system/monitor/platform/index.vue +++ b/src/views/system/monitor/platform/index.vue @@ -366,7 +366,7 @@ display: flex; justify-content: center; align-items: center; - border-radius: 20px; + border-radius: 4px; width: 130px; height: 80px; margin-left: 5%; diff --git a/src/views/system/monitor/recovery/index.vue b/src/views/system/monitor/recovery/index.vue index 93d6d78..bc89104 100644 --- a/src/views/system/monitor/recovery/index.vue +++ b/src/views/system/monitor/recovery/index.vue @@ -374,7 +374,7 @@ display: flex; justify-content: center; align-items: center; - border-radius: 20px; + border-radius: 4px; width: 130px; height: 80px; margin-left: 5%; diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue index b90d25c..31640c3 100644 --- a/src/views/system/monitor/video/index.vue +++ b/src/views/system/monitor/video/index.vue @@ -443,7 +443,7 @@ display: flex; justify-content: center; align-items: center; - border-radius: 20px; + border-radius: 4px; width: 130px; height: 80px; margin-left: 5%; diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue index de61087..90f3c72 100644 --- a/src/views/system/work-order/distribute/index.vue +++ b/src/views/system/work-order/distribute/index.vue @@ -25,7 +25,7 @@ /> </el-form-item> <el-form-item label="涓嬪彂鐘舵��" prop="status"> - <el-select v-model="queryParams.status" placeholder="涓嬪彂鐘舵��" clearable> + <el-select v-model="queryParams.status" @change="page" placeholder="涓嬪彂鐘舵��" clearable> <el-option label="鏈笅鍙�" value="WAIT_DISTRIBUTE"/> <el-option label="宸蹭笅鍙�" value="DISTRIBUTED"/> </el-select> @@ -37,12 +37,12 @@ </el-row> <el-row> - <el-button size="small" type="info" @click="selectedDistribute" class="op">涓嬪彂閫変腑宸ュ崟</el-button> + <el-button size="mini" plain type="info" @click="selectedDistribute" class="op">涓嬪彂閫変腑宸ュ崟</el-button> <el-popconfirm @confirm="allDistribute" title="纭畾瑕佷笅鍙戞墍鏈夊伐鍗曞悧锛�" > - <el-button size="mini" type="primary" class="op" slot="reference">鍏ㄩ儴涓嬪彂</el-button> + <el-button size="mini" plain type="danger" class="op" slot="reference">鍏ㄩ儴涓嬪彂</el-button> </el-popconfirm> <el-popover @@ -78,15 +78,15 @@ </el-select> </el-form-item> <el-form-item label="鏁伴噺闄愬埗" prop="fastNumLimit"> - <el-input v-model="fastDistributeForm.fastNumLimit" size="mini" type="number" placeholder="姝ゆ宸ュ崟涓嬪彂鏈�澶ф暟閲�"></el-input> + <el-input v-model="fastDistributeForm.fastNumLimit" type="number" placeholder="姝ゆ宸ュ崟涓嬪彂鏈�澶ф暟閲�"></el-input> </el-form-item> <el-form-item> - <el-button type="primary" size="mini" @click="fastDistribute">绔嬪嵆涓嬪彂</el-button> + <el-button type="primary" size="small" @click="fastDistribute">绔嬪嵆涓嬪彂</el-button> </el-form-item> </el-form> - <el-button slot="reference" type="primary" size="mini">蹇嵎涓嬪彂</el-button> + <el-button slot="reference" type="primary" size="mini" plain>蹇嵎涓嬪彂</el-button> </el-popover> - <el-button size="small" type="success" @click="handleAdd">鎵嬪姩鏂板宸ュ崟</el-button> + <el-button size="mini" plain type="success" @click="handleAdd">鎵嬪姩鏂板宸ュ崟</el-button> <right-toolbar :showSearch.sync="showSearch" @queryTable="page"></right-toolbar> </el-row> </el-row> diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue index 7e250c5..27055d2 100644 --- a/src/views/system/work-order/index.vue +++ b/src/views/system/work-order/index.vue @@ -79,6 +79,8 @@ size="mini" type="text" @click="handleAuditing(item)" + v-hasPermi="['work:order:audit']" + v-show="item.status === 'YW_HANDLE'" >瀹℃牳</el-button> <el-button size="mini" @@ -158,8 +160,8 @@ </el-form-item> </el-form> </el-col> - <el-col :span="14" style="max-height: 500px; overflow-y: scroll"> - <el-timeline> + <el-col :span="14" style="max-height: 500px; overflow-y: auto"> + <el-timeline v-if="ywConditions && ywConditions.length > 0"> <el-timeline-item v-for="(condition, index) in ywConditions" :key="index" :timestamp="condition.commitUserName + '___' + condition.createTime" placement="top"> <el-card> <div v-html="condition.ywCondition"></div> @@ -167,6 +169,7 @@ </el-card> </el-timeline-item> </el-timeline> + <el-empty v-else description="娌℃湁澶勭悊璁板綍"></el-empty> </el-col> </el-row> -- Gitblit v1.8.0