zhuxinbo 5 anni fa
parent
commit
7409d74a3a

+ 4 - 4
src/views/modules/Statistics/Statistics.vue

@@ -146,7 +146,7 @@
                 :style="contrastDataAll.compared.costProportion > 0 ? 'color:red' : 'color:#0bcd74'"
                 class="styleElse"
                 style="  margin-left:0"
-                >{{ Math.abs(contrastDataAll.compared.costProportion).toFixed(2) + '%' }}</span
+                >{{ (Math.abs(contrastDataAll.compared.costProportion)*100).toFixed(2) + '%' }}</span
               >
             </p>
           </a-card>
@@ -178,7 +178,7 @@
                 :style="contrastDataAll.compared.photoClickProportion > 0 ? 'color:red' : 'color:#0bcd74'"
                 class="styleElse"
                 style="  margin-left:0"
-                >{{ Math.abs(contrastDataAll.compared.photoClickProportion).toFixed(2) + '%' }}</span
+                >{{ (Math.abs(contrastDataAll.compared.photoClickProportion)*100).toFixed(2) + '%' }}</span
               >
             </p>
           </a-card>
@@ -210,7 +210,7 @@
                 :style="contrastDataAll.compared.showProportion > 0 ? 'color:red' : 'color:#0bcd74'"
                 class="styleElse"
                 style="  margin-left:0"
-                >{{ Math.abs(contrastDataAll.compared.showProportion).toFixed(2) + '%' }}</span
+                >{{ (Math.abs(contrastDataAll.compared.showProportion)*100).toFixed(2) + '%' }}</span
               >
             </p>
           </a-card>
@@ -242,7 +242,7 @@
                 :style="contrastDataAll.compared.comparedAclick > 0 ? 'color:red' : 'color:#0bcd74'"
                 class="styleElse"
                 style="  margin-left:0"
-                >{{ Math.abs(contrastDataAll.compared.comparedAclick).toFixed(2) + '%' }}</span
+                >{{ (Math.abs(contrastDataAll.compared.comparedAclick)*100).toFixed(2) + '%' }}</span
               >
             </p>
           </a-card>

+ 1 - 1
src/views/modules/Statistics/dataDisplayStatistics.vue

@@ -981,7 +981,7 @@ export default {
                 afterFormPrice: res.result.ratioJson.discountConversionPrice.toFixed(2),
                 eventRegister: res.result.ratioJson.eventRegister,
                 eventRegisterCost: res.result.ratioJson.eventRegisterCost.toFixed(2),
-                eventNextDayStayRatio:item.eventNextDayStayRatio?item.eventNextDayStayRatio.toFixed(2) + '%' : 0 + '%'
+                eventNextDayStayRatio:res.result.ratioJson.eventNextDayStayRatio?res.result.ratioJson.eventNextDayStayRatio.toFixed(2) + '%' : 0 + '%'
               }
               this.data.push(allNow)
               this.statDate = res.result.statDate

+ 2 - 2
src/views/modules/advertiser/UserAllocationList.vue

@@ -75,10 +75,10 @@
           <a-divider type="vertical" />
           <a @click="handleEdit(record)">编辑</a>
 
-          <!-- <a-divider type="vertical" />
+          <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
-          </a-popconfirm> -->
+          </a-popconfirm>
         </span>
       </a-table>
     </div>

+ 2 - 2
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -56,9 +56,9 @@
                             v-if="item.videoList"></video>
                         </a-form-item>
                         <div class="downLoad" style="overflow:auto">
-                          <a-button @click="onCheckAllImageChange(index,item)" v-if="item.imageUrlList.length > 0">{{
+                          <!-- <a-button @click="onCheckAllImageChange(index,item)" v-if="item.imageUrlList.length > 0">{{
                             item.checkAllImage ? '取消  (  ' + item.checkArrImage.length + '  )' : '全选'
-                            }}</a-button>
+                            }}</a-button> -->
                           <ul class="actor-photo-list"
                             :style="{ width: item.imageUrlList.length>4?25 * item.imageUrlList.length + '%':'100%' }"
                             v-if="item.imageUrlList.length > 0">

+ 4 - 0
src/views/modules/material/materialList.vue

