浏览代码

提交代码,上线

zhuxinbo 5 年之前
父节点
当前提交
cd61eb5ad1

+ 1 - 1
src/views/modules/Statistics/caicaicai/dayStatistics.vue

@@ -78,7 +78,7 @@ th div {
           >
             <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
               {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-                item.mediaId == '1' ? '头条' : '快手'
+                item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
           </a-select>

+ 1 - 1
src/views/modules/Statistics/yicheStatistics/dayStatistics.vue

@@ -78,7 +78,7 @@ th div {
           >
             <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
               {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-                item.mediaId == '1' ? '头条' : '快手'
+                item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
           </a-select>

+ 1 - 1
src/views/modules/Statistics/yicheStatistics/timeStatistics.vue

@@ -78,7 +78,7 @@ th div {
           >
             <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
               {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-                item.mediaId == '1' ? '头条' : '快手'
+                item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
           </a-select>

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

@@ -36,7 +36,8 @@
               <a-select v-model="queryParam.projectId" showSearch optionFilterProp="children"
                 :filterOption="filterOption">
                 <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
-                  {{ item.mediaId == '1' ? '头条' : '快手' }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
+                  {{ item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
+                   }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
                     item.projectName
                   }}
                 </a-select-option>

+ 2 - 0
src/views/modules/advertiser/modules/UserAllocationModal.vue

@@ -48,6 +48,8 @@
           <a-select v-decorator="['mediaId', {}]" disabled>
             <a-select-option value="1">头条</a-select-option>
             <a-select-option value="2">快手</a-select-option>
+            <a-select-option value="3">头条内广</a-select-option>
+            <a-select-option value="4">快手内广</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="系统名称" :labelCol="labelCol" :wrapperCol="wrapperCol">

+ 1 - 1
src/views/modules/material/videoMaterial.vue

@@ -672,7 +672,7 @@ a {
           >
             <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
               {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-                item.mediaId == '1' ? '头条' : '快手'
+               item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
           </a-select>

+ 2 - 2
vue.config.js

@@ -64,10 +64,10 @@ module.exports = {
          }
        },*/
       '/jeecg-boot': {
-        target: 'http://39.97.120.42:8080', //请求本地 需要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://192.168.1.22:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        target: 'http://192.168.1.22: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.54:8080', //请求本地 需要jeecg-boot后台项目  孙震