From dcf9c9e0410fe1186239e3f8d6f7bdc789c08010 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 05 六月 2024 18:00:39 +0800
Subject: [PATCH] 1
---
src/views/mdc/add-station-status.vue | 96 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 11 deletions(-)
diff --git a/src/views/mdc/add-station-status.vue b/src/views/mdc/add-station-status.vue
index 7134425..1897390 100644
--- a/src/views/mdc/add-station-status.vue
+++ b/src/views/mdc/add-station-status.vue
@@ -1,5 +1,13 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :width="570" destroy-on-close @closed="$emit('closed')">
+ <div v-if="isShow">鍘嗗彶鍙嶉</div>
+ <el-row v-if="isShow" class="history-feedback">
+ <el-col :span="24"><span>寮�濮嬪弽棣堟椂闂�</span><span>{{latestData.feedbackTime}}</span></el-col>
+ <el-col :span="24"><span>鐘舵��</span><span>{{latestData.wcsDesc}}</span></el-col>
+ <el-col :span="24"><span>鎻忚堪</span><span>{{latestData.feedbackDesc}}</span></el-col>
+ <el-col :span="24"><span>鐘舵�佹寔缁椂闂�</span><span>{{latestData.diffTime}}</span></el-col>
+ </el-row>
+ <div v-if="isShow" class="modal-title">鏈�鏂板弽棣�</div>
<el-form :model="addDictForm" :rules="addDictRules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
<el-row>
<el-col :span="24">
@@ -8,13 +16,13 @@
</el-date-picker>
</el-form-item>
</el-col>
- <!-- <el-col :span="24">
+ <el-col :span="24">
<el-form-item label="鐘舵��" prop="wcs">
<el-select v-model="addDictForm.wcs" style="width: 100%">
<el-option v-for="item in feedBackStatusList" :key="item.code" :label="item.name" :value="item.code"/>
</el-select>
</el-form-item>
- </el-col> -->
+ </el-col>
<el-col :span="24">
<el-form-item label="鎻忚堪">
<el-input v-model="addDictForm.description" placeholder="鎻忚堪" clearable></el-input>
@@ -24,7 +32,7 @@
</el-form>
<template #footer>
<el-button @click="visible=false" >鍙� 娑�</el-button>
- <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="dictSubmit()">淇� 瀛�</el-button>
+ <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="dictSubmit">鎻愪氦鍙嶉</el-button>
</template>
</el-dialog>
</template>
@@ -32,21 +40,30 @@
<script>
export default {
emits: ['success', 'closed'],
+ props: ['workstationId'],
data() {
return {
+ feedBackStatusList: [],
+ latestData: {
+ latestData: "",
+ wcsDesc: "",
+ feedbackDesc: "",
+ diffTime: ""
+ },
+ isShow: false,
value1: true,
mode: "add",
titleMap: {
add: '鐘舵�佸弽棣�',
- edit: '淇敼',
- show: '鏌ョ湅'
+ edit: '鐘舵�佸弽棣�',
+ show: '鐘舵�佸弽棣�'
},
visible: false,
isSaveing: false,
//琛ㄥ崟鏁版嵁
addDictForm: {
description: "",
- date: "",
+ date: [],
endTime: "",
startTime: "",
wcs: ""
@@ -61,6 +78,25 @@
},
methods: {
+ sumTime(startTime,endTime) {
+ // 灏嗗瓧绗︿覆杞崲涓篋ate瀵硅薄
+ var startDate = new Date(startTime);
+ var endDate = new Date(endTime);
+
+ // 璁＄畻鏃堕棿宸紙姣锛�
+ var timeDiff = endDate - startDate;
+
+ // 灏嗘椂闂村樊杞崲涓哄ぉ鏁般�佸皬鏃舵暟銆佸垎閽熸暟鍜岀鏁�
+ var diffDays = Math.floor(timeDiff / (1000 * 60 * 60 * 24)); // 澶�
+ timeDiff %= 1000 * 60 * 60 * 24; // 鍓╀綑姣鏁�
+ var diffHours = Math.floor(timeDiff / (1000 * 60 * 60)); // 灏忔椂
+ timeDiff %= 1000 * 60 * 60; // 鍓╀綑姣鏁�
+ var diffMinutes = Math.floor(timeDiff / (1000 * 60)); // 鍒嗛挓
+ timeDiff %= 1000 * 60; // 鍓╀綑姣鏁�
+ var diffSeconds = Math.floor(timeDiff / 1000); // 绉�
+ var d = diffDays == 0?"":diffDays + "澶�";
+ return d + diffHours + "灏忔椂 " + diffMinutes + "鍒嗛挓 " + diffSeconds + "绉�"
+ },
dateChange(val) {
this.addDictForm.startTime = val[0];
this.addDictForm.endTime = val[1];
@@ -71,10 +107,21 @@
this.visible = true;
return this
},
+ getfeedBackStatusList() {
+ this.$HTTP.get("/api/blade-cps/global_wcs/wcs-achievements").then(res=> {
+ if(res.code == 200) {
+ res.data.forEach(item=> {
+ if(item.type == "4") {
+ this.feedBackStatusList.push(item);
+ }
+ })
+ }
+ })
+ },
//琛ㄥ崟鎻愪氦鏂规硶
dictSubmit(){
var obj = Object.assign({},this.addDictForm);
- obj.workstationIds = [this.workstationId]
+ obj.workstationIds = [this.workstationId];
var that = this;
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
@@ -113,13 +160,40 @@
})
},
//琛ㄥ崟娉ㄥ叆鏁版嵁
- setData(data){
- //鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
- //Object.assign(this.addDictForm, data);
+ setData(lastLevelId){
+ this.getfeedBackStatusList(); //鑾峰彇鐘舵�乴ist
+ this.$HTTP.get(`/api/blade-cps/workstation-wcs-feedback/latest?workstationId=${lastLevelId}`).then(res=> {
+ if(res.code == 200) {
+ if(res.data == null) {
+ this.isShow = false;
+ }else {
+ res.data.diffTime = this.sumTime(res.data.startTime,res.data.endTime);
+ this.latestData = res.data;
+ this.isShow = true;
+ }
+ }
+ })
}
}
}
</script>
-<style>
+<style scoped>
+.history-feedback {
+ background: #f5f5f5;
+ padding: 12px 0;
+ padding-bottom: 24px;
+ margin: 16px 0 24px 0;
+}
+.history-feedback .el-col.el-col-24 {
+ margin: 24px 0 0px 40px;
+ font-size: 14px;
+}
+.history-feedback .el-col.el-col-24 span:nth-child(1) {
+ display: inline-block;
+ min-width: 100px;
+}
+.modal-title {
+ margin-bottom: 20px;
+}
</style>
--
Gitblit v1.9.3