魏志佳 4 years ago
parent
commit
b5ae5cb3e2

+ 2 - 2
src/utils/request.js

@@ -15,8 +15,8 @@ else if (process.env.NODE_ENV == 'debug') {
 else if (process.env.NODE_ENV == 'production') { 
   
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
-  axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';     
-  // axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
+  // axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';     
+  axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
 }
 const service = axios.create({
 //   baseURL: '/jeecg-boot', // api base_url

+ 10 - 89
src/views/dashboard/Analysis.vue

@@ -237,81 +237,7 @@
          <a-icon type="notification" theme='twoTone'/> 更新通告
       </div>
       <div class="Updatecontent">
-        <div class="Updateitem">
-            <div class="Updatetime">
-                 <a-icon type="dashboard" theme='twoTone' class="updateicon" />
-                 <span class="updateSpan">{{updateTime[3]}}</span>
-            </div>
-            <div class="updateText">
-              <div class="updateBox">
-                <h3 class="textTitle">1.脚本库加word下载;</h3>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">2.上线媒介报表;</h3>
-                
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">3.快手批量工具更新:</h3>
-                <ul class="updatelist">
-                  <li> <span class="circular"></span>创建组时--商业兴趣加智能推荐</li>
-                  <li><span class="circular"></span>在复制组时可选是否修改定向</li>
-                  <li><span class="circular"></span>计划、组、创意列表页加id、名称模糊搜索</li>
-                  <li><span class="circular"></span>复制组时连带组名一起复制,可对组名进行修改</li>
-                </ul>
-              </div>
-                      
-            </div>
-        </div>
-        <div class="Updateitem">
-            <div class="Updatetime">
-                 <a-icon type="dashboard" theme='twoTone' class="updateicon" />
-                 <span class="updateSpan">{{updateTime[2]}}</span>
-            </div>
-            <div class="updateText">
-              <div class="updateBox">
-                <h3 class="textTitle">1.快手批量工具更新:</h3>
-                <ul class="updatelist">
-                  <li> <span class="circular"></span> 批量创建创意页面加入推荐文案,可根据关键词匹配文案;</li>
-                  <li><span class="circular"></span>批量创建创意选择内部素材可根据时间排序、筛选(天维度);</li>
-                </ul>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">2.脚本库重磅上线(位置:素材管理--脚本库)</h3>
-                <ul class="updatelist">
-                  <li> <span class="circular"></span> 脚本可在线编辑,并实时保存;</li>
-                  <li><span class="circular"></span>可在线打印,支持导出脚本;</li>
-                  <li><span class="circular"></span>可在线打印,支持导出脚本;</li>
-                </ul>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">3.支持飞书扫码登录助手</h3>
-                
-              </div>
-                      
-            </div>
-        </div>
-        <div class="Updateitem">
-            <div class="Updatetime">
-                 <a-icon type="dashboard" theme='twoTone' class="updateicon" />
-                 <span class="updateSpan">{{updateTime[1]}}</span>
-            </div>
-            <div class="updateText">
-              <div class="updateBox">
-                <h3 class="textTitle">1.快手批量工具更新:</h3>
-                <ul class="updatelist">
-                  <li> <span class="circular"></span> 批量更改监测链接;</li>
-                  <li><span class="circular"></span>素材审核驳回在企业微信发消息提醒;</li>
-                  <li><span class="circular"></span>推送失败在企业微信发消息;</li>
-                  <li><span class="circular"></span>广告语加入动态词包;</li>
-                  <li><span class="circular"></span>屏蔽停投的账户;</li>
-                </ul>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">2.素材管理--视频素材-加素材名称搜索</h3>
-              </div>
-                      
-            </div>
-        </div>
+        
         <div class="Updateitem">
             <div class="Updatetime">
                  <a-icon type="dashboard" theme='twoTone' class="updateicon" />
@@ -319,25 +245,20 @@
             </div>
             <div class="updateText">
               <div class="updateBox">
-                <h3 class="textTitle">1.头条-账户报表上线通知</h3>
+                <h3 class="textTitle">1.新功能上线</h3>
                 <ul class="updatelist">
-                  <li><span class="circular"></span>点击“统计报表-头条报表-账户报表”查看模块</li>
-                  <li><span class="circular"></span>可根据项目账户筛选查看数据,支持时间筛选</li>
-                  <li><span class="circular"></span>支持报表导出</li>
-                </ul>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">2.快手批量工具更新</h3>
-                <ul>
-                  <li><span class="circular"></span>在创建创意模块加了时间维度筛选</li>
+                  <li><span class="circular"></span>素材下单制-流程节点发通知给相关人员;</li>
+                  <li><span class="circular"></span>素材下单制-封面图片支持点击查看大图;</li>
+                  <li><span class="circular"></span>批量工具-定时获取最新行动号召按钮;</li>
                 </ul>
               </div>
               <div class="updateBox">
-                <h3 class="textTitle">3.视频报表修改</h3>
+                <h3 class="textTitle">2.功能优化:</h3>
                 <ul>
-                  <li><span class="circular"></span>添加了视频上传时间字段</li>
+                  <li><span class="circular"></span>修复了相关BUG;</li>
                 </ul>
               </div>
+
             </div>
         </div>
          
@@ -412,7 +333,7 @@
         indicator: <a-icon type="loading" style="font-size: 24px" spin />,
         roleCode: localStorage.getItem('roleCode'),
         visible:false,//更新通知消息提示框
-        updateTime:['2020-06-10','2020-06-17','2020-06-24','2020-07-01'],
+        updateTime:['2021-01-27'],
         versionId:0,//存储版本号 判断通知什么时候显示
       }
     },
@@ -462,7 +383,7 @@
             if(res.success){
                this.visible=res.showPopup;
                if(res.data){
-                 this.versionId=res.data.id;
+                this.versionId=res.data.id;
                }
                
             }

+ 1 - 0
src/views/modules/Statistics/components/Treeselect.vue

@@ -8,6 +8,7 @@
     <treeselect
       :multiple="multiple"
       :disable-branch-nodes="!multiple"
+      :disable-fuzzy-matching="true"
       :options="options"
       :load-options="loadOptions"
       placeholder="请选择项目以及账户"

+ 1 - 0
src/views/modules/advertiser/modules/Treeselect.vue

@@ -8,6 +8,7 @@
     <treeselect
       :multiple="multiple"
       :disable-branch-nodes="!multiple"
+      :disable-fuzzy-matching="true"
       :options="options"
       :load-options="loadOptions"
       placeholder="请选择项目"

+ 1 - 0
src/views/modules/autoLaunch/components/Treeselect.vue

@@ -8,6 +8,7 @@
     <treeselect
       :multiple="multiple"
       :disable-branch-nodes="!multiple"
+      :disable-fuzzy-matching="true"
       :options="options"
       :load-options="loadOptions"
       placeholder="请选择项目以及账户"

+ 15 - 0
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -2011,6 +2011,21 @@ export default {
                     }
                     
             
+<<<<<<< HEAD
+=======
+                    this.incluedSelectedRowKeys=res.result.population?JSON.parse(res.result.population):[]
+                    this.excludeSelectedRowKeys=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]
+                    let selectedRow=[]
+                    // incluedSelectedRowKeys.forEach(item=>{
+                    //     selectedRow.push({
+                    //         accountId:this.accountId,
+                    //         key:item,
+                    //         id:item,
+                    //     })
+                       
+                    // })
+
+>>>>>>> master
                     
                     this.incluedSelectedRowKeys=res.result.population?JSON.parse(res.result.population):[]
                     this.excludeSelectedRowKeys=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]

