From 4fd91af18aa9e265ca26e1945433ee8bbc9ef336 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 23 Jun 2021 11:03:53 +0800
Subject: [PATCH] 聊天功能完善
---
xcxjingqingmap_lxdh/js/lxdhmap.js | 6 +-
pages/alarm_list/alarm_list.vue | 4 +-
store/vueMain.js | 4 +-
pages/myself/myself.vue | 2
pages/equipment/equipment.vue | 4 +-
pages/groupChat/groupChat.vue | 2
pages/groupChat/chatingcopy.vue | 2
xcxjingqingmap_clock_sign_in/js/vueMain.js | 2
pages/poput/workbench/policeDetails/policeDetails.vue | 6 +-
pages/riskReporting/riskReporting.vue | 2
components/contacts/contacts.vue | 2
components/pColumn/pColumn.vue | 2
manifest.json | 2
pages/article/article.vue | 2
xcxjingqingmap_patrol/js/vueMain.js | 2
pages/groupChat/chating.vue | 4 +-
pages/article/article_detail.vue | 2
pages/reported/reported.vue | 4 +-
pages/visitRecord/visitRecord.vue | 2
xcxMapJQ/js/vueMain.js | 4 +-
pages/workbench/workbench.vue | 4 +-
21 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/components/contacts/contacts.vue b/components/contacts/contacts.vue
index 7a93d3d..3640575 100644
--- a/components/contacts/contacts.vue
+++ b/components/contacts/contacts.vue
@@ -32,7 +32,7 @@
//#endif
},
receives() {
- var url = this.$store.state.piAPI + "blade-jfpts/alarm/alarm/APP-setAlarm",
+ var url = this.$store.state.piAPI + "/alarm/alarm/APP-setAlarm",
Pid = this.Pdata.id,
id = this.$store.state.puserID, //警察id
name = this.$store.state.puserName, //警察id
diff --git a/components/pColumn/pColumn.vue b/components/pColumn/pColumn.vue
index 8dc30de..a10ff47 100644
--- a/components/pColumn/pColumn.vue
+++ b/components/pColumn/pColumn.vue
@@ -48,7 +48,7 @@
//#endif
},
receives() {
- var url = this.$store.state.piAPI + "blade-jfpts/alarm/alarm/APP-setAlarm",
+ var url = this.$store.state.piAPI + "/alarm/alarm/APP-setAlarm",
Pid = this.Pdata.id,
id = this.$store.state.puserID, //警察id
name = this.$store.state.puserName, //警察id
diff --git a/manifest.json b/manifest.json
index 1448d7b..aed7ceb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "jfpt",
- "appid" : "__UNI__88EDF2B",
+ "appid" : "__UNI__1A57486",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/pages/alarm_list/alarm_list.vue b/pages/alarm_list/alarm_list.vue
index 40ac425..a7683c3 100644
--- a/pages/alarm_list/alarm_list.vue
+++ b/pages/alarm_list/alarm_list.vue
@@ -43,7 +43,7 @@
data(){
return{
// pathUrl:"http://localhost:89",
- pathUrl:"http://s16s652780.51mypc.cn/api/blade-jfpts",
+ pathUrl:"http://s16s652780.51mypc.cn/api",
totalColor:"#51A2FE",
loadColor:"#000000",
loadBeforeColor:"#000000",
@@ -175,7 +175,7 @@
},
//接收任务
receives() {
- var url = this.$store.state.piAPI + "blade-jfpts/alarm/alarm/APP-setAlarm",
+ var url = this.$store.state.piAPI + "/alarm/alarm/APP-setAlarm",
Pid = this.itemData.id,
id = this.$store.state.puserID, //警察id
name = this.$store.state.puserName, //警察id
diff --git a/pages/article/article.vue b/pages/article/article.vue
index 7540918..7e90d1d 100644
--- a/pages/article/article.vue
+++ b/pages/article/article.vue
@@ -31,7 +31,7 @@
data(){
return {
// pathUrl:"http://localhost:89/",
- pathUrl:"http://s16s652780.51mypc.cn/api/blade-jfpts",
+ pathUrl:"http://s16s652780.51mypc.cn/api",
page:1,
pagesize:10,
// loadStatus:'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
diff --git a/pages/article/article_detail.vue b/pages/article/article_detail.vue
index 69dd036..c4301f5 100644
--- a/pages/article/article_detail.vue
+++ b/pages/article/article_detail.vue
@@ -32,7 +32,7 @@
content:"",
article:{},
video:false,
- pathUrl:"http://s16s652780.51mypc.cn/api/blade-jfpts",
+ pathUrl:"http://s16s652780.51mypc.cn/api",
}
},
onLoad(event) {
diff --git a/pages/equipment/equipment.vue b/pages/equipment/equipment.vue
index f96e5a2..b88dacf 100644
--- a/pages/equipment/equipment.vue
+++ b/pages/equipment/equipment.vue
@@ -184,7 +184,7 @@
+"&ownerId="+this.ownerId;
uni.request({
// url: 'http://localhost:89/equipment/equipment/AppSubmit?'+params,
- url: that.pathUrl + '/blade-jfpts/equipment/equipment/AppSubmit?'+params,
+ url: that.pathUrl + '/equipment/equipment/AppSubmit?'+params,
method:'POST',
success: (res) => {
if(res.data.code==200){
@@ -272,7 +272,7 @@
// 循环调用uni.uploadFile ，因微信小程序只支持单文件上传
for (var i = 0; i < tempFilePath.length; i++) {
uni.uploadFile({
- // url: 'https://web.byisf.com/api/blade-jfpts/depl/put-depl', //仅为示例，非真实的接口地址
+ // url: 'https://web.byisf.com/api/depl/put-depl', //仅为示例，非真实的接口地址
url: 'http://web.byisf.com:82/blade-jfpts/depl/put-depl',
filePath: tempFilePath[i],
name: 'file',
diff --git a/pages/groupChat/chating.vue b/pages/groupChat/chating.vue
index ba56471..efb6324 100644
--- a/pages/groupChat/chating.vue
+++ b/pages/groupChat/chating.vue
@@ -209,7 +209,7 @@
var that = this;
that.senId = WxStorage.get("ids");
uni.request({
- url:"http://s16s652780.51mypc.cn/api/blade-jfpts/chat-records/getSingleMessagePage",
+ url:"http://s16s652780.51mypc.cn/api/chat-records/getSingleMessagePage",
method:"get",
data:{
senderId: that.senId,
@@ -328,7 +328,7 @@
}
uni.request({
- url:"http://s16s652780.51mypc.cn/api/blade-jfpts/chat-records/insertSingleChat",
+ url:"http://s16s652780.51mypc.cn/api/chat-records/insertSingleChat",
method:"post",
data:{
senderId: that.senId,
diff --git a/pages/groupChat/chatingcopy.vue b/pages/groupChat/chatingcopy.vue
index 6a62ef4..96ed765 100644
--- a/pages/groupChat/chatingcopy.vue
+++ b/pages/groupChat/chatingcopy.vue
@@ -206,7 +206,7 @@
var that = this;
uni.request({
- url:"http://s16s652780.51mypc.cn/api/blade-jfpts/chat-records/getSingleMessagePage",
+ url:"http://s16s652780.51mypc.cn/api/chat-records/getSingleMessagePage",
method:"get",
data:{
senderId: WxStorage.get("ids"),
diff --git a/pages/groupChat/groupChat.vue b/pages/groupChat/groupChat.vue
index e6af889..0d8b0f2 100644
--- a/pages/groupChat/groupChat.vue
+++ b/pages/groupChat/groupChat.vue
@@ -74,7 +74,7 @@
this.fromW = need;
var that = this;
uni.request({
- url:"http://s16s652780.51mypc.cn/api/blade-jfpts/chat-records/getChatListPage",
+ url:"http://s16s652780.51mypc.cn/api/chat-records/getChatListPage",
method:"get",
data:{
senderId: WxStorage.get("ids")
diff --git a/pages/myself/myself.vue b/pages/myself/myself.vue
index 0d3e992..5f65ced 100644
--- a/pages/myself/myself.vue
+++ b/pages/myself/myself.vue
@@ -221,7 +221,7 @@
})
// 文件上传
uni.uploadFile({
- // url: 'https://web.byisf.com/api/blade-jfpts/depl/put-depl', //仅为示例，非真实的接口地址
+ // url: 'https://web.byisf.com/api/depl/put-depl', //仅为示例，非真实的接口地址
url: 'http://web.byisf.com:82/blade-jfpts/depl/put-depl',
filePath: tempFilePath[0],
name: 'file',
diff --git a/pages/poput/workbench/policeDetails/policeDetails.vue b/pages/poput/workbench/policeDetails/policeDetails.vue
index 126e74c..35cc482 100644
--- a/pages/poput/workbench/policeDetails/policeDetails.vue
+++ b/pages/poput/workbench/policeDetails/policeDetails.vue
@@ -73,7 +73,7 @@
mask: true
})
wx.request({
- url: 'http://s16s652780.51mypc.cn/api/blade-jfpts/feedback/feedback/saves', //仅为示例，并非真实接口地址。
+ url: 'http://s16s652780.51mypc.cn/api/feedback/feedback/saves', //仅为示例，并非真实接口地址。
data: dataList,
method: 'POST',
header: {
@@ -115,7 +115,7 @@
// 循环调用uni.uploadFile ，因微信小程序只支持单文件上传
for (var i = 0; i < tempFilePath.length; i++) {
wx.uploadFile({
- // url: 'https://web.byisf.com/api/blade-jfpts/depl/put-depl', //仅为示例，非真实的接口地址
+ // url: 'https://web.byisf.com/api/depl/put-depl', //仅为示例，非真实的接口地址
url: 'http://web.byisf.com:82/blade-jfpts/depl/put-depl',
filePath: tempFilePath[i],
name: 'file',
@@ -165,7 +165,7 @@
mask: true
})
wx.uploadFile({
- // url: 'https://web.byisf.com/api/blade-jfpts/depl/put-depl', //仅为示例，非真实的接口地址
+ // url: 'https://web.byisf.com/api/depl/put-depl', //仅为示例，非真实的接口地址
url: 'http://web.byisf.com:82/blade-jfpts/depl/put-depl',
filePath: tempFilePath,
name: 'file',
diff --git a/pages/reported/reported.vue b/pages/reported/reported.vue
index a36fefa..344f851 100644
--- a/pages/reported/reported.vue
+++ b/pages/reported/reported.vue
@@ -140,7 +140,7 @@
// 循环调用uni.uploadFile ，因微信小程序只支持单文件上传
for (var i = 0; i < tempFilePath.length; i++) {
uni.uploadFile({
- // url: 'https://web.byisf.com/api/blade-jfpts/depl/put-depl', //仅为示例，非真实的接口地址
+ // url: 'https://web.byisf.com/api/depl/put-depl', //仅为示例，非真实的接口地址
url: 'http://web.byisf.com:82/blade-jfpts/depl/put-depl',
filePath: tempFilePath[i],
name: 'file',
@@ -182,7 +182,7 @@
mask: true
})
uni.uploadFile({
- // url: 'https://web.byisf.com/api/blade-jfpts/depl/put-depl',
+ // url: 'https://web.byisf.com/api/depl/put-depl',
url: 'http://web.byisf.com:82/blade-jfpts/depl/put-depl',
filePath: tempFilePath,
name: 'file',
diff --git a/pages/riskReporting/riskReporting.vue b/pages/riskReporting/riskReporting.vue
index e76cbe9..233e9c7 100644
--- a/pages/riskReporting/riskReporting.vue
+++ b/pages/riskReporting/riskReporting.vue
@@ -127,7 +127,7 @@
//提交修改
confirm(){
uni.request({
- url: this.pathUrl + '/blade-jfpts/riskReporting/save',
+ url: this.pathUrl + '/riskReporting/save',
method:'POST',
data:{
"riskTime":this.riskTime,
diff --git a/pages/visitRecord/visitRecord.vue b/pages/visitRecord/visitRecord.vue
index 6d0bb29..ca4e95f 100644
--- a/pages/visitRecord/visitRecord.vue
+++ b/pages/visitRecord/visitRecord.vue
@@ -160,7 +160,7 @@
//提交修改
confirm(){
uni.request({
- url: this.pathUrl + '/blade-jfpts/visitrecord/visitrecord/save',
+ url: this.pathUrl + '/visitrecord/visitrecord/save',
method:'POST',
data:{
// "visitrecord":
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 98e5ece..a1b5e47 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -95,8 +95,8 @@
},
getdataList(need) {
this.fromW = need;
- var url = need == "1" ? this.$store.state.piAPI + "blade-jfpts/alarm/alarm/APP-getAlarm" : need == "0" ?
- this.$store.state.piAPI + "blade-jfpts/alarm/alarm/APP-getAlarming" : '',
+ var url = need == "1" ? this.$store.state.piAPI + "/alarm/alarm/APP-getAlarm" : need == "0" ?
+ this.$store.state.piAPI + "/alarm/alarm/APP-getAlarming" : '',
id = this.$store.state.puserID,
data = need == "1" ? {
securityArr: id
diff --git a/store/vueMain.js b/store/vueMain.js
index 24bb749..33fed49 100644
--- a/store/vueMain.js
+++ b/store/vueMain.js
@@ -17,7 +17,7 @@
methods: {
getDataList() {
var that = this;
- // var url = 'https://web.byisf.com/api/blade-jfpts/equipment/equipment/listAll';
+ // var url = 'https://web.byisf.com/api/equipment/equipment/listAll';
// axios.get(url).then((res) => {
// that.getdata = res.data.data;
that.beginCome();
@@ -57,7 +57,7 @@
var that = this,
center = [data[0].wd, data[0].jd],
datas = { id: data[0].id },
- url = `/api/blade-jfpts/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
+ url = `/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
// axios({
// url: url,
// // data:datas,
diff --git a/xcxMapJQ/js/vueMain.js b/xcxMapJQ/js/vueMain.js
index 8accecb..354c1f8 100644
--- a/xcxMapJQ/js/vueMain.js
+++ b/xcxMapJQ/js/vueMain.js
@@ -60,7 +60,7 @@
beginMap(map, data) {
var that = this,
center = [data[0].wd, data[0].jd],
- url = `http://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
+ url = `http://s16s652780.51mypc.cn/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
// url = `http://localhost:89/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
this.nowPosition = center;
axios.post(url).then((res) => {
@@ -250,7 +250,7 @@
if (manufacturer == "HK") {
axios
.get(
- `/api/blade-jfpts/equipment/equipment/selectEquimentPlayInfo?number=${deviceNumber}&bmp=m3u8&manufacturer=${manufacturer}`
+ `/api/equipment/equipment/selectEquimentPlayInfo?number=${deviceNumber}&bmp=m3u8&manufacturer=${manufacturer}`
)
.then((result) => {
that.videoSource = result.data.data.address;
diff --git a/xcxjingqingmap_clock_sign_in/js/vueMain.js b/xcxjingqingmap_clock_sign_in/js/vueMain.js
index 9570f8c..f925694 100644
--- a/xcxjingqingmap_clock_sign_in/js/vueMain.js
+++ b/xcxjingqingmap_clock_sign_in/js/vueMain.js
@@ -12,7 +12,7 @@
//基础路径
// pathUrl: "http://localhost:89",
- pathUrl: "http://s16s652780.51mypc.cn/api/blade-jfpts",
+ pathUrl: "http://s16s652780.51mypc.cn/api",
layer: null,
diff --git a/xcxjingqingmap_lxdh/js/lxdhmap.js b/xcxjingqingmap_lxdh/js/lxdhmap.js
index 48eadc7..64bfd32 100644
--- a/xcxjingqingmap_lxdh/js/lxdhmap.js
+++ b/xcxjingqingmap_lxdh/js/lxdhmap.js
@@ -35,7 +35,7 @@
methods: {
getDataList(res) {
var that = this;
- // var url = 'https://web.byisf.com/api/blade-jfpts/equipment/equipment/listAll';
+ // var url = 'https://web.byisf.com/api/equipment/equipment/listAll';
// axios.get(url).then((res) => {
// that.getdata = res.data.data;
that.beginCome(res);
@@ -77,7 +77,7 @@
beginMap(map, data) {
var that = this,
center = [that.lat, that.lng];
- // url = `/api/blade-jfpts/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
+ // url = `/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
// this.nowPosition = center;
// axios.post(url).then((res) => {
// // console.log(res)
@@ -404,7 +404,7 @@
//警情点查询
axios({
method: "post",
- url: `http://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/APP-getAlarming`,
+ url: `http://s16s652780.51mypc.cn/api/alarm/alarm/APP-getAlarming`,
params: {
securityId: "1370564873280430082",
},
diff --git a/xcxjingqingmap_patrol/js/vueMain.js b/xcxjingqingmap_patrol/js/vueMain.js
index 06ca1f2..e2a88b8 100644
--- a/xcxjingqingmap_patrol/js/vueMain.js
+++ b/xcxjingqingmap_patrol/js/vueMain.js
@@ -10,7 +10,7 @@
//基础路径
// pathUrl: "http://localhost:89",
- pathUrl: "http://s16s652780.51mypc.cn/api/blade-jfpts",
+ pathUrl: "http://s16s652780.51mypc.cn/api",
layer: null,
--
Gitblit v1.9.3