From 3465af48ba22f25a2d1bda53b0fbc2707e643f6e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 10 四月 2024 15:49:18 +0800
Subject: [PATCH] 修改josn文件位置（路径问题导致打包后找不到josn文件）
---
Albania_Mes-ui/src/views/home/index.vue | 73 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 94f15c1..d6c887c 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -346,14 +346,14 @@
</div>
<div style="display: flex;align-items: center;overflow: hidden;">
<div class="blocks" style="position: relative;width: 100%;">
- <div class="blocks-img" :style="'z-index:999;left:150px;top:'+carposition+'px;'">
+ <div class="blocks-img" :style="'z-index:999;left:150px;top:' + carposition + 'px;'">
</div>
<div
:style="'position: absolute;z-index:99;left:271px;top:987px;width:210px;height:38px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
- :style="'position: absolute;z-index:1000;left:553px;top:'+(400+carposition)+'px;width:110px;height:88px;background-color:' + ShowDeviceList(0) + ';'">
+ :style="'position: absolute;z-index:1000;left:553px;top:' + (400 + carposition) + 'px;width:110px;height:88px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
:style="'position: absolute;z-index:99;left:800px;top:450px;width:115px;height:30px;background-color:' + ShowDeviceList(0) + ';'">
@@ -480,20 +480,25 @@
<el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState"
style="z-index: 999;">{{ $t('Manual matching') }}</el-button>
<el-button type="primary" @click="ManualTake()" :disabled="SoftEmergencyStopState"
- style="z-index: 999;">{{ $t('Manual removal') }}</el-button>
+ style="z-index: 999;">{{
+ $t('Manual removal') }}</el-button>
<el-button type="primary" @click="AnewMeasure()" :disabled="SoftEmergencyStopState"
- style="z-index: 999;">{{ $t('Remeasure') }}</el-button>
+ style="z-index: 999;">{{
+ $t('Remeasure') }}</el-button>
</div>
<br>
<!--鏄剧ず-->
<div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;float: left;">
<!--鐜荤拑鍥� #81b337-->
- <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((720-(this.LastQueue.glassheight / 25 * 7))/2)+'px auto;width:'
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
- + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
- + (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
- + (this.LastQueue.state>0?'#4CCCE4':(this.LastQueue.state==0?'#E4CA4C':'#E4CA4C'))+';text-align: center;'">
- {{ (this.LastQueue.glasswidth+this.LastQueue.glassheight)!=0?(this.LastQueue.glasswidth+"*"+this.LastQueue.glassheight):"" }}
+ <div
+ :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:' + ((720 - (this.LastQueue.glassheight / 25 * 7)) / 2) + 'px auto;width:'
+ + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
+ + (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
+ + (this.LastQueue.state > 0 ? '#4CCCE4' : (this.LastQueue.state == 0 ? '#E4CA4C' : '#E4CA4C')) + ';text-align: center;'">
+ {{
+ (this.LastQueue.glasswidth + this.LastQueue.glassheight) != 0 ? (this.LastQueue.glasswidth + "*" + this.LastQueue.glassheight) : ""
+ }}
</div>
</div>
@@ -501,17 +506,23 @@
<div style="width:20px;height: 720px;float: left;"></div>
<div style="width:500px;height: 620px;border: 2px solid #d1d1d1;float: left;padding: 50px 50px;">
<!--鐜荤拑鍥� #81b337-->
- <span class="measuretitle">{{ $t('Width') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Width') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.glasswidth
+ }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Height') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Height') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Thickness') }}锛�</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
+
+ <span class="measuretitle">{{ $t('Measure Width') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Measure Width') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">{{ $t('Measure Height') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Measure Height') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Matching results') }}锛�</span> <span class="measureValue">{{ this.LastQueue.state>0?$t('Matching successful'):(this.LastQueue.state==0?$t('Multiple data matching'):$t('Matching failed')) }}</span>
+ <span class="measuretitle">{{ $t('Matching results') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.state > 0 ? $t('Matching successful') :
+ (this.LastQueue.state == 0 ? $t('Multiple data matching'):$t('Matching failed')) }}</span>
<br>
</div>
</div>
@@ -660,7 +671,7 @@
name: "Home",
data() {
return {
- carposition:0,
+ carposition: 0,
selected: [],
options: [{
value: '1',
@@ -809,7 +820,7 @@
socket.onmessage = function (msg) {
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
- if(obj.carposition != null){
+ if (obj.carposition != null) {
this.carposition = obj.carposition[0];
}
// 鑾峰彇璁惧鐘舵��
@@ -823,11 +834,23 @@
this.cagelist4 = obj.cagelist4[0];
this.tasklist2 = obj.StoragTaskeTaskFeed[0];
this.tasklist1 = obj.StoragTaskeTaskOut[0];
- this.alarm = obj.alarmmg[0];
+ if (obj.alarmmg[0].length > 0) {
+ if (this.alarm.length > 0) {
+ if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
+ this.alarm = obj.alarmmg[0];
+ this.dialogFormVisible2 = true;
+ }
+ } else {
+ this.alarm = obj.alarmmg[0];
+ this.dialogFormVisible2 = true;
+ }
+ } else {
+ this.alarm = obj.alarmmg[0];
+ this.dialogFormVisible2 = false;
+ }
this.tableData1 = obj.OrderTask[0];
this.LastQueue = obj.LastQueue[0];
-
//鏄惁鍏佽鍑虹墖
this.isAllowQueue = obj.isAllowQueue[0];
@@ -911,7 +934,7 @@
StorageCageAddGlass(this.cell, this.StorageCageAddInfo[index]).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
- this.StorageCageAdd=false;
+ this.StorageCageAdd = false;
}
})
} else {
@@ -959,7 +982,7 @@
UpdateStroageCageByCell(cell, nownum, num) {
if (nownum == null && num == 1) {
this.StorageCageAdd = true;
- this.Measuermode=true;
+ this.Measuermode = true;
this.cell = cell;
} else {
if (nownum + num == 0) {
@@ -1047,7 +1070,7 @@
//浜哄伐鍖归厤
ManualMatching() {
this.StorageCageAdd = true;
- this.Measuermode=false;
+ this.Measuermode = false;
},
//浜哄伐鎷胯蛋
ManualTake() {
@@ -1098,7 +1121,7 @@
},
importData() {
//let tbdata=JSON.stringify(this.dataList);
- let tbdata=this.dataList;
+ let tbdata = this.dataList;
console.log(tbdata);
importData(tbdata).then(res => {
if (res.data.message == 200) {
--
Gitblit v1.8.0