@@ -360,6 +360,10 @@ a {
                 您的浏览器不支持 video 标签。
               </video>
             </a-form-item>
+            
+            <a-form-item label="上传人" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="detail.userName">
+              {{ detail.userName }}
+            </a-form-item>
             <a-form-item label="尺寸" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="detail.width">
               {{ detail.width }}*{{ detail.height }}
             </a-form-item>

+ 45 - 23
src/views/modules/material/videoMaterial.vue

@@ -587,7 +587,7 @@ a {
     <a-modal title="封面上传" @cancel="closeImage" @afterClose="closeImage" v-model="addImageVisible">
       <template slot="footer">
         <a-button key="back" @click="closeImage">取消</a-button>
-        <a-button key="submit" type="primary" @click="handleOkImage">
+        <a-button key="submit" type="primary" @click="handleOkImage" :loading="loadingImage">
           确定
         </a-button>
       </template>
@@ -705,7 +705,7 @@ a {
           :wrapper-col="wrapperCol"
           label="封面上传"
           class="add-image-material"
-          v-if="getData('projectId')&&add"
+          v-if="getData('projectId')&&add&&urlList.url!=''"
         >
           <upload-to-ali
             style="width:160%"
@@ -1107,7 +1107,7 @@ a {
     <a-modal title="人员修改" v-model="personVisible"  @afterClose="closePerson">
         <template slot="footer">
             <a-button key="back" @click="closePerson">取消</a-button>
-            <a-button key="submit" type="primary" @click="handleOkPerson">
+            <a-button key="submit" type="primary" :loading="loadingPerson" @click="handleOkPerson">
             确定
             </a-button>
         </template>
@@ -1247,6 +1247,8 @@ export default {
       personVisible:false,
       confirmLoading: false,
       loading:false,
+      loadingImage:false,
+      loadingPerson:false,
       activeKey: 'video',
       active: '0',
       examinelList: [
@@ -1857,6 +1859,7 @@ export default {
         this.personVisible = false
     },
     handleOkPerson(){
+      this.loadingPerson = true
       this.formPerson.validateFieldsAndScroll((err, values) => {
         if (err) {
           // 这里做逻辑处理
@@ -1871,6 +1874,7 @@ export default {
                 console.log(res)
                 if(res.success){
                     this.$message.success('修改成功')
+                    this.loadingPerson = false
                     this.closePerson()
                     this.loadData()
                 }else{
@@ -1886,6 +1890,7 @@ export default {
       params.projectId = this.addImageData.projectId
       params.videoId = this.addImageData.code
       params.imageArr = this.imageArrList
+      this.loadingImage = true
       postAction('/insertImage', params).then(res => {
         console.log(res)
         if (res.code == 0) {
@@ -1897,6 +1902,7 @@ export default {
           }
           this.imageArrList = []
           this.addImageVisible = false
+          this.loadingImage = false
           this.loadData()
         }
       })
@@ -2082,8 +2088,17 @@ export default {
       that.material = []
       that.imageArrList = []
       var img
-      img = new Image()
+      
       for (var i = 0; i < this.urlListImage.url.length; i++) {
+          that.imageArrList.push({
+            // width: img.width,
+            // height: img.height,
+            // size: this.urlListImage.size[i],
+            code: this.urlListImage.md5[i],
+            url: this.urlListImage.url[i],
+            materialName: this.urlListImage.name[i]
+          })
+        img = new Image()
         img.src = this.urlListImage.url[i]
         if (img.complete) {
           // 打印
@@ -2114,18 +2129,25 @@ export default {
           } else {
             that.material.push(false)
           }
-          that.imageArrList.push({
-            width: img.width,
-            height: img.height,
-            size: this.urlListImage.size[i],
-            code: this.urlListImage.md5[i],
-            url: this.urlListImage.url[i],
-            materialName: this.urlListImage.name[i]
-          })
-          alert(i)
+        //   that.imageArrList.push({
+        //     width: img.width,
+        //     height: img.height,
+        //     size: this.urlListImage.size[i],
+        //     code: this.urlListImage.md5[i],
+        //     url: this.urlListImage.url[i],
+        //     materialName: this.urlListImage.name[i]
+        //   })
         } else {
 
           img.onload = () => {
+            // that.imageArrList.push({
+            //   width: img.width,
+            //   height: img.height,
+            //   size: that.urlListImage.size[i-1],
+            //   code: that.urlListImage.md5[i-1],
+            //   url: that.urlListImage.url[i-1],
+            //   materialName: that.urlListImage.name[i-1]
+            // })
             if (img.width == 720) {
                 if (img.height == 1280) {
                   that.material.push(true)
@@ -2153,18 +2175,10 @@ export default {
             } else {
                 that.material.push(false)
             }
-            that.imageArrList.push({
-              width: img.width,
-              height: img.height,
-              size: that.urlListImage.size[i-1],
-              code: that.urlListImage.md5[i-1],
-              url: that.urlListImage.url[i-1],
-              materialName: that.urlListImage.name[i-1]
-            })
+            
           }
         }
       }
-      console.log(this.imageArrList)
     },
     file(file) {
       var bmf = new BMF()
@@ -2193,13 +2207,21 @@ export default {
     fileWater(file) {
       var bmf = new BMF()
       var that = this
+      var codeData = that.urlList.md5!=''?that.urlList.md5:that.addImageData.code
+      console.log(codeData)
+      this.urlListImage= {
+        url: [],
+        md5: [],
+        name: [],
+        size: []
+      }
       return new Promise(function(resolve, reject) {
         for (let i = 0; i < file.length; i++) {
           bmf.md5(file[i], (err, md5) => {
             fileCheckImage({
               code: md5,
               projectId: that.getData('projectId'),
-              videoId:that.addImageData.code
+              videoId:codeData
             }).then(res => {
               if (res.code == 0) {
                 that.$message.error('此素材已经上传')

+ 2 - 3
vue.config.js

@@ -65,13 +65,12 @@ module.exports = {
        },*/
       '/jeecg-boot': {
         // target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
-        // target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
-        target: 'http://192.168.1.13:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
+        // target: 'http://192.168.1.13:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.103:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.127:8080', //请求本地 需要jeecg-boot后台项目  孙震
-        // target: 'http://192.168.43.119:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙,手机热点
         ws: false,
         changeOrigin: true
       },