Prechádzať zdrojové kódy

'骄阳修改下单制'

魏志佳 4 rokov pred
rodič
commit
38f16ea315

BIN
dist.zip


+ 7 - 7
src/views/dashboard/Analysis.vue

@@ -402,14 +402,14 @@
 
     },
     mounted() {
-        //  postAction('/ctop/releaseViewRecord/check', {}).then(res => {
-        //     console.log(res)
-        //     if(res.success){
-        //        this.visible=res.showPopup;
-        //        this.versionId=res.data.id;
-        //     }
+         postAction('/ctop/releaseViewRecord/check', {}).then(res => {
+            console.log(res)
+            if(res.success){
+               this.visible=res.showPopup;
+               this.versionId=res.data.id;
+            }
            
-        // })
+        })
     },
   }
 </script>

+ 1 - 1
src/views/modules/workBench/placeOrder.vue

@@ -702,7 +702,7 @@ export default {
 
         beforeUpload(file) {
             // ${this.form.project}
-            this.uploadAction= `http://jiaoyangapi.shyouteng.com.cn/jeecg-boot/platform/file/uploadAttachment?projectId=772`
+            this.uploadAction= `http://jiaoyangapi.shyouteng.com.cn/jeecg-boot/platform/file/uploadAttachment?projectId=${this.form.project}`
             // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadAttachment?projectId=772`
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)

+ 0 - 3
vue.config.js

@@ -86,11 +86,8 @@ module.exports = {
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
         // target:'http://139.186.151.174:8804', //测试
-<<<<<<< HEAD
 
 
-=======
->>>>>>> master
 
         ws: false,