巡查

BJYSYBZ_C/src/views/BjWlydManageView/components/Td.vue

@@ -307,7 +307,7 @@ export default {
         .then(() => {
           let urlApi = `/api/ybz-bj/manageRemove`;
           let params = {
-            id: this.sumbitObj.dkbh,
+            id: this.sumbitObj.dksyh,
           };
           this.$ajax.get(urlApi, params, this, false).then((resp) => {
             let { data, success } = resp;

YSGZYBZ_WXAPP/pages/login/index.vue

@@ -37,24 +37,28 @@ export default {
         let params = {
           code: e.detail.code,
         };
-        httpAjax({
-          url: 'app/xc/getXcryByMobile',
-          method: 'GET',
-          data: params,
-        }).then((result) => {
-          if (result.data) {
-            uni.setStorageSync('userInfo', result.data);
-            uni.navigateTo({
-              url: '/pages/main/index',
-            });
-          } else {
-            uni.showToast({
-              title: '该用户无权访问此系统',
-              icon: 'none',
-              duration: 4000,
-            });
-          }
-        });
+        uni
+          .request({
+            url: 'https://zlzd.zrzyt.zj.gov.cn/ysybz/api/app/xc/getXcryByMobile',
+            // url: 'http://10.10.9.71:7089/ysgzybz/app/xc/getXcryByMobile',
+            method: 'GET',
+            data: params,
+          })
+          .then((result) => {
+            console.log(result);
+            if (result[1].data.data) {
+              uni.setStorageSync('userInfo', result[1].data.data);
+              uni.navigateTo({
+                url: '/pages/main/index',
+              });
+            } else {
+              uni.showToast({
+                title: '该用户无权访问此系统',
+                icon: 'none',
+                duration: 4000,
+              });
+            }
+          });
       } else {
       }
     },

YSGZYBZ_WXAPP/pages/nocheckDetail/index.vue

@@ -210,66 +210,12 @@ export default {
       uni.getImageInfo({
         src: tempFilePath,
         success: function (image) {
-          const context = uni.createCanvasContext('Canvas');
           const fileName = file['tempFiles'][0]['name'];
           that.setFileImgList(fileName, tempFilePath);
           that.fileUploadAjax(tempFilePath);
-          // setTimeout(function () {
-          //   context.fillRect(0, 0, image.width, image.height);
-          //   context.drawImage(
-          //     file.tempFilePaths[0],
-          //     0,
-          //     0,
-          //     image.width,
-          //     image.height,
-          //   );
-          //   context.setFontSize(20);
-          //   context.setFillStyle('rgba(150, 150, 150, 0.6)');
-          //   const latText = that.lat2;
-          //   const lngText = that.long2;
-          //   context.fillText(
-          //     that.getDateTimeByNow(),
-          //     image.width - 320,
-          //     image.height - 20,
-          //   );
-          //   context.fillText(
-          //     `${latText},${lngText}`,
-          //     image.width - 250,
-          //     image.height - 50,
-          //   );
-          //   context.draw(false, () => {
-          //     setTimeout(() => {
-          //       uni.canvasToTempFilePath({
-          //         canvasId: 'Canvas',
-          //         success: (path) => {
-          //           console.log(path['tempFilePath']);
-          //           that.setFileImgList(fileName, path['tempFilePath']);
-          //           that.fileUploadAjax(path['tempFilePath']);
-          //         },
-          //       });
-          //     }, 200);
-          //   });
-          // }, 500);
         },
       });
     },
-    getDateTimeByNow() {
-      const dateObj = new Date();
-      const year = dateObj.getFullYear();
-      const month = dateObj.getMonth() + 1;
-      const date = dateObj.getDate();
-
-      const hour = dateObj.getHours();
-      const min = dateObj.getMinutes();
-      const sec = dateObj.getSeconds();
-
-      const monthStr = month < 10 ? `0${month}` : month;
-      const dateStr = date < 10 ? `0${date}` : date;
-      const hourStr = hour < 10 ? `0${hour}` : hour;
-      const minStr = min < 10 ? `0${min}` : min;
-      const secStr = sec < 10 ? `0${sec}` : sec;
-      return `${year}年${monthStr}月${dateStr}日 ${hourStr}时${minStr}分${secStr}秒`;
-    },
     setFileImgList(name, url) {
       console.log(this.fileImgList);
       const extnames = name.match(/\.(jpg|jpeg|png|GIF|JPG|PNG)$/);
@@ -314,6 +260,7 @@ export default {
               data.lng = res.longitude;
               data.fileId = data.id;
               data.warningId = _that.warningId;
+              console.log(data);
               _that.fileList.push(data);
               console.log(_that.fileList);
             },

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/nocheckDetail/index.js

@@ -365,66 +365,12 @@ var FormData = __webpack_require__(/*! @/utils/formData/formData.js */ 36);var _
       uni.getImageInfo({
         src: tempFilePath,
         success: function success(image) {
-          var context = uni.createCanvasContext('Canvas');
           var fileName = file['tempFiles'][0]['name'];
           that.setFileImgList(fileName, tempFilePath);
           that.fileUploadAjax(tempFilePath);
-          // setTimeout(function () {
-          //   context.fillRect(0, 0, image.width, image.height);
-          //   context.drawImage(
-          //     file.tempFilePaths[0],
-          //     0,
-          //     0,
-          //     image.width,
-          //     image.height,
-          //   );
-          //   context.setFontSize(20);
-          //   context.setFillStyle('rgba(150, 150, 150, 0.6)');
-          //   const latText = that.lat2;
-          //   const lngText = that.long2;
-          //   context.fillText(
-          //     that.getDateTimeByNow(),
-          //     image.width - 320,
-          //     image.height - 20,
-          //   );
-          //   context.fillText(
-          //     `${latText},${lngText}`,
-          //     image.width - 250,
-          //     image.height - 50,
-          //   );
-          //   context.draw(false, () => {
-          //     setTimeout(() => {
-          //       uni.canvasToTempFilePath({
-          //         canvasId: 'Canvas',
-          //         success: (path) => {
-          //           console.log(path['tempFilePath']);
-          //           that.setFileImgList(fileName, path['tempFilePath']);
-          //           that.fileUploadAjax(path['tempFilePath']);
-          //         },
-          //       });
-          //     }, 200);
-          //   });
-          // }, 500);
         } });
 
     },
-    getDateTimeByNow: function getDateTimeByNow() {
-      var dateObj = new Date();
-      var year = dateObj.getFullYear();
-      var month = dateObj.getMonth() + 1;
-      var date = dateObj.getDate();
-
-      var hour = dateObj.getHours();
-      var min = dateObj.getMinutes();
-      var sec = dateObj.getSeconds();
-
-      var monthStr = month < 10 ? "0".concat(month) : month;
-      var dateStr = date < 10 ? "0".concat(date) : date;
-      var hourStr = hour < 10 ? "0".concat(hour) : hour;
-      var minStr = min < 10 ? "0".concat(min) : min;
-      var secStr = sec < 10 ? "0".concat(sec) : sec;
-      return "".concat(year, "\u5E74").concat(monthStr, "\u6708").concat(dateStr, "\u65E5 ").concat(hourStr, "\u65F6").concat(minStr, "\u5206").concat(secStr, "\u79D2");
-    },
     setFileImgList: function setFileImgList(name, url) {
       console.log(this.fileImgList);
       var extnames = name.match(/\.(jpg|jpeg|png|GIF|JPG|PNG)$/);
@@ -469,6 +415,7 @@ var FormData = __webpack_require__(/*! @/utils/formData/formData.js */ 36);var _
               data.lng = res.longitude;
               data.fileId = data.id;
               data.warningId = _that.warningId;
+              console.log(data);
               _that.fileList.push(data);
               console.log(_that.fileList);
             },