From 2f86865700923e0907d821fe5598bc72f29b3a54 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 20 三月 2024 16:56:17 +0800
Subject: [PATCH] 1.看板调整
---
src/views/kanbanManager/ckgl.vue | 21 +++++++++++++++++----
vue.config.js | 2 +-
src/styles/global.css | 4 ++--
src/views/qualityManager/processCheck.vue | 2 +-
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/styles/global.css b/src/styles/global.css
index aab4c4a..37c98ec 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -3,8 +3,8 @@
height: 100%;
margin: 0;
padding: 0;
- min-width: 1200px;
- overflow-y: hidden;
+ /*min-width: 1200px;*/
+ /*overflow-y: hidden;*/
/*overflow-x: hidden;*/
-moz-osx-font-smoothing: grayscale;
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 0483999..94717a0 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -200,7 +200,7 @@
<el-table-column
prop="specification"
label="瑙勬牸鍨嬪彿"
- width="300"
+ width="150"
>
<template slot-scope="{row}">
<div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
@@ -237,6 +237,19 @@
<div v-else>/</div>
</template>
</el-table-column>
+
+ <el-table-column
+ prop=""
+ label="寤舵湡澶╂暟"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="parseFloat(row.warning)<0" style="color:red;">{{ row.warning }}</div>
+ <div v-else-if="parseFloat(row.warning)>=0">{{ row.warning }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
</el-table>
</div>
</div>
@@ -284,7 +297,7 @@
label="搴撳瓨閲�"
>
<template slot-scope="{row}">
- <div v-if="row.FCUUQty">{{ row.FCUUQty }}</div>
+ <div v-if="row.FBUQty">{{ row.FBUQty }}</div>
<div v-else>0</div>
</template>
</el-table-column>
@@ -541,7 +554,7 @@
},
headerCellStyleCenter() {
return {
- backgroundColor: 'transparent ',
+ backgroundColor: 'transparent',
padding: '10px 0',
textAlign: 'center',
color: '#07acc2',
@@ -553,7 +566,7 @@
return {
padding: '7px 0',
textAlign: 'center',
- backgroundColor: 'transparent ',
+ backgroundColor: 'transparent',
color: '#c7e7ff',
border: 'none',
fontSize: '18px'
diff --git a/src/views/qualityManager/processCheck.vue b/src/views/qualityManager/processCheck.vue
index 860bacd..dbe4e3a 100644
--- a/src/views/qualityManager/processCheck.vue
+++ b/src/views/qualityManager/processCheck.vue
@@ -424,7 +424,7 @@
standvalue: j.standvalue,
lowervalue: j.lowervalue,
uppervalue: j.uppervalue,
-
+ stepcheckitem_seq: j.stepcheckitem_seq,
unit: j.unit,
stepcheckitem_desc: j.stepcheckitem_desc,
required: j.required, // 鏄惁蹇呭～
diff --git a/vue.config.js b/vue.config.js
index eb8073e..319f097 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,7 +53,7 @@
proxy: {
[process.env.VUE_APP_BASE_API]: {
target: 'http://192.168.1.190:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- // target: 'http://122.227.18.22:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
+ // target: 'http://122.227.20.130:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3