From 30b9b4cecca83ad7eb75aa05d2b8ac86cc091d32 Mon Sep 17 00:00:00 2001
From: wangchenxing <877161328@qq.com>
Date: Thu, 18 Dec 2025 11:37:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config.js | 7 +--
main.js | 2 +-
pages/index.vue | 30 +++++++----
pages/indexpage/YJgoods/wzChuKu/wzChuKu.vue | 9 ++--
pages/indexpage/YJgoods/wzDiaoBo/wzDiaoBo.vue | 40 +++++++++++++-
.../indexpage/YJgoods/wzPanDian/wzPanDian.vue | 54 ++++++++++++++++++-
pages/indexpage/YJgoods/wzRuKu/wzRuKu.vue | 5 +-
.../sheBeiSheShi/myBaoXiu/myBaoXiu.vue | 4 +-
pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue | 2 +-
pages/indexpage/zdwxy/zdwxy.vue | 8 +++
pages/login.vue | 4 +-
pages/makePhoneCall/makePhoneCall.vue | 6 ++-
pages/mine/advice/advice.vue | 4 +-
13 files changed, 147 insertions(+), 28 deletions(-)
diff --git a/config.js b/config.js
index 550f405..b24f6d9 100644
--- a/config.js
+++ b/config.js
@@ -5,11 +5,12 @@ module.exports = {
// 36.112.48.53:88/emergency/api
// baseUrl: 'http://36.112.48.53:88/emergency/api',
- baseUrl: 'http://192.168.1.100:8080',
- // baseUrl: 'http://192.168.1.5:8083',
+ // baseUrl: 'http://192.168.1.5:8080',
+ baseUrl: 'http://localhost:8080',
//图片上传
- baseUrlImg: 'http://36.112.48.53:88/emergencyManage',
+ // baseUrlImg: 'http://36.112.48.53:88/emergencyManage',
+ baseUrlImg: 'http://localhost:8080',
// 应用信息
appInfo: {
diff --git a/main.js b/main.js
index 9540066..d48661a 100644
--- a/main.js
+++ b/main.js
@@ -8,7 +8,7 @@ import invite from './utils/invite'
import VConsole from 'vconsole';
// 初始化vConsole
-const vConsole = new VConsole();
+// const vConsole = new VConsole();
// 安装插件全局弹窗
Vue.use(invite)
Vue.use(plugins)
diff --git a/pages/index.vue b/pages/index.vue
index d5a0e5d..2f10ec4 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -79,14 +79,14 @@
-
+
-
-
+
@@ -262,6 +262,18 @@
this.getConfigKeyData();
},
methods: {
+ goback() {
+ // 强制调用浏览器回退（最通用的方式）
+ if (window.history.length > 1) { // 存在历史记录时返回
+ window.history.back();
+ } else { // 无历史记录时，尝试关闭当前窗口（适用于嵌入场景）
+ if (window.JSBridge && window.JSBridge.close) { // 调用原生关闭接口（如 App 的 WebView 关闭）
+ window.JSBridge.close();
+ } else { // 浏览器环境中，跳转至域名根目录（可能回到网站首页）
+ window.location.href = window.location.origin; // 跳转到域名根（如 http://your-domain.com）
+ }
+ }
+ },
// goback() {
// const pages = getCurrentPages(); // 获取页面栈
// console.log(pages); // 打印页面栈
@@ -291,9 +303,9 @@
// }
// }
// }
- goback() {
- window.location.href="/nljzVue/#/"
- },
+ // goback() {
+ // window.location.href="/nljzVue/#/"
+ // },
// // this.$router.go(-3)
// // window.history.back()
@@ -389,7 +401,7 @@
},
getConfigKeyData() {
getConfigKey('emergency_phone').then(res => {
- this.phoCall = res.msg;
+ this.phoCall = res.data;
});
},
// tabs点击切换
diff --git a/pages/indexpage/YJgoods/wzChuKu/wzChuKu.vue b/pages/indexpage/YJgoods/wzChuKu/wzChuKu.vue
index 9e85b14..50dcbdf 100644
--- a/pages/indexpage/YJgoods/wzChuKu/wzChuKu.vue
+++ b/pages/indexpage/YJgoods/wzChuKu/wzChuKu.vue
@@ -3,7 +3,7 @@
-
+
{{ changku }}
@@ -117,7 +117,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{{ changku }}
@@ -453,6 +453,9 @@ export default {
popCheBian() {
//弹出侧边栏
this.wuzhiCheBian = true;
+ listWarehouse().then(res => {
+ this.titlelist = res.rows;
+ });
},
offPop() {
//弹出侧边栏
diff --git a/pages/indexpage/sheBeiSheShi/myBaoXiu/myBaoXiu.vue b/pages/indexpage/sheBeiSheShi/myBaoXiu/myBaoXiu.vue
index 025d026..dd4d3a3 100644
--- a/pages/indexpage/sheBeiSheShi/myBaoXiu/myBaoXiu.vue
+++ b/pages/indexpage/sheBeiSheShi/myBaoXiu/myBaoXiu.vue
@@ -147,7 +147,7 @@ export default {
uploadFilePromise(url) {
return new Promise((resolve, reject) => {
let a = uni.uploadFile({
- url: `${config.baseUrlImg}/filemanage/upload1`, // 仅为示例，非真实的接口地址
+ url: `${config.baseUrlImg}/resource/oss/upload`, // 仅为示例，非真实的接口地址
filePath: url,
name: 'file',
header: {
@@ -162,7 +162,7 @@ export default {
let result = JSON.parse(res.data);
console.log('result', result);
setTimeout(() => {
- resolve(result.data.id);
+ resolve(result.data.url);
}, 1000);
}
});
diff --git a/pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue b/pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue
index 592f367..27e4bd2 100644
--- a/pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue
+++ b/pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue
@@ -39,7 +39,7 @@
+ :urls="item.facilitiesPicList" maxCount="1">
{{ item.facilitiesName }}
diff --git a/pages/indexpage/zdwxy/zdwxy.vue b/pages/indexpage/zdwxy/zdwxy.vue
index 3e51f6c..e986e9f 100644
--- a/pages/indexpage/zdwxy/zdwxy.vue
+++ b/pages/indexpage/zdwxy/zdwxy.vue
@@ -212,13 +212,16 @@ export default {
})
})
getDicts('source_ba_status').then(res => {
+ console.log("11111111111111")
let dataInfo = res.data
this.beianStatusList = dataInfo.map(item => {
+
return {
key: item.dictLabel,
value: item.dictValue
}
})
+ console.log("beianStatusList",beianStatusList)
})
},
setDict(stauts, list) {
@@ -240,6 +243,11 @@ export default {
this.baNum = res.data.baNum;
this.wbaNum = res.data.wbaNum;
this.tableData = res.data.sourceVoList;
+
+ // this.totalNum = 1;
+ // this.baNum = 2;
+ // this.wbaNum = 3;
+ // this.tableData = "";
// console.log(this.tableData, '重大危险源')
})
},
diff --git a/pages/login.vue b/pages/login.vue
index 8cedb9a..a57d7b0 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -188,8 +188,8 @@ export default {
},
// 密码登录
async pwdLogin(cas) {
- this.loginForm.cas = cas;
- // this.loginForm.cas = this.decodeDes(cas);
+ // this.loginForm.cas = cas;
+ this.loginForm.cas = this.decodeDes(cas);
this.$store
.dispatch('Login', this.loginForm)
.then(() => {
diff --git a/pages/makePhoneCall/makePhoneCall.vue b/pages/makePhoneCall/makePhoneCall.vue
index c986a17..c064cc4 100644
--- a/pages/makePhoneCall/makePhoneCall.vue
+++ b/pages/makePhoneCall/makePhoneCall.vue
@@ -1,12 +1,16 @@
+
+
+
+
{
let a = uni.uploadFile({
- url: `${config.baseUrlImg}/filemanage/upload1`, // 仅为示例，非真实的接口地址
+ url: `${config.baseUrlImg}/resource/oss/upload`, // 仅为示例，非真实的接口地址
filePath: url,
name: 'file',
header: {
@@ -140,7 +140,7 @@
let result = JSON.parse(res.data);
console.log('result', result);
setTimeout(() => {
- resolve(result.data.id);
+ resolve(result.data.url);
}, 1000);
}
});