From f1fbe8049ba01186f033037e6ae36d51915c7418 Mon Sep 17 00:00:00 2001
From: guonan <guonan201020@163.com>
Date: 星期二, 20 五月 2025 15:09:59 +0800
Subject: [PATCH] 调用求解器
---
src/components/tools/Message.vue | 94 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/src/components/tools/Message.vue b/src/components/tools/Message.vue
index 43fad94..5fa5261 100644
--- a/src/components/tools/Message.vue
+++ b/src/components/tools/Message.vue
@@ -5,17 +5,27 @@
<div class="message-context">
<div v-for="(item, key) in messageList" :key="key" class="message-item">
<div class="message-name">{{ item.name }}</div>
- <div class="message-value" v-if="!(item.name.includes('闆ㄩ噺璁″垪琛�'))">
+ <div class="message-value" v-if="!item.name.includes('闆ㄩ噺璁″垪琛�')">
{{ item.value }}
</div>
- <div v-if="item.name.includes('闆ㄩ噺璁″垪琛�')" @click="openDialog"
- style="color: #5bc0de; cursor: pointer;">
+ <div
+ v-if="item.name.includes('闆ㄩ噺璁″垪琛�')"
+ @click="openDialog"
+ style="color: #5bc0de; cursor: pointer"
+ >
鏌ョ湅闆ㄩ噺璁″垪琛�
</div>
</div>
</div>
- <el-dialog title="闆ㄩ噺璁¤鎯�" v-model="dialogVisible" :width="'60%'" :before-close="handleClose"
- style="background-color: rgb(5,75,69);">
+
+ <!-- 闆ㄩ噺璁″脊绐� -->
+ <el-dialog
+ title="闆ㄩ噺璁¤鎯�"
+ v-model="dialogVisible"
+ width="60%"
+ :before-close="handleClose"
+ style="background-color: rgb(5, 75, 69)"
+ >
<div class="table-container">
<el-table :data="gaugesData" border stripe height="100%">
<el-table-column prop="name" label="鍚嶇О"></el-table-column>
@@ -24,11 +34,6 @@
<el-table-column prop="r" label="鍗婂緞(r)"></el-table-column>
</el-table>
</div>
- <!-- <template #footer>
- <span class="dialog-footer">
- <el-button @click="dialogVisible = false">鍏� 闂�</el-button>
- </span>
- </template> -->
</el-dialog>
</div>
</template>
@@ -54,12 +59,11 @@
function openDialog() {
if (gaugesData.value.length > 0) {
dialogVisible.value = true;
- }else {
+ } else {
ElMessage({
message: "鏈壘鍒伴洦閲忚鏁版嵁锛�",
type: "warning",
});
- return; // 闃绘鍚庣画閫昏緫鎵ц
}
}
@@ -79,10 +83,25 @@
}
const formattedData = [];
- const areaType = newMesData.areaType !== undefined ? newMesData.areaType : null;
+ const areaType =
+ newMesData.areaType !== undefined ? newMesData.areaType : null;
+
+ // 鑾峰彇褰撳墠鐨� type 鍊�
+ const currentType = newMesData.type;
for (const [key, value] of Object.entries(newMesData)) {
- if (["geom", "id", "serviceName", "updateTime", "updateUser", "createUser", "bak"].includes(key)) continue;
+ if (
+ [
+ "geom",
+ "id",
+ "serviceName",
+ "updateTime",
+ "updateUser",
+ "createUser",
+ "bak",
+ ].includes(key)
+ )
+ continue;
if (key === "createTime" && typeof value === "number") {
formattedData.push({ name: "鍒涘缓鏃堕棿锛�", value: formatDate(value) });
@@ -96,7 +115,10 @@
2: "閲嶇偣鍖哄煙浠跨湡",
3: "閲嶇偣娌熶豢鐪�",
};
- formattedData.push({ name: "鍖哄煙绫诲埆锛�", value: areaTypeMap[value] || "鏈煡" });
+ formattedData.push({
+ name: "鍖哄煙绫诲埆锛�",
+ value: areaTypeMap[value] || "鏈煡",
+ });
continue;
}
@@ -108,14 +130,20 @@
10: "瀹屾垚",
20: "鍑洪敊",
};
- formattedData.push({ name: "浠跨湡鐘舵�侊細", value: statusMap[value] || "鏈煡" });
+ formattedData.push({
+ name: "浠跨湡鐘舵�侊細",
+ value: statusMap[value] || "鏈煡",
+ });
continue;
}
if (key === "type") {
if (![1, 2].includes(areaType)) {
const typeMap = { 1: "棰勬祴妯℃嫙", 2: "瀹炴椂妯℃嫙", 3: "鍘嗗彶妯℃嫙" };
- formattedData.push({ name: "妯℃嫙绫诲埆锛�", value: typeMap[value] || "鏈煡" });
+ formattedData.push({
+ name: "妯℃嫙绫诲埆锛�",
+ value: typeMap[value] || "鏈煡",
+ });
}
continue;
}
@@ -138,11 +166,14 @@
if (key === "data" && typeof value === "string") {
try {
const parsedData = JSON.parse(value);
- console.log('Parsed Data:', parsedData);
+
// 澶勭悊 data 涓殑鍚勪釜瀛楁
const addField = (fieldKey, label) => {
if (parsedData[fieldKey] !== undefined) {
- formattedData.push({ name: `${label}锛歚, value: parsedData[fieldKey] || "鏃�" });
+ formattedData.push({
+ name: `${label}锛歚,
+ value: parsedData[fieldKey] || "鏃�",
+ });
}
};
@@ -153,8 +184,12 @@
addField("model", "闄嶉洦妯″紡");
addField("history", "鍘嗗彶闄嶉洦");
- // 澶勭悊闆ㄩ噺璁℃暟鎹�
- if (parsedData.gauges && Array.isArray(parsedData.gauges)) {
+ // 鍒ゆ柇 type 鏄惁涓� 2锛屽喅瀹氭槸鍚︽坊鍔犻洦閲忚淇℃伅
+ if (
+ currentType == 2 &&
+ parsedData.gauges &&
+ Array.isArray(parsedData.gauges)
+ ) {
gaugesData.value = parsedData.gauges.map((gauge) => ({
name: gauge.name || "鏈煡",
x: gauge.x != null ? gauge.x.toFixed(2) : "-",
@@ -162,8 +197,11 @@
r: gauge.r || "-",
}));
- const gaugeNames = gaugesData.value.map(g => g.name).join(", ");
- formattedData.push({ name: "闆ㄩ噺璁″垪琛細", value: gaugeNames || "鏃�" });
+ const gaugeNames = gaugesData.value.map((g) => g.name).join(", ");
+ formattedData.push({
+ name: "闆ㄩ噺璁″垪琛細",
+ value: gaugeNames || "鏃�",
+ });
}
} catch (e) {
formattedData.push({ name: "鏁版嵁锛�", value: value || "鏃�" });
@@ -175,8 +213,6 @@
}
messageList.value = formattedData;
- console.log(messageList.value, 'wwwwwwwwwwwwwwwwwwwwwwwwwwwwww');
-
},
{ immediate: true }
);
@@ -264,8 +300,8 @@
max-width: 200px;
}
.table-container {
- max-height: 500px; // 鎺у埗鏈�澶ч珮搴︼紝瓒呰繃鍒欏嚭鐜版粴鍔ㄦ潯
- overflow-y: auto; // 鍨傜洿婊氬姩
+ max-height: 500px;
+ overflow-y: auto;
padding: 10px;
border-radius: 4px;
}
@@ -274,7 +310,7 @@
padding-top: 10px;
padding-bottom: 10px;
}
-/deep/.el-dialog__title{
+/deep/.el-dialog__title {
color: #fff !important;
}
.table-container .el-table {
@@ -282,4 +318,4 @@
border-radius: 4px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3