From a6aaad96f92dbf9c6ae2c81072509981cc97e6d7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 03 12月 2025 11:38:45 +0800
Subject: [PATCH] 消警处理
---
yiqi_pda/config/modules/ajax.js | 2 +-
yiqi_pda/manifest.json | 2 +-
yiqi_pda/api/home/index.js | 2 +-
yiqi_pda/api/api.js | 2 +-
yiqi_pda/pages/home/modules/warnItem.vue | 3 ++-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/yiqi_pda/api/api.js b/yiqi_pda/api/api.js
index bd42100..c5dd9f4 100644
--- a/yiqi_pda/api/api.js
+++ b/yiqi_pda/api/api.js
@@ -1,7 +1,7 @@
// 鍚屾椂鍙戦�佸紓姝ヨ姹傜殑娆℃暟锛岄槻姝竴娆＄偣鍑绘湁澶氭璇锋眰
let ajaxTime = 0;
export const baseUrl = 'http://localhost:7788'
-//export const baseUrl = 'http://10.135.75.70:7788' //鐢熶骇鐢�
+//export const baseUrl = 'http://10.135.75.70:7788' //鐢熶骇鐢紙姝ｅ紡PDA鐢級
//export const baseUrl = 'http://192.168.216.203:7788' //娴嬭瘯鐢�
// 鍏叡鐨剅equest鏂规硶
diff --git a/yiqi_pda/api/home/index.js b/yiqi_pda/api/home/index.js
index afa23ce..b3975dd 100644
--- a/yiqi_pda/api/home/index.js
+++ b/yiqi_pda/api/home/index.js
@@ -12,7 +12,7 @@
//鍏抽棴璁惧鎶ヨ淇℃伅
export function closeEquipmentAlert(data) {
return request({
- url: '/api/UpdateAlertStatus',
+ url: '/api/pdaservice/UpdateAlertStatus',
method: 'post',
data
})
diff --git a/yiqi_pda/config/modules/ajax.js b/yiqi_pda/config/modules/ajax.js
index 93463f7..27408e1 100644
--- a/yiqi_pda/config/modules/ajax.js
+++ b/yiqi_pda/config/modules/ajax.js
@@ -1,7 +1,7 @@
export default {
errMsg:'缃戠粶閿欒锛�',
host:{ //鎺ュ彛璋冪敤鐨勫煙鍚嶈缃�
- //'default':'http://10.135.75.70:7788',//鐢熶骇鐢�
+ //'default':'http://10.135.75.70:7788',//鐢熶骇鐢紙姝ｅ紡PDA鐢級
//'default':'http://192.168.216.203:7788', //鐢熶骇鐜鍦板潃
'default':'http://localhost:7788',
'mock':'http://localhost:3012'
diff --git a/yiqi_pda/manifest.json b/yiqi_pda/manifest.json
index 85884fc..0be8814 100644
--- a/yiqi_pda/manifest.json
+++ b/yiqi_pda/manifest.json
@@ -2,7 +2,7 @@
"name" : "杩炴潌绾挎暟閲�",
"appid" : "__UNI__F24DEB0",
"description" : "涓�姹借繛鏉�",
- "versionName" : "2.0.22",
+ "versionName" : "2.0.23",
"versionCode" : 6,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/yiqi_pda/pages/home/modules/warnItem.vue b/yiqi_pda/pages/home/modules/warnItem.vue
index cd1dcad..589c060 100644
--- a/yiqi_pda/pages/home/modules/warnItem.vue
+++ b/yiqi_pda/pages/home/modules/warnItem.vue
@@ -34,7 +34,7 @@
</view>
<view class="right_button">
<!-- <u-button type="warning" class="right_button_item" @click="closeWarning" :disabled="!item[warnArr[alertType - 0].prop]">鍏抽棴</u-button> -->
- <!-- <u-button type="warning" class="right_button_item" @click="closeWarning">鍏抽棴</u-button> -->
+ <u-button type="warning" class="right_button_item" @click="closeWarning">鍏抽棴</u-button>
</view>
</view>
</view>
@@ -84,6 +84,7 @@
//鍏抽棴鎶ヨ
closeWarning() {
const param = {
+ v_get_equipment_alert_id:this.item.id,//澧炲姞id浼犲�� 銆怑ditby shaocx,2025-12-03銆�
equipmentId: this.item.equipmentId,
alertType: this.alertType
}
--
Gitblit v1.9.3