admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-22 01:32:19 +08:00
parent d63670e96c
commit f276a4ecf5
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/index.js
View File

@ -51,7 +51,7 @@ export function emergencyRecordQueryById(params) {
// 处置台账信息详情
console.log(params);
return request.get({
url: "/xmgl/xzEmergencyRecord/queryById",
url: "xmgl/xzEmergencyRecord/queryById",
params
})
}
@ -60,7 +60,7 @@ export function emergencyTypeList(params) {
// 获取应急类型
console.log(params);
return request.get({
url: "/xmgl/xzEmergencyType/list",
url: "xmgl/xzEmergencyType/list",
params
})
}
@ -68,7 +68,7 @@ export function emergencyTypeList(params) {
export function emergencyRecordEdit(data) {
// 编辑一键报警
return request.post({
url: "/xmgl/xzEmergencyRecord/edit",
url: "xmgl/xzEmergencyRecord/edit",
data
})
}
@ -76,7 +76,7 @@ export function emergencyRecordEdit(data) {
export function emergencyRecordSendNotice(data) {
// 发送通知
return request.post({
url: "/xmgl/xzEmergencyRecord/sendNotice",
url: "xmgl/xzEmergencyRecord/sendNotice",
data
})
}

8
main.js
View File

@ -37,18 +37,18 @@ if (process.env.NODE_ENV === 'development') {
console.log('开发环境')
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
// Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
// Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
// Vue.prototype.url_config = 'http://139.9.66.234:5173/'
// Vue.prototype.url_config = 'http://192.168.34.125:6023/'

3
pages/personLocation/login/login.vue
View File

@ -42,7 +42,7 @@
</view>
<button @click.stop="saveServerData" type="primary" class="btn">保存</button>
</view>
</view> -->
</view>
</view>
</view>
</template>
@ -144,6 +144,7 @@
// 设备
uni.setStorageSync("loginType","device");
}
uni.setStorageSync("userInfo", JSON.stringify(result.result));
uni.setStorageSync("devInfoList", result.result);
uni.redirectTo({
url: '/pages/personLocation/index/index'

9
pages/projectEnd/emergencyDisposal/ImmediateRescue.vue
View File

@ -368,9 +368,10 @@
// this.form.taskId = option.taskId
// this.form.itemId = option.itemId
console.log(dateformat(new Date()), 777888)
this.getEmergencyRecordQueryById();
},
onShow() {
this.getEmergencyRecordQueryById();
},
methods: {
//获取记录
@ -412,6 +413,7 @@
videoFileList: [],
addedDescription: "",
});
console.log(this.rescueList,888999)
},
// 删除
deleteRescue(index) {
@ -916,6 +918,8 @@
url: that.url_config + 'image/' + JSON.parse(uploadFileRes
.data).data[0].imageUrl
};
console.log(rowIndex,777888)
console.log(that.rescueList,777888)
that.rescueList[rowIndex].imgFileList.push(data)
uni.getImageInfo({
src: tempFilePaths[0],
@ -1025,8 +1029,9 @@
//上传视频
uploadVideo(eIndex) {
var that = this;
uni.chooseVideo({
count: 5 - that.videoFileList.length,
count: 1,
sourceType: ['camera', 'album'],
compressed: false,
success: function(res) {

1
pages/videoManage/playBackVideo.vue
View File

@ -58,6 +58,7 @@
that.url = res.result.url
if(that.url.indexOf("10.168.1.100") != -1){
that.url = that.url.replace("10.168.1.100", "42.180.188.17")
console.log(that.url,888999)
}
}
})

2
pages/videoManage/playVideo.vue
View File

@ -56,7 +56,7 @@
},
computed: {
playUrlFilter(){
return this.url?'rtsp://42.180.188.17:'+this.url.substring(20):""
return this.url?'rtsp://42.180.188.17'+this.url.substring(20):""
}
},
methods:{