From 8261c004cc4a8351b42c34438a2b4b62c065d991 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 16 六月 2024 15:08:42 +0800
Subject: [PATCH] update
---
src/views/console/workstation/index.vue | 16 ++++++++++------
src/views/mdc/configComp/Status.vue | 5 ++++-
src/views/mdc/components/Shift.vue | 4 ++--
src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue | 4 ++--
src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue | 4 ++--
src/views/mdc/efficiency-analysis.vue | 8 ++++++--
6 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue b/src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue
index 89eef03..46dc55a 100644
--- a/src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue
+++ b/src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-08 21:29:53
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-12 13:43:21
+ * @LastEditTime: 2024-06-16 14:48:03
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue
-->
<template>
@@ -61,7 +61,7 @@
</el-table-column>
</scTable>
</el-main>
- <el-drawer v-model="drawer" title="鐗╂枡绫诲瀷">
+ <el-drawer v-model="drawer" :title="form.id ? '缂栬緫' : '鏂板'">
<el-form :model="form" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
<el-row>
<el-col :span="24">
diff --git a/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue b/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
index 8744660..4d433aa 100644
--- a/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
+++ b/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-08 21:29:53
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-09 21:12:56
+ * @LastEditTime: 2024-06-16 14:41:35
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
-->
<template>
@@ -136,7 +136,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="棰濆畾搴撳瓨" prop="lowerLimit">
- <el-input-number v-model="form.upperLimit" :precision="2" :step="0.01" :max="10" />
+ <el-input-number v-model="form.lowerLimit" :precision="2" :step="0.01" :max="10" />
</el-form-item>
</el-col>
<el-col :span="24">
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 1cb9149..d6efba6 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -26,12 +26,12 @@
<div class="right-panel">
<div class="right-panel-search">
<span>绫诲瀷</span>
- <el-select v-model="type" style="width: 240px">
+ <el-select v-model="type" style="width: 240px" clearable>
<el-option v-for="item in types" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
<span>鐘舵��</span>
- <el-select v-model="statu" style="width: 240px">
+ <el-select v-model="statu" style="width: 240px" clearable>
<el-option v-for="item in status" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
@@ -137,14 +137,17 @@
</el-header>
<el-main>
<el-table :data="list" height="200px">
- <el-table-column label="閲囬泦鍙橀噺鍚嶇О" prop="name" />
- <el-table-column label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem">
+ <el-table-column label="閲囬泦鍙橀噺鍚嶇О" prop="name"
+ width="120" />
+ <el-table-column label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem"
+ width="120">
<template #default="scope">
<el-input :disabled="!editFlag"
v-model="scope.row.dataItem"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏁版嵁鏍囩" prop="description">
+ <el-table-column label="鏁版嵁鏍囩" prop="description"
+ width="150">
<template #default="scope">
<el-select :disabled="!editFlag"
v-model="scope.row.description">
@@ -157,7 +160,8 @@
<!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
</template>
</el-table-column>
- <el-table-column label="鏁版嵁绫诲埆" prop="wcsDataType">
+ <el-table-column label="鏁版嵁绫诲埆" prop="wcsDataType"
+ width="150">
<template #default="scope">
<el-select disabled
v-model="scope.row.wcsDataType">
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index 692a0eb..ed721e5 100644
--- a/src/views/mdc/components/Shift.vue
+++ b/src/views/mdc/components/Shift.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-06-04 21:40:52
+ * @LastEditTime: 2024-06-16 14:58:00
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -32,7 +32,7 @@
</el-table-column>
<el-table-column prop="" :label="colname">
<template #default="scope">
- <span>{{ scope.row.data['1'] }}</span>
+ <span>{{ (scope.row.data['1'] ? scope.row.data['1'] * 100 : 0).toFixed(2) }}%</span>
</template>
</el-table-column>
<el-table-column prop="" label="鐝2">
diff --git a/src/views/mdc/configComp/Status.vue b/src/views/mdc/configComp/Status.vue
index 8fe0650..bacfb27 100644
--- a/src/views/mdc/configComp/Status.vue
+++ b/src/views/mdc/configComp/Status.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-17 18:53:45
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-18 19:42:24
+ * @LastEditTime: 2024-06-16 14:35:07
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configComp/Status.vue
-->
<template>
@@ -207,6 +207,9 @@
if (!row.code || !row.color || !row.name) {
return this.$message.warning('鐘舵�佸悕绉般�佺紪鍙枫�侀鑹插繀濉�'); (`鎿嶄綔鎴愬姛`)
}
+ if (isNaN(row.code) || row.code < 1 || row.code > 99) {
+ return this.$message.warning('缂栧彿鑼冨洿涓�1锝�99');
+ }
let data = {
code: row.code,
color: row.color,
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index 3e23ecc..8fcd468 100644
--- a/src/views/mdc/efficiency-analysis.vue
+++ b/src/views/mdc/efficiency-analysis.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-20 21:04:56
+ * @LastEditTime: 2024-06-16 15:06:31
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -92,7 +92,11 @@
top: '80px'
},
tooltip: {
- trigger: 'axis'
+ trigger: 'axis',
+ valueFormatter: (params) => {
+ console.log(params, '>>>>>>>>.113213')
+ return params.toFixed(2) + '%'
+ }
},
xAxis: {
type: 'category',
--
Gitblit v1.9.3