bug修复

api/common.js

@@ -212,4 +212,11 @@ export default {
 	getwarningPile(data) {
 		return utils.requestEn(`/mobile/warningPile/${data}`)
 	},
+	patrolRecord(data) {
+		return utils.requestEn(`/mobile/patrolRecord`,data,'POST')
+	},
+	//警示桩控制器
+	getpatrolRecord(data) {
+		return utils.requestEn(`/mobile/patrolRecord/${data}`)
+	},
 }

common/http.js

@@ -1,8 +1,7 @@
 // 配置信息
 export default {
 	// webUrl: 'http://127.0.0.1:8080',
-	//webUrl: 'https://cczdsz.com/prod-api/',
-	 webUrl: 'http://124.221.101.24:8082',
-	//webUrl: 'http://192.168.4.20:8081',
-	
+	//webUrl: 'https://www.cczdsz.cn/prod-api/',
+	// webUrl: 'http://124.221.101.24:8082',
+	webUrl: 'http://192.168.4.20:8080',
 }

pages/noLogin/WarningPileForm/WarningPileForm.vue

@@ -4,8 +4,8 @@
 		<view  class="project-content">
 		<u-form :model="form" :rules="rules" ref="form" >
 			<u-form-item borderBottom ref="item1">
-				<view>警示柱信息</view>
-				<u-input v-model="form.warningPileInfo"  :disabled="type==1" type="textarea" placeholder="请输入警示柱信息" ></u-input>
+				<view>备注</view>
+				<u-input v-model="form.remarks"  :disabled="type==1" type="textarea" placeholder="请输入警示柱信息" ></u-input>
 			</u-form-item>
 			<u-form-item borderBottom ref="item1">
 				<view>警示柱照片</view>
@@ -51,19 +51,20 @@ import service from '@/api/index.js'
 				value:null,
 				imgArr: [],
 				type:2,
