CanadaMes.git - Gitblit

			@@ -8,13 +8,13 @@
			active-class="blue-button"
			>{{ $t("Alarm") }}</router-link
			>
			<router-link
			<!-- <router-link
			to="/Electrical/State"
			tag="el-button"
			type="text"
			active-class="blue-button"
			>{{ $t("State") }}</router-link
			>
			> -->
			<!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
			}}</router-link> -->
			<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
			@@ -24,14 +24,14 @@
			tag="el-button"
			type="text"
			active-class="blue-button"
			>{{ $t("Sign") }}</router-link
			>{{ $t("I/O") }}</router-link
			>
			<router-link
			to="/Electrical/Servomanual"
			tag="el-button"
			type="text"
			active-class="blue-button"
			>{{ $t("Parameter") }}</router-link
			>{{ $t("Manual/Automatic") }}</router-link
			>
			</el-breadcrumb>

			@@ -41,7 +41,7 @@
			tag="el-button"
			type="text"
			active-class="blue-button"
			>{{ $t("Automatic State") }}</router-link
			>{{ $t("Glass Data") }}</router-link
			>
			<!-- <router-link
			to="/Electrical/ManualJog"
			@@ -56,14 +56,14 @@
			tag="el-button"
			type="text"
			active-class="blue-button"
			>{{ $t("ManualonePosition") }}</router-link
			>{{ $t("Manual Control") }}</router-link
			>

			<router-link
			to="/Electrical/Servomanualone"
			tag="el-button"
			type="text"
			active-class="blue-button"
			active-class="blue-button" v-show="false"
			>{{ $t("Servomanualone") }}</router-link
			>
			<!-- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
			@@ -74,7 +74,7 @@
			tag="el-button"
			type="text"
			active-class="blue-button"
			>{{ $t("Address parameter settings") }}</router-link
			>{{ $t("Cage Positions") }}</router-link
			>
			<!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
			$t('Positioning2')
			@@ -96,7 +96,7 @@
			tag="el-button"
			type="text"
			active-class="blue-button"
			>{{ $t("InteractionState") }}</router-link
			>{{ $t("PLC-MES Info") }}</router-link
			>
			</el-breadcrumb>

			@@ -195,9 +195,9 @@
			'error-button':
			item.button.name === 'Fault' && item.button.value === 1,
			'error-button2':
			item.button.name === 'NotZero' && item.button.value === 0,
			item.button.name === 'Homing Failure' && item.button.value === 1,
			'error-button3':
			item.button.name === 'Zero' && item.button.value === 1,
			item.button.name === 'Homing Complete' && item.button.value === 0,
			fuwei:
			item.button.name === 'Reset' && item.button.value === 1,
			huiling:
			@@ -221,7 +221,7 @@
			item.button.name === 'Abort/ResumeTasks' &&
			item.button.value === 1,
			yihuiling:
			item.button.name === 'Zero' && item.button.value === 1,
			item.button.name === 'Homing Complete' && item.button.value === 1,
			}"
			@click="
			updateButtonValue(dataGroup, itemIndex);
			@@ -238,9 +238,9 @@
			'error-button':
			item.button.name === '故障' && item.button.value === 1,
			'error-button3':
			item.button.name === '已回零' && item.button.value === 1,
			item.button.name === '已回零' && item.button.value === 0,
			'error-button2':
			item.button.name === '未回零' && item.button.value === 0,
			item.button.name === '未回零' && item.button.value === 1,
			fuwei: item.button.name === '复位' && item.button.value === 1,
			huiling:
			item.button.name === '回零' && item.button.value === 1,
			@@ -298,6 +298,7 @@
			},

			activated() {
			document.body.style.zoom = "90%";
			this.initWebSocket();
			const language = this.$i18n.locale;
			// console.log(language);
			@@ -787,19 +788,36 @@
			}

			// 复位更新
			for (let i = 0; i < jsonData2.length; i++) {
			let arr = jsonData2[i];
			for (let j = 0; j < arr.length; j++) {
			let obj2 = arr[j];
			if (
			obj2.button &&
			(obj2.button.name === "复位" \|\| obj2.button.name === "Reset")
			) {
			obj2.button.value = obj.fuwei[0][i];
			// console.log(obj2.button.value)
			}
			}
			}
			// for (let i = 0; i < jsonData2.length; i++) {
			// let arr = jsonData2[i];
			// for (let j = 0; j < arr.length; j++) {
			// let obj2 = arr[j];
			// if (
			// obj2.button &&
			// (obj2.button.name === "复位" \|\| obj2.button.name === "Reset")
			// ) {
			// obj2.button.value = obj.fuwei[0][i];
			// // console.log(obj2.button.value)
			// }
			// }
			// }


			// for (let i = 0; i < jsonData2.length; i++) {
			// let arr = jsonData2[i];
			// for (let j = 0; j < arr.length; j++) {
			// let obj2 = arr[j];
			// if (
			// obj2.button &&
			// (obj2.button.name === "回零" \|\| obj2.button.name === "Home")
			// ) {
			// obj2.button.value = obj.huiling[0][i];
			// // console.log(obj2.button.value)
			// }
			// }
			// }



			//未回零更新

			@@ -815,8 +833,8 @@

			// console.log(jsonData2[5][4].button.value)
			if (
			jsonData2[2][3].button.value === 1 &&
			(jsonData2[2][3].button.name === "NotZero" \|\|
			jsonData2[2][3].button.value === 0 &&
			(jsonData2[2][3].button.name === "Homing Failure" \|\|
			jsonData2[2][3].button.name === "未回零")
			) {
			jsonData2[2][3].button.name = jsonData2[2][3].button.name.replace(
			@@ -824,13 +842,13 @@
			"已回零"
			);
			jsonData2[2][3].button.name = jsonData2[2][3].button.name.replace(
			"NotZero",
			"Zero"
			"Homing Failure",
			"Homing Complete"
			);
			}
			if (
			jsonData2[3][3].button.value === 1 &&
			(jsonData2[3][3].button.name === "NotZero" \|\|
			jsonData2[3][3].button.value === 0 &&
			(jsonData2[3][3].button.name === "Homing Failure" \|\|
			jsonData2[3][3].button.name === "未回零")
			) {
			jsonData2[3][3].button.name = jsonData2[3][3].button.name.replace(
			@@ -838,13 +856,13 @@
			"已回零"
			);
			jsonData2[3][3].button.name = jsonData2[3][3].button.name.replace(
			"NotZero",
			"Zero"
			"Homing Failure",
			"Homing Complete"
			);
			}
			if (
			jsonData2[4][4].button.value === 1 &&
			(jsonData2[4][4].button.name === "NotZero" \|\|
			jsonData2[4][4].button.value === 0 &&
			(jsonData2[4][4].button.name === "Homing Failure" \|\|
			jsonData2[4][4].button.name === "未回零")
			) {
			jsonData2[4][4].button.name = jsonData2[4][4].button.name.replace(
			@@ -852,13 +870,13 @@
			"已回零"
			);
			jsonData2[4][4].button.name = jsonData2[4][4].button.name.replace(
			"NotZero",
			"Zero"
			"Homing Failure",
			"Homing Complete"
			);
			}
			if (
			jsonData2[5][4].button.value === 1 &&
			(jsonData2[5][4].button.name === "NotZero" \|\|
			jsonData2[5][4].button.value === 0 &&
			(jsonData2[5][4].button.name === "Homing Failure" \|\|
			jsonData2[5][4].button.name === "未回零")
			) {
			jsonData2[5][4].button.name = jsonData2[5][4].button.name.replace(
			@@ -866,14 +884,14 @@
			"已回零"
			);
			jsonData2[5][4].button.name = jsonData2[5][4].button.name.replace(
			"NotZero",
			"Zero"
			"Homing Failure",
			"Homing Complete"
			);
			}

			if (
			jsonData2[2][3].button.value === 0 &&
			(jsonData2[2][3].button.name === "Zero" \|\|
			jsonData2[2][3].button.value === 1 &&
			(jsonData2[2][3].button.name === "Homing Complete" \|\|
			jsonData2[2][3].button.name === "已回零")
			) {
			jsonData2[2][3].button.name = jsonData2[2][3].button.name.replace(
			@@ -881,13 +899,13 @@
			"未回零"
			);
			jsonData2[2][3].button.name = jsonData2[2][3].button.name.replace(
			"Zero",
			"NotZero"
			"Homing Complete",
			"Homing Failure"
			);
			}
			if (
			jsonData2[3][3].button.value === 0 &&
			(jsonData2[3][3].button.name === "Zero" \|\|
			jsonData2[3][3].button.value === 1 &&
			(jsonData2[3][3].button.name === "Homing Complete" \|\|
			jsonData2[3][3].button.name === "已回零")
			) {
			jsonData2[3][3].button.name = jsonData2[3][3].button.name.replace(
			@@ -895,13 +913,13 @@
			"未回零"
			);
			jsonData2[3][3].button.name = jsonData2[3][3].button.name.replace(
			"Zero",
			"NotZero"
			"Homing Complete",
			"Homing Failure"
			);
			}
			if (
			jsonData2[4][4].button.value === 0 &&
			(jsonData2[4][4].button.name === "Zero" \|\|
			jsonData2[4][4].button.value === 1 &&
			(jsonData2[4][4].button.name === "Homing Complete" \|\|
			jsonData2[4][4].button.name === "已回零")
			) {
			jsonData2[4][4].button.name = jsonData2[4][4].button.name.replace(
			@@ -909,13 +927,13 @@
			"未回零"
			);
			jsonData2[4][4].button.name = jsonData2[4][4].button.name.replace(
			"Zero",
			"NotZero"
			"Homing Complete",
			"Homing Failure"
			);
			}
			if (
			jsonData2[5][4].button.value === 0 &&
			(jsonData2[5][4].button.name === "Zero" \|\|
			jsonData2[5][4].button.value === 1 &&
			(jsonData2[5][4].button.name === "Homing Complete" \|\|
			jsonData2[5][4].button.name === "已回零")
			) {
			jsonData2[5][4].button.name = jsonData2[5][4].button.name.replace(
			@@ -923,8 +941,8 @@
			"未回零"
			);
			jsonData2[5][4].button.name = jsonData2[5][4].button.name.replace(
			"Zero",
			"NotZero"
			"Homing Complete",
			"Homing Failure"
			);
			}
			}