朱鑫波 4 lat temu
rodzic
commit
e5e6482f8f

+ 29 - 17
src/views/modules/Statistics/videoStatics/KSvideoStatics.vue

@@ -5,20 +5,25 @@
         <Treeselect  :appId.sync="appId" request="2,4"   style="display: inline-block;position: relative;margin-left: 0px;"/>
     </div>
     <div class="timeDiv">
-      <div style='display:flex;align-items: center;'>
-        <span>时间范围:</span>
-        <span  @click="opendate">
-          <DatePicker :openOptions='openOptions'  :parentDate='dateValue' left='-100px'></DatePicker>
-        </span> 
-        <span style="margin-left:15px">设计负责人:</span> 
-        <span  >
+      <div style='display:flex;align-items: center;flex-wrap:wrap;'>
+        <div style="dispaly:inline-block;margin-bottom:15px;"> 
+          <span>时间范围:</span>
+          <span style="display: inline-block;"  @click="opendate">
+            <DatePicker :openOptions='openOptions'  :parentDate='dateValue' left='-100px'></DatePicker>
+          </span>
+        </div>
+        <div style="dispaly:inline-block;margin-bottom:15px;">
+        <span style="margin-left:15px;">设计负责人:</span> 
+        <span>
             <!-- <a-input placeholder="请输入剪辑的名字" v-model="clip" style="width:140px"  /> -->
             <a-select v-model="leaderId" style="width: 140px" allowClear  show-search :filter-option="filterOption">
               <a-select-option v-for="item in designList" :key="item.userId" :value='item.userId'>
                 {{item.companyName +'_'+item.userName  }}
               </a-select-option>
             </a-select>
-        </span>         
+        </span>   
+        </div>      
+        <div style="dispaly:inline-block;margin-bottom:15px;">
         <span style="margin-left:15px">剪辑:</span> 
         <span  >
             <!-- <a-input placeholder="请输入剪辑的名字" v-model="clip" style="width:140px"  /> -->
@@ -27,7 +32,9 @@
                 {{item.companyName +'_'+item.userName  }}
               </a-select-option>
             </a-select>
-        </span>         
+        </span>     
+        </div>    
+        <div style="dispaly:inline-block;margin-bottom:15px;">
         <span style="margin-left:15px">拍摄:</span> 
         <span  >
             <!-- <a-input placeholder="请输入拍摄的名字" v-model="shot" style="width:140px" /> -->
@@ -36,7 +43,9 @@
                 {{item.companyName +'_'+item.userName  }}
               </a-select-option>
             </a-select>
-        </span>         
+        </span>   
+        </div>      
+        <div style="dispaly:inline-block;margin-bottom:15px;">
         <span style="margin-left:15px">编导:</span> 
         <span  >
             <!-- <a-input placeholder="请输入编导的名字" v-model="plan" style="width:140px"  /> -->
@@ -46,14 +55,17 @@
               </a-select-option>
             </a-select>
         </span>     
-        <span style="margin-left:15px">素材分类:</span> 
-        <span  >
+        </div>
+        <div style="dispaly:inline-block;margin-bottom:15px;">
+        <span style="margin-left:15px">素材渠道:</span> 
+        <span>
             <!-- <a-input placeholder="请输入编导的名字" v-model="plan" style="width:140px"  /> -->
             <a-select v-model="material" style="width: 140px" allowClear>
-              <a-select-option value="内部">内部</a-select-option>
-              <a-select-option value="塑造">塑造</a-select-option>
+              <a-select-option value="0">内部</a-select-option>
+              <a-select-option value="1">素造</a-select-option>
             </a-select>
-        </span>     
+        </span>    
+        </div> 
       </div>
       <a-button type="primary" @click="searchRes" :loading='searchLoading'>查询</a-button>
     </div>
@@ -754,7 +766,7 @@ export default {
         shotId:this.shot?this.shot:'',
         planId:this.plan?this.plan:'',
         leaderId:this.leaderId?this.leaderId:'',
-        channelName: this.material ? this.material : ''
+        channelType: this.material ? Number(this.material) : ''
       }).then(res => {
         let resArr = []
         this.data=[];
@@ -803,7 +815,7 @@ export default {
         shotId:this.shot?this.shot:'',
         planId:this.plan?this.plan:'',
         leaderId:this.leaderId?this.leaderId:'',
-        channelName: this.material ? this.material : ''
+        channelType: this.material ? Number(this.material) : ''
       }).then(res => {
         this.exportLoading=false;
         let blob = new Blob([res], {

+ 2 - 2
vue.config.js

@@ -71,7 +71,7 @@ module.exports = {
           // target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
           // target: 'http://192.168.1.8:8081', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
-        target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.43:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
@@ -80,7 +80,7 @@ module.exports = {
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要jeecg-boot后台项目  李煜一
-        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目