-				id:null
-				
+				id:null,
+				userId:null
 			}
 		},
 		onLoad(e)
 		{
 			console.log(e)
 			this.id=e.id
+			//this.userId=e.userId
 			if(e.type==1)
 			{
 				this.type=e.type
 				console.log(this.id)
-				service.getwarningPile(this.id).then(res => {
+				service.getpatrolRecord(this.id).then(res => {
 					this.form=res
 					//this.imgymxs=res.photoList
 					if(null!=res.photoList)
@@ -77,15 +78,16 @@ import service from '@/api/index.js'
 					}
 				})
 			}else{
-				this.getwarningPileInfo(e.value)
+				//this.getwarningPileInfo(e.value)
 			}
 			uni.setNavigationBarTitle({
-					title: '抢险维修单',
+					title: '警示柱巡查记录',
 			});
 			uni.setNavigationBarColor({
 			    frontColor: '#ffffff',
 			    backgroundColor: '#2d95f4',
 			})
+			this.getUsreName()
 		},
 		methods: {
 			showPhoto(index){
@@ -102,7 +104,7 @@ import service from '@/api/index.js'
 			},
 			getwarningPileInfo(value)
 			{
-				service.getwarningPileInfo(value).then(res => {
+				service.getpatrolRecord(value).then(res => {
 					this.form=res
 					if(null!=res.photoList)
 					{
@@ -118,14 +120,22 @@ import service from '@/api/index.js'
 						}
 					}
 					console.log(this.imgymxs)
-					
 				})
 			},
+			getUsreName()
+			{
+			service.getUserName().then(res => {
+				this.userId = res.id;
+			})	
+			},
 			save()
 			{
+				
 				let _this=this
 				this.form.photoList=this.imgArr
-				service.setwarningPile(this.form
+				this.form.warningPileId=this.id
+				this.form.userId=this.userId
+				service.patrolRecord(this.form
 				).then(res => {
 					console.log(res)
 					_this.$UTILS.showPrompt('上报成功')

pages/noLogin/WarningPileList.vue

@@ -83,7 +83,7 @@
 			gotoindex(item) {
 				console.log(item)
 				uni.navigateTo({
-					url:`/pages/noLogin/WarningPileForm/WarningPileForm?value=${item.id}`
+					url:`/pages/noLogin/WarningPileForm/WarningPileForm?id=${item.id}`
 				})
 			},
 			topage(url) {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -9763,6 +9763,10 @@ var _default = (_getDistrict$getUnit$ = {
   return _request.default.requestEn("/mobile/regulatorBox/".concat(data));
 }), (0, _defineProperty2.default)(_getDistrict$getUnit$, "getwarningPile", function getwarningPile(data) {
   return _request.default.requestEn("/mobile/warningPile/".concat(data));
+}), (0, _defineProperty2.default)(_getDistrict$getUnit$, "patrolRecord", function patrolRecord(data) {
+  return _request.default.requestEn("/mobile/patrolRecord", data, 'POST');
+}), (0, _defineProperty2.default)(_getDistrict$getUnit$, "getpatrolRecord", function getpatrolRecord(data) {
+  return _request.default.requestEn("/mobile/patrolRecord/".concat(data));
 }), _getDistrict$getUnit$);
 exports.default = _default;
 
@@ -10029,9 +10033,9 @@ exports.default = void 0;
 // 配置信息
 var _default = {
   // webUrl: 'http://127.0.0.1:8080',
-  //webUrl: 'https://cczdsz.com/prod-api/',
-  webUrl: 'http://124.221.101.24:8082'
-  //webUrl: 'http://192.168.4.20:8081',
+  //webUrl: 'https://www.cczdsz.cn/prod-api/',
+  // webUrl: 'http://124.221.101.24:8082',
+  webUrl: 'http://192.168.4.20:8080'
 };
 exports.default = _default;
 

unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileForm/WarningPileForm.js

@@ -230,17 +230,19 @@ var _default = {
       value: null,
       imgArr: [],
       type: 2,
-      id: null
+      id: null,
+      userId: null
     };
   },
   onLoad: function onLoad(e) {
     var _this2 = this;
     console.log(e);
     this.id = e.id;
+    //this.userId=e.userId
     if (e.type == 1) {
       this.type = e.type;
       console.log(this.id);
-      _index.default.getwarningPile(this.id).then(function (res) {
+      _index.default.getpatrolRecord(this.id).then(function (res) {
         _this2.form = res;
         //this.imgymxs=res.photoList
         if (null != res.photoList) {
@@ -253,15 +255,16 @@ var _default = {
         }
       });
     } else {
-      this.getwarningPileInfo(e.value);
+      //this.getwarningPileInfo(e.value)
     }
     uni.setNavigationBarTitle({
-      title: '抢险维修单'
+      title: '警示柱巡查记录'
     });
     uni.setNavigationBarColor({
       frontColor: '#ffffff',
       backgroundColor: '#2d95f4'
     });
+    this.getUsreName();
   },
   methods: {
     showPhoto: function showPhoto(index) {
@@ -278,7 +281,7 @@ var _default = {
     },
     getwarningPileInfo: function getwarningPileInfo(value) {
       var _this3 = this;
-      _index.default.getwarningPileInfo(value).then(function (res) {
+      _index.default.getpatrolRecord(value).then(function (res) {
         _this3.form = res;
         if (null != res.photoList) {
           //this.imgymxs=res.photoList
@@ -294,10 +297,18 @@ var _default = {
         console.log(_this3.imgymxs);
       });
     },
+    getUsreName: function getUsreName() {
+      var _this4 = this;
+      _index.default.getUserName().then(function (res) {
+        _this4.userId = res.id;
+      });
+    },
     save: function save() {
       var _this = this;
       this.form.photoList = this.imgArr;
-      _index.default.setwarningPile(this.form).then(function (res) {
+      this.form.warningPileId = this.id;
+      this.form.userId = this.userId;
+      _index.default.patrolRecord(this.form).then(function (res) {
         console.log(res);
         _this.$UTILS.showPrompt('上报成功');
         setTimeout(function () {
@@ -309,7 +320,7 @@ var _default = {
       });
     },
     choose: function choose() {
-      var _this4 = this;
+      var _this5 = this;
       var _this = this;
       uni.showActionSheet({
         title: '上传',
@@ -317,9 +328,9 @@ var _default = {
         success: function success(res) {
           // console.log(res)
           if (res.tapIndex == 0) {
-            _this4.chooseimage();
+            _this5.chooseimage();
           } else {
-            _this4.choosevideo();
+            _this5.choosevideo();
           }
         }
       });
@@ -330,7 +341,7 @@ var _default = {
       uni.chooseImage({
         sourceType: ['camera'],
         success: function success(resp) {
-          var _this5 = this;
+          var _this6 = this;
           console.log('res--uni.chooseMedia', resp);
           resp.tempFiles.forEach(function (item, index) {
             var task = uni.uploadFile({
@@ -368,7 +379,7 @@ var _default = {
               },
               fail: function fail(e) {
                 _this.$UTILS.showPrompt('选取失败！');
-                _this5.uploadError(index, e);
+                _this6.uploadError(index, e);
               },
               complete: function complete(res) {
                 _this.uploading = false;
@@ -400,7 +411,7 @@ var _default = {
         sourceType: ['camera'],
         maxDuration: 30,
         success: function success(resp) {
-          var _this6 = this;
+          var _this7 = this;
           var task = uni.uploadFile({
             url: _this.$HTTP.webUrl + "/obs",
             filePath: resp.tempFilePath,
@@ -411,7 +422,7 @@ var _default = {
               // 判断是否json字符串，将其转为json格式
               var data = _this.$u.test.jsonString(res.data) ? JSON.parse(res.data) : res.data;
               if (![200, 201, 204].includes(res.statusCode)) {
-                _this6.uploadError(index, data);
+                _this7.uploadError(index, data);
               } else {
                 // 上传成功
                 // this.lists[index].response = data;
@@ -436,7 +447,7 @@ var _default = {
             },
             fail: function fail(e) {
               _this.$UTILS.showPrompt('选取失败！');
-              _this6.uploadError(index, e);
+              _this7.uploadError(index, e);
             },
             complete: function complete(res) {
               uni.hideLoading();
@@ -462,15 +473,15 @@ var _default = {
       });
     },
     remove: function remove(index) {
-      var _this7 = this;
+      var _this8 = this;
       uni.showModal({
         title: '提示',
         content: '是否删除该图片或视频？',
         success: function success(res) {
           if (res.confirm) {
-            _this7.imgArr.splice(index, 1);
-            _this7.imgymxs.splice(index, 1);
-            console.log('this.imgarr', _this7.imgArr);
+            _this8.imgArr.splice(index, 1);
+            _this8.imgymxs.splice(index, 1);
+            console.log('this.imgarr', _this8.imgArr);
           }
         }
       });

unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileList.js

@@ -267,7 +267,7 @@ var _default = {
     gotoindex: function gotoindex(item) {
       console.log(item);
       uni.navigateTo({
-        url: "/pages/noLogin/WarningPileForm/WarningPileForm?value=".concat(item.id)
+        url: "/pages/noLogin/WarningPileForm/WarningPileForm?id=".concat(item.id)
       });
     },
     topage: function topage(url) {

unpackage/dist/dev/mp-weixin/project.config.json

@@ -19,7 +19,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "3.1.5",
-  "appid": "wxa537100824cd1a15",
+  "appid": "wx9efdc4932f07063d",
   "projectname": "贞达市政工程",
   "condition": {},
   "editorSetting": {

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -2,7 +2,6 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "zd_wechatApp",
   "setting": {
-    "compileHotReLoad": true,
-    "urlCheck": false
+    "compileHotReLoad": true
   }
 }