From a1963a3e935910c9a7ef13d051711a618bddd013 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 18:50:05 +0800
Subject: [PATCH] 考核指标详情权限控制
---
src/views/system/check/result/detail/detail.vue | 3 ++-
src/views/system/work-order/threshold/index.vue | 17 ++++++++---------
vue.config.js | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/views/system/check/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue
index 67b6417..bbc321e 100644
--- a/src/views/system/check/result/detail/detail.vue
+++ b/src/views/system/check/result/detail/detail.vue
@@ -37,6 +37,7 @@
type="text"
icon="el-icon-edit"
@click="handleRuleUpdate(item)"
+ v-hasPermi="['check:template:edit']"
>淇敼
</el-button>
</div>
@@ -182,7 +183,7 @@
width="180px"
>
<template slot-scope="scope">
- <span>{{ scope.row[item.ruleIndex] }}</span>
+ <span>{{ scope.row[item.ruleIndex] * 100 + '%' }}</span>
</template>
</el-table-column>
</template>
diff --git a/src/views/system/work-order/threshold/index.vue b/src/views/system/work-order/threshold/index.vue
index 4287d0f..412791e 100644
--- a/src/views/system/work-order/threshold/index.vue
+++ b/src/views/system/work-order/threshold/index.vue
@@ -13,8 +13,8 @@
<!-- </el-button>-->
<!-- </el-col>-->
<!-- </el-row>-->
- <el-row>
- <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <div style="display: flex;overflow-x: auto;" >
+ <div>
<el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">瑙嗛</div>
@@ -102,8 +102,8 @@
</div>
</div>
</el-card>
- </el-col>
- <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ </div>
+ <div>
<el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">浜鸿劯</div>
@@ -191,9 +191,9 @@
</div>
</div>
</div>
- </el-card></el-col
+ </el-card></div
>
- <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+ <div>
<el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">杞﹁締</div>
@@ -280,9 +280,8 @@
</div>
</div>
</div>
- </el-card></el-col
- >
- </el-row>
+ </el-card></div>
+ </div>
</div>
</template>
diff --git a/vue.config.js b/vue.config.js
index 7d934eb..bdb9ec3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,14 +35,14 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://localhost:8080`,
+ target: `http://localhost:8085`,
// 浠樼珛楹�
// target: `http://192.168.3.64:8080`,
// 榫氱剷鑼�
- target: `http://192.168.137.227:8080`,
-
+ // target: `http://192.168.137.227:8080`,
+
// 鍚戝煿
// target: `http://192.168.3.88:8085`,
changeOrigin: true,
--
Gitblit v1.8.0