Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

李宇
2 parents 764a832f 2d80079a
Showing 6 changed files with 84 additions and 29 deletions
admin-web-master/src/components/fujianUpload/index.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/ads/fangli/bianform.vue
admin-web-master/src/views/ads/fangli/index.vue
admin-web-master/src/views/detect/information.vue
admin-web-master/src/views/investigation/index.vue
@@ -40,8 +40,8 @@
       class="el-upload__tip"
     >
       请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b></template>
+      <template v-if="fileSize"> 大小不超过 <b style="color: #3F9B6A">{{ fileSize }}MB</b></template>
+      <template v-if="fileType"> 格式为 <b style="color: #3F9B6A">{{ fileType.join('/') }}</b></template>
       的文件
     </div>
@@ -20,8 +20,8 @@ if (host == &#39;172.16.61.48&#39; || host == &#39;172.16.61.49 :5173&#39; || host ==&#39;172.16.61.
  // PREFIX = 'http://172.16.61.48/meserver/admin-server';
   // PREFIX = 'http://192.168.2.98:9003';
   // PREFIX = 'http://8.130.38.56:8019/admin-server';
- // PREFIX = 'http://192.168.2.236:9003';
-   PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
+ PREFIX = 'http://192.168.8.106:9003';
+   // PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
    // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
 }else{
@@ -381,7 +381,7 @@ guihuaDate:[],
                      this.ruleForm.resourceManagement = JSON.stringify(this.ruleForm.resourceManagement)
                    }
-const { pageNumber, pageSize, ...rest } = this.ruleForm
+// const { pageNumber, pageSize, ...rest } = this.ruleForm
 // this.ruleForm = rest
 //   console.log(this.ruleForm)
 //   return
