Ver Fonte

调整移动端IOS钉钉上传的问题

Lijy há 3 anos atrás
pai
commit
3140548b36

+ 10 - 10
fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,18 +1,18 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.20'
+var ip = '192.168.2.6'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
   build: {

+ 2 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -1214,7 +1214,8 @@
                     forbidClick: true,
                     duration: 0
                 });
-                let formData = new FormData();
+                // let formData = new FormData();
+                let formData = new URLSearchParams()
                 formData.append("draft", this.isDraft);
                 if (this.reportTimeType.type == 0) {
                     var alldayNum = 0;

+ 38 - 7
fhKeeper/formulahousekeeper/timesheet_h5/src/views/test/list.vue

@@ -1175,7 +1175,8 @@
                     forbidClick: true,
                     duration: 0
                 });
-                let formData = new FormData();
+                // let formData = new FormData();
+                let formData = new URLSearchParams()
                 formData.append("draft", this.isDraft);
                 if (this.reportTimeType.type == 0) {
                     var alldayNum = 0;
@@ -1254,7 +1255,7 @@
                         formData.append("groupId", 0);
                     }
                     if (this.form.domains[i].stage) {
-                        formData.append("stage", this.form.domains[i].stage);
+                        formData.append("stage",  this.form.domains[i].stage);
                     } else {
                         formData.append("stage", '-');
                     }
@@ -1347,15 +1348,17 @@
                 }
                 
                 var valjdk = ''
-                for (var key of formData.keys()) {undefined
+                for (var key of formData.keys()) {
                         console.log(key + "-------" + formData.get(key));
-                        valjdk = valjdk + key + "-------" + formData.get(key) + '             '
+                        valjdk = valjdk + key + "-------" + formData.get(key) + '\n'
                     }
-                
+                    var sss = formData.get('projectId')
+                    alert(sss)
                     alert(valjdk)
-                return
-
+                // return
+ 
                 this.$axios.post("/report/editReport", formData)
+                // this.$axios.post("/report/editReport", objs)
                 .then(res => {
                     if(res.code == "ok") {
                         this.$toast.clear();
@@ -1366,6 +1369,34 @@
                         this.$toast.fail((this.isDraft==0?'提交失败':'暂存失败')+':'+res.msg);
                     }
                 }).catch(err=> {this.$toast.clear();});
+                // this.$axios({
+                //     method: "post",
+                //     url: `/report/editReport`,
+                //     data: obj,
+                //     // headers: {
+                //     //     transformRequest: [data => data]//此处是我进行设置的转换数据类型
+                //     // },
+                //     headers: { "Content-Type": "multipart/form-data" }
+                    
+                // })
+                // .then(res => {
+                //     if(res.code == "ok") {
+                //         this.$toast.clear();
+                //         this.$toast.success(this.isDraft==0?'提交成功':'暂存成功');
+                //         this.$router.push("/index");
+                //     } else {
+                //         this.$toast.clear();
+                //         this.$toast.fail((this.isDraft==0?'提交失败':'暂存失败')+':'+res.msg);
+                //     }
+                // }).catch(err=> {this.$toast.clear();});
+
+                // axios({
+                //     method: "post",
+                //     url: '/report/editReport',
+                //     data: formData,
+                //     headers: { "Content-Type": "multipart/form-data" },
+                // })
+                // }
             },
             //初始化参数
             initWxConfig() {

+ 10 - 10
fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -4,17 +4,17 @@ const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
 // var ip = '127.0.0.1'
-// var ip = '192.168.2.18'
+var ip = '192.168.2.6'
 // var ip = '47.100.37.243'
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
     // 关闭eslint检查