Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

syh 5 gadi atpakaļ
vecāks
revīzija
7f506f15fd

+ 3 - 0
src/components/jeecg/JTreeSelect.vue

@@ -91,6 +91,7 @@
           this.treeValue = ""
           this.treeValue = ""
         } else {
         } else {
           getAction(`${this.view}${this.dict}`, {key: this.value}).then(res => {
           getAction(`${this.view}${this.dict}`, {key: this.value}).then(res => {
+              console.log(res.result)
             if (res.success) {
             if (res.success) {
               this.treeValue = {
               this.treeValue = {
                 key: this.value,
                 key: this.value,
@@ -166,8 +167,10 @@
         }
         }
         getAction(this.url, param).then(res => {
         getAction(this.url, param).then(res => {
           if (res.success && res.result) {
           if (res.success && res.result) {
+              console.log(res.result)
             for (let i of res.result) {
             for (let i of res.result) {
               i.value = i.key
               i.value = i.key
+            //   i.disabled = true
               if (i.leaf == false) {
               if (i.leaf == false) {
                 i.isLeaf = false
                 i.isLeaf = false
               } else if (i.leaf == true) {
               } else if (i.leaf == true) {

+ 208 - 0
src/components/jeecg/noParentTreeSelect.vue

@@ -0,0 +1,208 @@
+<template>
+  <a-tree-select
+    allowClear
+    labelInValue
+    style="width: 100%"
+    :disabled="disabled"
+    :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+    :placeholder="placeholder"
+    :loadData="asyncLoadTreeData"
+    :value="treeValue"
+    :treeData="treeData"
+    @change="onChange"
+    @search="onSearch">
+  </a-tree-select>
+</template>
+<script>
+
+  /*
+  * 异步树加载组件 通过传入表名 显示字段 存储字段 加载一个树控件
+  * <j-tree-select dict="aa_tree_test,aad,id" pid-field="pid" ></j-tree-select>
+  * */
+  import {getAction} from '@/api/manage'
+
+  export default {
+    name: 'JTreeSelect',
+    props: {
+      value: {
+        type: String,
+        required: false
+      },
+      placeholder: {
+        type: String,
+        default: '请选择',
+        required: false
+      },
+      dict: {
+        type: String,
+        default: '',
+        required: false
+      },
+      pidField: {
+        type: String,
+        default: 'pid',
+        required: false
+      },
+      pidValue: {
+        type: String,
+        default: '0',
+        required: false
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      hasChildField: {
+        type: String,
+        default: '',
+        required: false
+      }
+    },
+    data() {
+      return {
+        treeValue: "",
+        treeData: [],
+        url: "/sys/dict/loadTreeData",
+        view: '/sys/dict/loadDictItem/',
+        tableName: "",
+        text: "",
+        code: "",
+
+      }
+    },
+    watch: {
+      value() {
+        this.loadItemByCode()
+      },
+      dict() {
+        this.initDictInfo()
+        this.loadRoot();
+      }
+    },
+    created() {
+      this.initDictInfo()
+      this.loadRoot()
+      this.loadItemByCode()
+    },
+    methods: {
+      loadItemByCode() {
+        if (!this.value || this.value == "0") {
+          this.treeValue = ""
+        } else {
+          getAction(`${this.view}${this.dict}`, {key: this.value}).then(res => {
+            if (res.success) {
+              this.treeValue = {
+                key: this.value,
+                value: this.value,
+                label: res.result
+              }
+            }
+          })
+        }
+      },
+      initDictInfo() {
+        let arr = this.dict.split(",")
+        this.tableName = arr[0]
+        this.text = arr[1]
+        this.code = arr[2]
+      },
+      asyncLoadTreeData(treeNode) {
+        return new Promise((resolve) => {
+          if (treeNode.$vnode.children) {
+            resolve()
+            return
+          }
+          let pid = treeNode.$vnode.key
+          let param = {
+            pid: pid,
+            tableName: this.tableName,
+            text: this.text,
+            code: this.code,
+            pidField: this.pidField,
+            hasChildField: this.hasChildField
+          }
+          getAction(this.url, param).then(res => {
+            if (res.success) {
+              for (let i of res.result) {
+                i.value = i.key
+                if (i.leaf == false) {
+                  i.isLeaf = true
+                } else if (i.leaf == true) {
+                  i.isLeaf = true
+                }
+              }
+              this.addChildren(pid, res.result, this.treeData)
+              this.treeData = [...this.treeData]
+            }
+            resolve()
+          })
+        })
+      },
+      addChildren(pid, children, treeArray) {
+        if (treeArray && treeArray.length > 0) {
+          for (let item of treeArray) {
+            if (item.key == pid) {
+              if (!children || children.length == 0) {
+                item.isLeaf = true
+              } else {
+                item.children = children
+              }
+              break
+            } else {
+              this.addChildren(pid, children, item.children)
+            }
+          }
+        }
+      },
+      loadRoot() {
+        let param = {
+          pid: this.pidValue,
+          tableName: this.tableName,
+          text: this.text,
+          code: this.code,
+          pidField: this.pidField,
+          hasChildField: this.hasChildField
+        }
+        getAction(this.url, param).then(res => {
+          if (res.success && res.result) {
+              console.log(res.result)
+            for (let i of res.result) {
+              i.value = i.key
+              i.disabled = true
+              if (i.leaf == false) {
+                i.isLeaf = false
+              } else if (i.leaf == true) {
+                i.isLeaf = true
+              }
+            }
+            this.treeData = [...res.result]
+          } else {
+            console.log("数根节点查询结果-else", res)
+          }
+        })
+      },
+      onChange(value) {
+        if (!value) {
+          this.$emit('change', '');
+          this.treeValue = ''
+        } else {
+          this.$emit('change', value.value);
+          this.treeValue = value
+        }
+
+      },
+      onSearch(value) {
+        console.log(value)
+      },
+      getCurrTreeData() {
+        return this.treeData
+      }
+    },
+    //2.2新增 在组件内定义 指定父组件调用时候的传值属性和事件类型 这个牛逼
+    model: {
+      prop: 'value',
+      event: 'change'
+    }
+  }
+</script>

+ 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">
             <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.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 }}
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
             </a-select-option>
           </a-select>
           </a-select>

+ 2 - 2
src/views/modules/Statistics/components/selecTable.vue

@@ -30,7 +30,7 @@
         :scroll="{ y: 300 }"
         :scroll="{ y: 300 }"
         :customRow="rowClick"
         :customRow="rowClick"
       >
       >
-        <span slot="mediaId" slot-scope="text">{{ text == '1' ? '头条' : '快手' }}</span>
+        <span slot="mediaId" slot-scope="text">{{ text == '1' ? '头条' : text == '2'? '快手':text == '3'?'头条内广':'快手内广' }}</span>
       </a-table>
       </a-table>
     </div>
     </div>
   </a-form-item>
   </a-form-item>
@@ -120,7 +120,7 @@ export default {
         // 事件
         // 事件
         on: {
         on: {
           click: () => {
           click: () => {
-            var str = record.mediaId == '1' ? '头条' : '快手'
+            var str = record.mediaId == '1' ? '头条' : record.mediaId == '2'? '快手':record.mediaId == '3'?'头条内广':'快手内广'
             this.keyValue = record.projectName + ' ' + str
             this.keyValue = record.projectName + ' ' + str
             this.topMiddle = false
             this.topMiddle = false
             this.data = this.dataElse
             this.data = this.dataElse

+ 16 - 8
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -49,11 +49,11 @@
           <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
           <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
           <ul class="selectlist">
           <ul class="selectlist">
             <li v-for="(item,index) in listNum" :key="index">
             <li v-for="(item,index) in listNum" :key="index">
-              <span v-if=" index <4">
+              <span v-if=" index <5">
                 <a-icon type="lock" />
                 <a-icon type="lock" />
                 <span class="listText">{{item.title}}</span>
                 <span class="listText">{{item.title}}</span>
               </span>
               </span>
-              <span v-else-if=" index >=4">
+              <span v-else-if=" index >=5">
                 <a-icon type="menu" style="color:#ccc" />
                 <a-icon type="menu" style="color:#ccc" />
                 <span class="listText">{{item.title}}</span>
                 <span class="listText">{{item.title}}</span>
                 <a-icon
                 <a-icon
@@ -166,6 +166,13 @@ const columnsFixd = [
     key: 'videoU',
     key: 'videoU',
     scopedSlots: { customRender: 'videoU' }
     scopedSlots: { customRender: 'videoU' }
   },
   },
+   {
+    title: '项目名称',
+    dataIndex: 'projectName',
+    align: 'center',
+    width: 100,
+    fixed: 'left'
+  },
   {
   {
     title: '视频ID',
     title: '视频ID',
     dataIndex: 'signature',
     dataIndex: 'signature',
@@ -446,7 +453,7 @@ export default {
       }
       }
 
 
       // console.log(this.columns.length)
       // console.log(this.columns.length)
-      if (this.columns.length == 3) {
+      if (this.columns.length == 4) {
         // console.log(this.listNum.length)
         // console.log(this.listNum.length)
         this.columns.map((item, index) => {
         this.columns.map((item, index) => {
           item.width = 500
           item.width = 500
@@ -456,7 +463,7 @@ export default {
         this.columns.map((item, index) => {
         this.columns.map((item, index) => {
           if (index == 1||index==2) {
           if (index == 1||index==2) {
             item.width = 150
             item.width = 150
-          } else if (index >= 2 && index < 4 || index == 0) {
+          } else if (index >= 2 && index < 5 || index == 0) {
             item.width = 100
             item.width = 100
           }
           }
         })
         })
@@ -527,8 +534,9 @@ export default {
       // console.log(res)
       // console.log(res)
       if(res.success){
       if(res.success){
       // console.log(JSON.parse(res.result))
       // console.log(JSON.parse(res.result))
-      let columns=JSON.parse(res.result)
-      if(columns.length){
+      if(res.result){
+        let columns=JSON.parse(res.result)
+        if(columns.length){
            columns.map((item,index)=>{
            columns.map((item,index)=>{
              if(index>columnsFixd.length-1){
              if(index>columnsFixd.length-1){
                  item.sorter=function(a,b){  return a[item.dataIndex]-b[item.dataIndex]}
                  item.sorter=function(a,b){  return a[item.dataIndex]-b[item.dataIndex]}
@@ -537,10 +545,10 @@ export default {
             this.columns=[...columnsFixd,...columns]
             this.columns=[...columnsFixd,...columns]
             this.tableHandle()
             this.tableHandle()
         }
         }
-           
-        
         // console.log(this.columns)
         // console.log(this.columns)
       }
       }
+      }
+      
 
 
     })
     })
   },
   },

+ 31 - 22
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -51,11 +51,11 @@
           <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
           <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
           <ul class="selectlist">
           <ul class="selectlist">
             <li v-for="(item,index) in listNum" :key="index">
             <li v-for="(item,index) in listNum" :key="index">
-              <span v-if=" index <5">
+              <span v-if=" index <6">
                 <a-icon type="lock" />
                 <a-icon type="lock" />
                 <span class="listText">{{item.title}}</span>
                 <span class="listText">{{item.title}}</span>
               </span>
               </span>
-              <span v-else-if=" index >=5">
+              <span v-else-if=" index >=6">
                 <a-icon type="menu" style="color:#ccc" />
                 <a-icon type="menu" style="color:#ccc" />
                 <span class="listText">{{item.title}}</span>
                 <span class="listText">{{item.title}}</span>
                 <a-icon
                 <a-icon
@@ -200,6 +200,13 @@ const columnsFixd = [
     width: 100,
     width: 100,
     fixed: 'left'
     fixed: 'left'
   },
   },
+   {
+    title: '项目名称',
+    dataIndex: 'projectName',
+    align: 'center',
+    width: 100,
+    fixed: 'left'
+  },
 //   {
 //   {
 //     title: '视频链接',
 //     title: '视频链接',
 //     dataIndex: 'videoUrl',
 //     dataIndex: 'videoUrl',
@@ -311,24 +318,24 @@ let detailConsum = [
       return obj
       return obj
     }
     }
   },
   },
-  {
-    title: '视频链接',
-    dataIndex: 'url',
-    align: 'center',
-    width:250,
-    customRender: (value, row, index) => {
-      const obj = {
-        children: value,
-        attrs: {}
-      }
-      if (index === 0) {         
-              obj.attrs.rowSpan = length     
-      } else {
-        obj.attrs.rowSpan = 0
-      }
-      return obj
-    }
-  },
+//   {
+//     title: '视频链接',
+//     dataIndex: 'url',
+//     align: 'center',
+//     width:250,
+//     customRender: (value, row, index) => {
+//       const obj = {
+//         children: value,
+//         attrs: {}
+//       }
+//       if (index === 0) {         
+//               obj.attrs.rowSpan = length     
+//       } else {
+//         obj.attrs.rowSpan = 0
+//       }
+//       return obj
+//     }
+//   },
   {
   {
     title: '时间',
     title: '时间',
     dataIndex: 'statDatetime',
     dataIndex: 'statDatetime',
@@ -601,7 +608,7 @@ export default {
 
 
       
       
 
 
-      if (this.listNum.length == 5) {
+      if (this.listNum.length == 6) {
         this.columns.map((item, index) => {
         this.columns.map((item, index) => {
           item.width = 300
           item.width = 300
         })
         })
@@ -609,7 +616,7 @@ export default {
         this.columns.map((item, index) => {
         this.columns.map((item, index) => {
           if (index == 1||index==3) {
           if (index == 1||index==3) {
             item.width = 150
             item.width = 150
-          } else if (index >= 2 && index < 5 || index == 0) {
+          } else if (index >= 2 && index < 6 || index == 0) {
             item.width = 100
             item.width = 100
           }
           }
         })
         })
@@ -715,6 +722,7 @@ export default {
       // console.log(res)
       // console.log(res)
       if(res.success){
       if(res.success){
       // console.log(JSON.parse(res.result))
       // console.log(JSON.parse(res.result))
+      if(res.result){
       let columns=JSON.parse(res.result)
       let columns=JSON.parse(res.result)
       if(columns.length){
       if(columns.length){
         if(columns.length>=columnsFixd.length){
         if(columns.length>=columnsFixd.length){
@@ -730,6 +738,7 @@ export default {
         
         
         // console.log(this.columns)
         // console.log(this.columns)
       }
       }
+      }
      
      
       }
       }
 
 

+ 10 - 3
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -56,11 +56,11 @@
           <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
           <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
           <ul class="selectlist">
           <ul class="selectlist">
             <li v-for="(item,index) in listNum" :key="index">
             <li v-for="(item,index) in listNum" :key="index">
-              <span v-if=" index <3">
+              <span v-if=" index <4">
                 <a-icon type="lock" />
                 <a-icon type="lock" />
                 <span class="listText">{{item.title}}</span>
                 <span class="listText">{{item.title}}</span>
               </span>
               </span>
-              <span v-else-if=" index >=3">
+              <span v-else-if=" index >=4">
                 <a-icon type="menu" style="color:#ccc" />
                 <a-icon type="menu" style="color:#ccc" />
                 <span class="listText">{{item.title}}</span>
                 <span class="listText">{{item.title}}</span>
                 <a-icon
                 <a-icon
@@ -199,6 +199,13 @@ const columnsFixd = [
     fixed: 'left'
     fixed: 'left'
   },
   },
   {
   {
+    title: '项目名称',
+    dataIndex: 'projectName',
+    align: 'center',
+    width: 100,
+    fixed: 'left'
+  },
+  {
     title: '视频描述',
     title: '视频描述',
     dataIndex: 'materialDesc',
     dataIndex: 'materialDesc',
     align: 'center',
     align: 'center',
@@ -493,7 +500,7 @@ export default {
         this.columns = [...this.listNum]
         this.columns = [...this.listNum]
       }
       }
 
 
-      if (this.listNum.length == 3) {
+      if (this.listNum.length == 4) {
         // console.log(this.listNum.length)
         // console.log(this.listNum.length)
         this.scrollX = 0
         this.scrollX = 0
         this.columns.map((item, index) => {
         this.columns.map((item, index) => {

+ 13 - 4
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -51,11 +51,11 @@
           <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
           <a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
           <ul class="selectlist">
           <ul class="selectlist">
             <li v-for="(item,index) in listNum" :key="index">
             <li v-for="(item,index) in listNum" :key="index">
-              <span v-if=" index <5">
+              <span v-if=" index <6">
                 <a-icon type="lock" />
                 <a-icon type="lock" />
                 <span class="listText">{{item.title}}</span>
                 <span class="listText">{{item.title}}</span>
               </span>
               </span>
-              <span v-else-if=" index >=5">
+              <span v-else-if=" index >=6">
                 <a-icon type="menu" style="color:#ccc" />
                 <a-icon type="menu" style="color:#ccc" />
                 <span class="listText">{{item.title}}</span>
                 <span class="listText">{{item.title}}</span>
                 <a-icon
                 <a-icon
@@ -200,6 +200,13 @@ const columnsFixd = [
     width: 100,
     width: 100,
     fixed: 'left'
     fixed: 'left'
   },
   },
+  {
+    title: '项目名称',
+    dataIndex: 'projectName',
+    align: 'center',
+    width: 100,
+    fixed: 'left'
+  },
 //   {
 //   {
 //     title: '视频链接',
 //     title: '视频链接',
 //     dataIndex: 'url',
 //     dataIndex: 'url',
@@ -588,7 +595,7 @@ export default {
       }
       }
 
 
 
 
-      if (this.listNum.length == 5) {
+      if (this.listNum.length == 6) {
         this.columns.map((item, index) => {
         this.columns.map((item, index) => {
           item.width = 300
           item.width = 300
         })
         })
@@ -596,7 +603,7 @@ export default {
         this.columns.map((item, index) => {
         this.columns.map((item, index) => {
           if (index == 1||index==3) {
           if (index == 1||index==3) {
             item.width = 150
             item.width = 150
-          } else if (index >= 2 && index < 5 || index == 0) {
+          } else if (index >= 2 && index < 6 || index == 0) {
             item.width = 100
             item.width = 100
           }
           }
         })
         })
@@ -700,6 +707,7 @@ export default {
     }).then((res)=>{
     }).then((res)=>{
       // console.log(res)
       // console.log(res)
       if(res.success){
       if(res.success){
+      if(res.result){
       // console.log(JSON.parse(res.result))
       // console.log(JSON.parse(res.result))
       let columns=JSON.parse(res.result)
       let columns=JSON.parse(res.result)
       if(columns.length){
       if(columns.length){
@@ -717,6 +725,7 @@ export default {
         // console.log(this.columns)
         // console.log(this.columns)
       }
       }
       }
       }
+      }
 
 
     })
     })
   },
   },

+ 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">
             <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.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 }}
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
             </a-select-option>
           </a-select>
           </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">
             <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.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 }}
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
             </a-select-option>
           </a-select>
           </a-select>

+ 16 - 1
src/views/modules/advertiser/ProjectList.vue

@@ -40,6 +40,19 @@
                 </a-select>
                 </a-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :md="6" :sm="6">
+            <a-form-item label="行业">
+                <j-tree-select
+                    v-model="queryParam.industryId"
+                    ref="treeSelect"
+                    placeholder="请选择行业"
+                    dict="sys_category,name,id"
+                    pidField="pid"
+                    pidValue="f5cb2d2d28417b3b65a6dd744bcb9a76"
+                >
+                </j-tree-select>
+                </a-form-item>
+            </a-col>
           </template>
           </template>
           <a-col :md="6" :sm="8">
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -87,6 +100,7 @@
 
 
 <script>
 <script>
   import ProjectModal from './modules/ProjectModal'
   import ProjectModal from './modules/ProjectModal'
+  import JTreeSelect from '@/components/jeecg/JTreeSelect'
   import {
   import {
     httpAction,
     httpAction,
     getAction
     getAction
@@ -99,7 +113,8 @@
     name: 'ProjectList',
     name: 'ProjectList',
     mixins: [JeecgListMixin],
     mixins: [JeecgListMixin],
     components: {
     components: {
-      ProjectModal
+      ProjectModal,
+      JTreeSelect
     },
     },
     data() {
     data() {
       return {
       return {

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

@@ -36,7 +36,8 @@
               <a-select v-model="queryParam.projectId" showSearch optionFilterProp="children"
               <a-select v-model="queryParam.projectId" showSearch optionFilterProp="children"
                 :filterOption="filterOption">
                 :filterOption="filterOption">
                 <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
                 <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
                     item.projectName
                   }}
                   }}
                 </a-select-option>
                 </a-select-option>

+ 1 - 1
src/views/modules/advertiser/modules/AdvertiserModal.vue

@@ -59,7 +59,7 @@
     getAction
     getAction
   } from '@/api/manage'
   } from '@/api/manage'
   import pick from 'lodash.pick'
   import pick from 'lodash.pick'
-  import JTreeSelect from '@/components/jeecg/JTreeSelect'
+  import JTreeSelect from '@/components/jeecg/noParentTreeSelect'
   import moment from "moment"
   import moment from "moment"
   import {
   import {
     mapGetters
     mapGetters

+ 1 - 1
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -123,7 +123,7 @@ import pick from 'lodash.pick'
 import moment from 'moment'
 import moment from 'moment'
 import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
 import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
 import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
 import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
-import JTreeSelect from '@/components/jeecg/JTreeSelect'
+import JTreeSelect from '@/components/jeecg/noParentTreeSelect'
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
 export default {
 export default {
   name: 'ProjectModal',
   name: 'ProjectModal',

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

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

+ 1 - 1
src/views/modules/kuaishouapp/account/accountIndex.vue

@@ -12,7 +12,7 @@
   <div class="account-index">
   <div class="account-index">
     <a-row class="image-list-heading vm-panel">
     <a-row class="image-list-heading vm-panel">
       <a-col :span="24" style="display:flex">
       <a-col :span="24" style="display:flex">
-        <Treeselect :appId.sync="appId" :multiple="false" ref="treeSelect" style="margin:8px 20px" />
+        <Treeselect :appId.sync="appId"  :multiple="false" request="2,4" ref="treeSelect" style="margin:8px 20px" />
         <a-button type="primary" style="margin:10px" @click="addUser">搜索</a-button>
         <a-button type="primary" style="margin:10px" @click="addUser">搜索</a-button>
       </a-col>
       </a-col>
     </a-row>
     </a-row>

+ 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">
             <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.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 }}
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
             </a-select-option>
           </a-select>
           </a-select>

+ 2 - 2
vue.config.js

@@ -67,10 +67,10 @@ module.exports = {
         // 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://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.13: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.1.103:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
-        target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
+        // target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.165:8080', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8080', //请求本地 需要jeecg-boot后台项目  毕洁泉
         ws: false,
         ws: false,
         changeOrigin: true
         changeOrigin: true