@@ -249,6 +249,13 @@ export default {
       plan_Time:[],
       formSel: {
       planName:'',
+        pageNumber: 1,
+        pageSize: 10,
+        cereInvestmentPlanningManagement:{
+          implementationStartTime:'',
+          implementationEndTime:''
+        }
+
       },
       secondData: {
         card: 'first', // 切换
@@ -297,21 +304,21 @@ export default {
     // 查询全数据
     async getAll() {
       const res = await fangGetAll(this.pageindex);
- let result = [];
-      res.data.content.forEach(item => {
-        item.cereResourceStrategy.forEach(strategy => {
-          // 复制原始数据的部分字段
-          let newItem = {
-            planName: item.planName,
-            cereInvestmentPlanningManagement: item.cereInvestmentPlanningManagement,
-            auditStatus: item.auditStatus,
-            // ...其他需要合并显示的字段
-          };
-          // 添加cereResourceStrategy中的字段
-          newItem.cereResourceStrategy = strategy;
-          result.push(newItem);
-        })
-      })
+ // let result = [];
+ //      res.data.content.forEach(item => {
+ //        item.cereResourceStrategy.forEach(strategy => {
+ //          // 复制原始数据的部分字段
+ //          let newItem = {
+ //            planName: item.planName,
+ //            cereInvestmentPlanningManagement: item.cereInvestmentPlanningManagement,
+ //            auditStatus: item.auditStatus,
+ //            // ...其他需要合并显示的字段
+ //          };
+ //          // 添加cereResourceStrategy中的字段
+ //          newItem.cereResourceStrategy = strategy;
+ //          result.push(newItem);
+ //        })
+ //      })
       this.tableData = res.data.content
       this.total = res.data.content.length
@@ -323,15 +330,20 @@ export default {
     // 查询
     async onSubmit() {
       let forms ={
+        planName:'',
         pageNumber: 1,
         pageSize: 10,
+        cereInvestmentPlanningManagement:{
+          implementationStartTime:'',
+          implementationEndTime:''
+        }
       }
       if(this.formSel.planName !=''){
         forms.planName = this.formSel.planName
       }
       if(this.plan_Time.length!=0){
-          forms.implementationStartTime =  this.plan_Time[0]
-          forms.implementationEndTime =  this.plan_Time[1]
+          forms.cereInvestmentPlanningManagement.implementationStartTime =  this.plan_Time[0]
+          forms.cereInvestmentPlanningManagement.implementationEndTime =  this.plan_Time[1]
       }
       const res = await fangGetAll(forms)
       this.tableData = res.data.content
@@ -381,10 +393,13 @@ export default {
     // 重置按钮
     resetting() {
       this.formSel = {
-        affiliation: '',
-        createUser: '',
-        createDate: '',
-        contacts: '',
+        planName:'',
+        pageNumber: 1,
+        pageSize: 10,
+        cereInvestmentPlanningManagement:{
+          implementationStartTime:'',
+          implementationEndTime:''
+        }
       }
       this.plan_Time = []
       this.getAll()
@@ -196,7 +196,12 @@
              <upimg v-model="ruleForm.displayMainImage" :limit="1" :fileSize="1"></upimg>
             </el-form-item>
             <el-form-item label="其他图片/视频" prop="displayMainVidio">
-               <upvidio v-model="ruleForm.displayMainVidio" :limit="3"></upvidio>
+               <!-- <upvidio v-model="ruleForm.displayMainVidio" :limit="3"></upvidio> -->
+               <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
+                                 :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
+                                  :auto-upload="true" v-if="fileData.length==0">
+                                 <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
+               </el-upload>
             </el-form-item>
             <el-form-item>
@@ -301,8 +306,15 @@
                   <img :src="editbgid.displayMainImage" alt="" style="width:140px;height:140px;" v-else>
                  </el-form-item>
                  <el-form-item label="其他图片/视频" prop="displayMainVidio">
-                    <upvidio v-model="editbgid.displayMainVidio" :limit="3" v-if="edit==false"></upvidio>
-                    <img :src="editbgid.displayMainVidio" alt="" style="width:140px;height:140px;" v-else>
+                   <div v-if="edit">{{editbgid.displayMainVidio}}</div>
+                   <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
+                                     :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
+                                      :auto-upload="true" v-if="fileData.length==0" v-else>
+                                     <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
+                                   </el-upload>
+
+                    <!-- <upvidio v-model="editbgid.displayMainVidio" :limit="3" v-if="edit==false"></upvidio>
+                    <img :src="editbgid.displayMainVidio" alt="" style="width:140px;height:140px;" v-else> -->
                  </el-form-item>
                </el-form>
             </div>
@@ -488,6 +500,9 @@
   import {
     getToken, removeToken
   } from '@/utils/auth'
+  import {
+    uploadUrl
+  } from '@/utils/request'
   import MapMark from "@/components/MapContainer/MapMark";
   import MapXian from "@/components/MapContainer/MapXian";
   import upimg from "@/components/ImageUpload/index";
@@ -497,6 +512,8 @@
     name: 'information',
     data() {
       return {
+        uploadFileUrl: uploadUrl, // 请求地址
+        fileData:[],
         edit: true, //编辑
         formInline: {},
         ggXin:true,//新增
@@ -662,6 +679,9 @@ components: {MapMark,MapXian,upimg,upvidio},
       addpush(formName){
              this.$refs[formName].validate((valid) => {
           if (valid) {
+            if(this.fileData.length !=0){
+              this.ruleForm.displayMainVidio = this.fileData[0].url
+            }
               this.ruleForm.createDate = this.updateCurrentTime()
               this.ruleForm.mapPunctuation = JSON.stringify(this.mapData)
                 this.ruleForm.rentalStatus=0
@@ -734,6 +754,9 @@ components: {MapMark,MapXian,upimg,upvidio},
       },
       //查看编辑确定
      async editpush(){
+       if(this.fileData.length !=0){
+         this.editbgid.displayMainVidio = this.fileData[0].url
+       }
        this.editbgid.updateDate = this.updateCurrentTime()
        this.editbgid.mapPunctuation = JSON.stringify(this.mapData)
         await editList(this.editbgid)
@@ -743,6 +766,7 @@ components: {MapMark,MapXian,upimg,upvidio},
       },
         //新增
         addbuss(){
+          this.fileData = []
           this.ggXin = false
          this.ruleForm={
                 shopName:'',
@@ -796,6 +820,17 @@ getChildDate(mapData){
          this.editbgid.belongingParkTrail = ''
          this.gongyuan1(vaule)
       },
+      handleRemove(file, fileList) {
+        this.fileData = []
+      },
+      handleUploadSuccess(response, file, fileList) {
+        const fileMsg = {
+          name:file.name,
+           url: file.response.data.url,
+        }
+        // 将文件地址存储在 uploadedFiles 数组中
+        this.fileData.push(fileMsg);
+      },
     }
   }
 </script>
@@ -1850,6 +1850,11 @@ objectToArray(obj) {
         this.secondData = item
         Vue.set(this.plan_Time, 0, this.secondData.startDate)
         Vue.set(this.plan_Time, 1, this.secondData.endDate)
+          if (typeof item.question == 'string') {
+            item.question = JSON.parse(item.question)
+          }
+
+              console.log(item.question)
         this.secondDataTi = item.cereQuestionManagements
         this.bainjiBox = true