+ 2 - 2
src/views/modules/autoLaunch/configLaunchList.vue

@@ -76,7 +76,7 @@
 
 <script>
 import moment from 'moment';
-import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
+import { getAction, postAction, downFile, downFilePost,deleteAction } from '@/api/manage';
 // import { JeecgListMixin } from '@/mixins/ipagination'
 // import editableCell from './editableCell'
 import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
@@ -216,7 +216,7 @@ export default {
         },
         deleteRecord(record){
             this.loading=true
-            postAction(this.url.delete,{
+            deleteAction(this.url.delete,{
                 id:record.id
             }).then(res=>{
                 this.loading=false

+ 1 - 0
src/views/modules/earlyWarningRules/pushTreeSelect.vue

@@ -8,6 +8,7 @@
     <treeselect
       :multiple="multiple"
       :disable-branch-nodes="!multiple"
+      :disable-fuzzy-matching="true"
       :options="options"
       :load-options="loadOptions"
       placeholder="请选择项目以及账户"

+ 65 - 22
src/views/modules/material/videoMaterial.vue

@@ -1016,12 +1016,19 @@ a {
               'modalityTagList', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请选择形式标签!' }] },
             ]"
-            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+            :props="{
+              multiple: true,
+              value: 'id',
+              label: 'tagName',
+              emitPath: false,
+              checkStrictly: true,
+              expandTrigger: 'hover',
+            }"
             filterable
             style="width: 100%"
           ></el-cascader>
         </a-form-item>
-        <a-form-item
+        <!-- <a-form-item
           :label-col="labelCol"
           :wrapper-col="{
             xs: { span: 24 },
@@ -1035,7 +1042,7 @@ a {
             :options="departTreeContent"
             class="only-video-material-disable-modal"
             v-decorator="[
-              'contentTagList', // 给表单赋值或拉取表单时,该input对应的key
+              'contentTagList',
               { rules: [{ required: true, message: '请选择内容标签!' }] },
             ]"
             :props="{
@@ -1049,7 +1056,7 @@ a {
             filterable
             style="width: 100%"
           ></el-cascader>
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item
           :label-col="labelCol"
           :wrapper-col="{
@@ -1066,7 +1073,14 @@ a {
               'senceTagList', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请选择场景标签!' }] },
             ]"
-            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+            :props="{
+              multiple: true,
+              value: 'id',
+              label: 'tagName',
+              emitPath: false,
+              checkStrictly: true,
+              expandTrigger: 'hover',
+            }"
             filterable
             style="width: 100%"
           ></el-cascader>
@@ -1087,7 +1101,14 @@ a {
               'modTagList', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请选择基调标签!' }] },
             ]"
-            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+            :props="{
+              multiple: true,
+              value: 'id',
+              label: 'tagName',
+              emitPath: false,
+              checkStrictly: true,
+              expandTrigger: 'hover',
+            }"
             filterable
             style="width: 100%"
           ></el-cascader>
@@ -1528,12 +1549,19 @@ a {
           placeholder="搜索你想要的形式标签"
           :options="departTreeModality"
           v-model="departValueInfoModality"
-          :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+          :props="{
+            multiple: true,
+            value: 'id',
+            label: 'tagName',
+            emitPath: false,
+            checkStrictly: true,
+            expandTrigger: 'hover',
+          }"
           filterable
           style="width: 100%"
         ></el-cascader>
       </a-form-item>
-      <a-form-item
+      <!-- <a-form-item
         :label-col="labelCol"
         :wrapper-col="{
           xs: { span: 24 },
@@ -1549,7 +1577,7 @@ a {
           filterable
           style="width: 100%"
         ></el-cascader>
-      </a-form-item>
+      </a-form-item> -->
       <a-form-item
         :label-col="labelCol"
         :wrapper-col="{
@@ -1562,7 +1590,14 @@ a {
           placeholder="搜索你想要的场景标签"
           :options="departTreeSence"
           v-model="departValueInfoSence"
-          :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+          :props="{
+            multiple: true,
+            value: 'id',
+            label: 'tagName',
+            emitPath: false,
+            checkStrictly: true,
+            expandTrigger: 'hover',
+          }"
           filterable
           style="width: 100%"
         ></el-cascader>
@@ -1579,7 +1614,14 @@ a {
           placeholder="搜索你想要的基调标签"
           :options="departTreeMod"
           v-model="departValueInfoMod"
-          :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+          :props="{
+            multiple: true,
+            value: 'id',
+            label: 'tagName',
+            emitPath: false,
+            checkStrictly: true,
+            expandTrigger: 'hover',
+          }"
           filterable
           style="width: 100%"
         ></el-cascader>
@@ -2389,7 +2431,8 @@ export default {
         code: md5,
       }).then((res) => {
         if (res.success) {
-          this.tagInfoList = [...res.modalityTagList, ...res.contentTagList, ...res.senceTagList, ...res.modTagList]
+          // ...res.contentTagList,
+          this.tagInfoList = [...res.modalityTagList, ...res.senceTagList, ...res.modTagList]
           if (this.tagInfoListVisible) {
             this.departValueInfoModality = res.modalityTagList.map((item) => {
               return item.tagId
@@ -2397,9 +2440,9 @@ export default {
             this.departValueInfoMod = res.modTagList.map((item) => {
               return item.tagId
             })
-            this.departValueInfoContent = res.contentTagList.map((item) => {
-              return item.tagId
-            })
+            // this.departValueInfoContent = res.contentTagList.map((item) => {
+            //   return item.tagId
+            // })
             this.departValueInfoSence = res.senceTagList.map((item) => {
               return item.tagId
             })
@@ -2784,7 +2827,7 @@ export default {
     },
     removeUpload() {
       this.form.setFieldsValue({
-        contentTagList: null,
+        // contentTagList: null,
         modalityTagList: null,
         modTagList: null,
         senceTagList: null,
@@ -2803,9 +2846,9 @@ export default {
         if (res.success) {
           if (res.modalityTagList.length > 0) {
             this.form.setFieldsValue({
-              contentTagList: res.contentTagList.map((item) => {
-                return item.tagId
-              }),
+              // contentTagList: res.contentTagList.map((item) => {
+              //   return item.tagId
+              // }),
               modalityTagList: res.modalityTagList.map((item) => {
                 return item.tagId
               }),
@@ -3008,7 +3051,7 @@ export default {
               item.roleCode == 'plan' ||
               item.roleCode == 'designTeamLeader' ||
               item.roleCode == 'shot' ||
-              item.roleCode == 'plane'||
+              item.roleCode == 'plane' ||
               item.roleCode == 'planeLeader'
             ) {
               return {
@@ -3023,7 +3066,7 @@ export default {
               item.roleCode == 'shot' ||
               item.roleCode == 'plan' ||
               item.roleCode == 'designTeamLeader' ||
-              item.roleCode == 'plane'||
+              item.roleCode == 'plane' ||
               item.roleCode == 'planeLeader'
             ) {
               return {
@@ -3038,7 +3081,7 @@ export default {
               item.roleCode == 'plan' ||
               item.roleCode == 'designTeamLeader' ||
               item.roleCode == 'clip' ||
-              item.roleCode == 'plane'||
+              item.roleCode == 'plane' ||
               item.roleCode == 'planeLeader'
             ) {
               return {

+ 2 - 2
src/views/modules/workBench/materialList.vue

@@ -1488,8 +1488,8 @@ export default {
 
         beforeUpload(file) {
 
-            // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)

+ 2 - 2
src/views/modules/workBench/orderDetail.vue

@@ -1869,9 +1869,9 @@ export default {
 
 
         beforeUpload(file) {
-            // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
             // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
 
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)

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

@@ -306,7 +306,7 @@
                         </div>
                         <div class="input-item"> 
                             <a-form-model-item ref="materialAmountDay"  prop="materialAmountDay">
-                                <a-input-number :min="1" :max="500"  @blur="materialAmountDayChange" v-model="form.materialAmountDay"  />
+                                <a-input-number  :max="500"  @blur="materialAmountDayChange" v-model="form.materialAmountDay"  />
                             </a-form-model-item>
                         </div>
                     </div>
@@ -647,7 +647,7 @@ export default {
                         startDate:this.dateValue[0].format('YYYY-MM-DD'),
                         endDate:this.dateValue[1].format('YYYY-MM-DD'),
                     };
-
+                    console.log(params)
                     if(!this.$parent.isEdit){
                         postAction('/platform/operator/payout',params).then(res=>{
                             console.log(res);
@@ -715,8 +715,8 @@ export default {
 
         beforeUpload(file) {
             // ${this.form.project}
-            // this.uploadAction= `http://api.tjyourong.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=${this.form.project}`
+            this.uploadAction= `http://api.tjyourong.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)
             const fileName = file.name

+ 2 - 2
vue.config.js

@@ -79,13 +79,13 @@ 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后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
-        target:'http://139.186.151.174:8804', //测试
+        // target:'http://139.186.151.174:8804', //测试
 
         ws: false,