From 1449f79f342919f5b65003312b113a8dad229692 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 十一月 2025 11:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Caching/cachingun.vue | 718 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 559 insertions(+), 159 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 7ed5e6a..a2ff07a 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -1,179 +1,562 @@
<script setup>
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive} from "vue";
import {useRouter} from "vue-router"
-const router = useRouter()
-
+import {host, WebSocketHost} from '@/utils/constants'
+import dayjs from 'dayjs';
import request from "@/utils/request"
-import { ref, onMounted } from "vue";
-// import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-// import LanguageMixin from './lang/LanguageMixin'
-
-const tableData = ref([])
-
-// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
-// const fetchTableData = async () => {
-// try {
-// // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
-// // const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
-// const response = await request.get("unLoadGlass/downStorage/selectStorageCage");
-
-// // 妫�鏌ュ搷搴旂姸鎬�
-// if (response.code === 200) {
-// // 鏇存柊琛ㄦ牸鏁版嵁
-// console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
-// tableData.splice(0, tableData.length, ...response.data);
-// } else {
-// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
-// ElMessage.error(response.msg);
-// }
-// } catch (error) {
-// // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
-// ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
-// }
-// };
-// onMounted(fetchTableData);
-
-
-
-request.get("unLoadGlass/downStorage/selectStorageCage").then((res) => {
- if (res.code == 200) {
- console.log(res.data);
- tableData.value = res.data
- } else {
- ElMessage.warning(res.msg)
-
- }
- });
-
-const dialogForm = () => {
- ElMessageBox.confirm(
- '鏄惁鎶ョ己?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- )
- .then(() => {
- // this.boxa = true
- // this.box = false
-
- })
+import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {useI18n} from 'vue-i18n'
+import { inject } from 'vue';
+const globalDate = inject('globalDate');
+const {t} = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+const tableDataa = ref([])
+const tableDatab = ref([])
+const tableDatad = ref([])
+const adjustedRects = ref([]);
+const selectValuesa = reactive([]);
+const timeRange = ref([])
+const tableDataAlert = ref([])
+const taskState = ref('')
+const taskType = ref('')
+const glassId = ref('')
+const alertText = ref('')
+const alertMessage = ref('')
+const alarmData = ref('')
+const showAlert = ref(false)
+const showModal = ref(false)
+const blindb = ref(false)
+let socket = null;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/cacheGlass/api/talk/cacheGlassTwo`;
+const handleMessage = (data) => {
+ // 鎶ヨ淇℃伅
+if (data.alarmInfo[0] != null && data.alarmInfo[0].length > 0) {
+ const alert = data.alarmInfo[0];
+ const { id, alarmMessage, ...rest } = alert[0];
+ alertMessage.value = `${alarmMessage}`;
+ alertMessage.value = `${alert[0].alarmMessage}`;
+ if (alert[0].alarmCode === 'sizeSame') {
+ alertText.value = t('hellow.sizeSame');
+ } else if (alert[0].alarmCode === 'idSame') {
+ alertText.value = t('hellow.idSame');
+ } else if (alert[0].alarmCode === 'slotLess') {
+ alertText.value = t('hellow.slotLess');
+ } else if (alert[0].alarmCode === 'overSize') {
+ alertText.value = t('hellow.overSize');
+ } else if (alert[0].alarmCode === 'noGlass') {
+ alertText.value = t('hellow.noGlass');
+ } else {
+ alertText.value = t('hellow.unknownAlert');
+ }
+ alarmData.value = data; // 瀛樺偍瀹屾暣鏁版嵁鐢ㄤ簬寮圭獥
+ showAlert.value = true;
}
-const open = () => {
- ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- )
- .then(() => {
- ElMessage({
- type: 'success',
- message: '鍒犻櫎鎴愬姛锛�',
- })
- })
- .catch(() => {
- ElMessage({
- type: 'info',
- message: '鍒犻櫎澶辫触',
- })
- })
+ const formattedData = data.alarmInfo[0].map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ alarmCode: record.alarmCode,
+ alarmMessage: record.alarmMessage
+ }));
+ tableDataAlert.value = formattedData;
+ const cageInfo = data.taskMessage[0];
+ if (cageInfo && cageInfo.createTime) {
+ cageInfo.formattedCreateTime = formatTimestamp(cageInfo.createTime);
+ }
+ if (cageInfo && cageInfo.updateTime) {
+ cageInfo.formattedupdateTime = formatTimestamp(cageInfo.updateTime);
+ }
+ tableDataa.value = data.EdgStorageCageinfos[0]
+ tableDatab.value = data.taskMessage
+ adjustedRects.value = data.EdgStorageCageinfos[0].map((rect, index) => ({
+ ...rect,
+ id: rect.id * 9,
+ showRect: !!data.EdgStorageCageinfos[0][index]?.details[0]
+ }));
+ };
+// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
+const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
+function parseAndSetTime() {
+ const backendTime = new Date(globalDate);
+ const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+ oneWeekAgo.setHours(0, 0, 0, 0);
+ timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
- break
+ onMounted(() => {
+ socket = initializeWebSocket(socketUrl, handleMessage);
+ parseAndSetTime();
+});
+// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindb.value = true;
+ iframeUrl.value = `${window.location.origin}/#/Caching/cachingunhistory`;
+};
+const sethistorical = async () => {
+ try {
+ const params = {
+ deviceId: 2,
+ startTime: (timeRange.value && timeRange.value[0]) || '',
+ endTime: (timeRange.value && timeRange.value[1]) || '',
+ glassId: glassId.value || '',
+ taskState: taskState.value,
+ taskType: taskType.value || ''
+ };
+ // 鏋勫缓鏌ヨ瀛楃涓�
+ const queryString = new URLSearchParams(params).toString();
+ const url = `/cacheGlass/edgStorageDeviceTaskHistory?${queryString}`;
+ const response = await request.get(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableDatad.value = response.data;
+ } else {
+ ElMessage.error(response.message);
}
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
+}
+catch (error) {
}
}
+// 鐮存崯
+ const handletake = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('workOrder.messagedamaged'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheGlass/edgStorageCageDetails/edgDetailsOperate", {
+ glassId: row.glassId,
+ state: 8,
+ line: 2,
+ workingProcedure: '鐞嗙墖绗�',
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ }
+};
+// 鎷胯蛋
+ const handleBindRack = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('workOrder.takemessage'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheGlass/edgStorageCageDetails/edgDetailsOperate", {
+ glassId: row.glassId,
+ state: 9,
+ line: 2,
+ workingProcedure: '鐞嗙墖绗�',
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ }
+};
+// 浠诲姟閲嶇疆
+const handleptask = async() => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.partasks'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/cacheGlass/edgStorageDeviceTask/resetTask?deviceId="+ 2;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ }
+};
+// 浠诲姟鎴愬姛澶勭悊
+const successfull = async() => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.psuccessfullyprocessed'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/cacheGlass/edgStorageDeviceTask/taskSuccess?deviceId="+ 2;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ }
+};
+ // 鍒犻櫎
+ const handledelete = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.deletemessage'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheGlass/edgStorageCageDetails/removeEdgDetails?glassId="+encodeURIComponent(row.glassId))
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ }
+};
+// 璀︽姤纭
+const handleSure = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('hellow.clickmakesure'),
+ t('productStock.prompt'),
+ {
+ confirmButtonText: t('productStock.yes'),
+ cancelButtonText: t('productStock.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post('/hollowGlass/productAlarmInfo/updateAlarmInfo', {
+ id: row.id
+ })
+ if (response.code === 200) {
+ showModal.value = false;
+ showAlert.value = false;
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },
- data: [
- {
- 'id': '1',
- 'long': '5',
- 'wide': '1005',
- 'thick': '183.6',
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
}
- ]
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+
+// 璀︽姤鍙屽嚮寮圭獥
+const handleDoubleClick = () => {
+ showModal.value = true;
+};
+const getAlertText = (alarmCode) => {
+ const codeMap = {
+ sizeSame: 'hellow.sizeSame',
+ idSame: 'hellow.idSame',
+ slotLess: 'hellow.slotLess',
+ overSize: 'hellow.overSize',
+ noGlass: 'hellow.noGlass'
+ };
+ return alarmCode in codeMap
+ ? t(codeMap[alarmCode])
+ : t('hellow.unknownAlert');
+};
+const rowClassName = ({ row }) => {
+ // 鏍规嵁 enableState 璁剧疆琛岀殑 CSS 绫�
+ return row.slot % 2 === 0 ? 'success-row' : '';
+};
+// 鏍峰紡閮ㄥ垎
+const styles = `
+ .success-row {
+ --el-table-tr-bg-color: var(--el-color-info-light-9);
+ }
+`;
+// 鍔ㄦ�佹坊鍔犳牱寮忓埌缁勪欢
+const styleElement = document.createElement('style');
+styleElement.textContent = styles;
+document.head.appendChild(styleElement);
-})
-
-
-
+const optionsa = [
+ {
+ value: 0,
+ label: t('hellow.starttask'),
+ },
+ {
+ value: 1,
+ label: t('searchOrder.endtask'),
+ }
+]
+const optionsb = [
+ {
+ value: 1,
+ label: t('sorter.advancetask'),
+ },
+ {
+ value: 2,
+ label: t('sorter.outputtasks'),
+ },
+ {
+ value: 3,
+ label: t('sorter.straighttasks'),
+ }
+]
+function getStatusTypea(taskType) {
+ switch (taskType) {
+ case 1:
+ return 'info';
+ case 2:
+ return 'success';
+ case 3:
+ return 'danger';
+ }
+}
+function getStatusTexta(taskType) {
+ switch (taskType) {
+ case 1:
+ return t('sorter.advancetask');
+ case 2:
+ return t('sorter.outputtasks');
+ case 3:
+ return t('sorter.straighttasks');
+ }
+}
+function getStatusTypeb(taskState) {
+ switch (taskState) {
+ case 0:
+ return 'info';
+ case 1:
+ return 'success';
+ }
+}
+function getStatusTextb(taskState) {
+ switch (taskState) {
+ case 0:
+ return t('hellow.starttask');
+ case 1:
+ return t('searchOrder.endtask');
+ }
+}
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+function formatTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+ const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+ const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+ onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+ });
+onBeforeUnmount(() => {
+ closeWebSocket();
+});
</script>
-
<template>
- <div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="240" ref="table"
+ <div style="height: 500px;">
+ <div v-if="showAlert" class="global-alert-bar" @dblclick="handleDoubleClick">
+ <div class="alert-content">
+ <el-icon><WarnTriangleFilled /></el-icon>
+ <span class="alert-text">
+ {{ alertText }} (id:{{ alertMessage }})
+ </span>
+ </div>
+ <button @click="showAlert = false" class="close-btn">脳</button>
+ </div>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;">
+ <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handlehistorical" type="primary">{{ $t('searchOrder.historicaltasks') }}</el-button>
+ <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handleptask()" type="warning">{{ $t('searchOrder.partask') }}</el-button>
+ <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="successfull()" type="success">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <div style="position: relative; width: 100%; height: 100%;"> <!-- 娣诲姞鐩稿瀹氫綅 -->
+ <div style="position: absolute; margin-top: 28px; left: 400px; display: flex; z-index: 10;"> <!-- 娣诲姞缁濆瀹氫綅 -->
+ <div>{{ $t('searchOrder.projectnumber') }}</div>
+ <div style="margin-left: 135px;">{{ $t('hellow.flowCardId') }}</div>
+ <div style="margin-left: 152px;">{{ $t('searchOrder.glassID') }}</div>
+ <div style="margin-left: 135px;">{{ $t('searchOrder.width') }}</div>
+ <div style="margin-left: 169px;">{{ $t('searchOrder.height') }}</div>
+ <div style="margin-left: 162px;">{{ $t('searchOrder.thickness') }}</div>
+ <div style="margin-left: 135px;">{{ $t('hellow.operate') }}</div>
+ </div>
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
+ <el-table
+ ref="table"
+ style="margin-top: 20px; height: 300px;"
+ :data="tableDataa"
+ :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
+ row-key="id"
+ >
+ <el-table-column prop="slot" align="center" :label="$t('sorter.gridnumber')" min-width="10" />
+ <el-table-column
+ align="center"
+ :label="$t('sorter.startstatus')"
+ min-width="10"
+ prop="enableState"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.enableState === 1 ? 'success' : 'warning'"
+ >
+ {{ scope.row.enableState === 1 ? $t('sorter.start') : $t('sorter.disable') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column>
+ <template #default="props">
+ <el-table
+ :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
+ :data="props.row.details" style="width: 100%;height: 70px;">
+ <el-table-column prop="engineerId" align="center" min-width="80" />
+ <el-table-column prop="flowCardId" align="center" min-width="80" />
+ <el-table-column prop="glassId" align="center" min-width="80" />
+ <el-table-column prop="width" align="center" min-width="80" />
+ <el-table-column prop="height" align="center" min-width="80" />
+ <el-table-column prop="thickness" align="center" min-width="80" />
+ <el-table-column fixed="right" align="center" width="150">
+ <template #default="scope">
+ <el-button type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
+ <el-button type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;margin-top: 15px;">
+ <el-table height="90" ref="table"
@selection-change="handleSelectionChange"
- :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" align="center" label="鐜荤拑ID" min-width="80" />
- <el-table-column prop="sequence" align="center" label="浣嶇疆" min-width="120" />
- <el-table-column prop="width" align="center" label="瀹�" min-width="120" />
- <el-table-column prop="height" align="center" label="闀�" min-width="120" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
- <template #default>
- <el-button size="mini" type="text" plain @click="dialogForm">鎶ョ己</el-button>
- </template>
- </el-table-column>
+ :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
+ <el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
+ <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
+ <el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
+ <el-table-column
+ align="center"
+ :label="$t('film.taskstatus')"
+ min-width="80"
+ prop="taskState"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusTypeb(scope.row.taskState)">
+ {{ getStatusTextb(scope.row.taskState) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ :label="$t('film.enabletype')"
+ min-width="80"
+ prop="taskType"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusTypea(scope.row.taskType)">
+ {{ getStatusTexta(scope.row.taskType) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="120" />
+ <el-table-column prop="formattedupdateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
</el-table>
</div>
</el-card>
-
+ <div class="awatch">
+ <img src="/woshihuancun.png" alt="" style="width: 50%;height: 100%;margin-left: 25%;margin-top: 5px;position: relative;">
+ <div style="position: relative; width: 500px;height: 95px;margin-top: -227px;margin-left: 615px;">
+ <div
+ v-for="(rect, index) in adjustedRects"
+ v-show="rect.showRect"
+ :key="rect"
+ :style="{ position: 'absolute',
+ top: `${rect.id}px`, left: `-85px`, width: `435px`, height: `3px`,
+ backgroundColor: '#409EFF'
+ }"
+ >
</div>
- <div id="awatch">
- <img src="../../assets/woshihuancun.png" alt="" style="width: 60%;height: 90%;margin-left: 260px;margin-top: 20px;">
-<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -124px;margin-left: 480px;"></div>
-<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -30px;margin-left: 850px;"></div>
-<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: 30px;margin-left: 695px;"></div>
</div>
+ </div>
+</div>
+<!-- 鍘嗗彶浠诲姟 -->
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="750px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
+ <!-- 鎶ヨ寮圭獥 -->
+ <el-dialog
+ v-model="showModal"
+ width="40%"
+ center
+ >
+ <el-table
+ ref="table"
+ border
+ :data="tableDataAlert"
+ max-height="calc(500px - 35px)"
+ style="width: 100%;"
+ >
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="100" />
+ <el-table-column
+ :label="$t('hellow.content')"
+ align="center"
+ min-width="220"
+ >
+ <template #default="scope">
+ <span>
+ {{ getAlertText(scope.row.alarmCode) }}
+ (id:{{ scope.row.alarmMessage }})
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
+ <template #default="scope">
+ <el-button type="text" plain
+ @click="handleSure(scope.row)">{{ $t('basicData.yes') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
</template>
-
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
@@ -189,8 +572,25 @@
background-color: #337ecc;
margin-left: 28%;
}
-#awatch{
- height: 460px;
- /* margin-top: -60px; */
+.awatch{
+ height: 350px;
+ width: 1500px;
+ max-width: 100%;
+ margin-left: 10%
}
-</style>
\ No newline at end of file
+.global-alert-bar {
+ position: fixed;
+ top: 0;
+ left: 50%; /* 姘村钩灞呬腑鍏抽敭 */
+ transform: translateX(-50%); /* 姘村钩灞呬腑鍏抽敭 */
+ padding: 12px 20px;
+ background-color: #dbdbd7;
+ box-shadow: 0 2px 10px rgba(0,0,0,0.2);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ z-index: 9999;
+ max-width: 80%; /* 闃叉灏忓睆骞曟孩鍑� */
+ min-width: 400px; /* 鏈�灏忓搴︿繚璇� */
+}
+</style>
--
Gitblit v1.8.0