zhuxinbo 5 rokov pred
rodič
commit
92b3dcf1d0

+ 10 - 1
src/utils/request.js

@@ -21,6 +21,9 @@ const service = axios.create({
   timeout: 6000000 // 请求超时时间
 })
 
+
+
+
 const err = (error) => {
   if (error.esponse) {
     let data = error.response.data
@@ -101,7 +104,13 @@ service.interceptors.request.use(config => {
 // response interceptor
 service.interceptors.response.use((response) => {
   return response.data
-}, err)
+}, (error) => {
+    notification.error({
+        message: '系统提示',
+        description: '网络超时'
+      })
+    return 
+  })
 
 const installer = {
   vm: {},

+ 248 - 169
src/views/modules/BatchCreate/MultiCheckBox.vue

@@ -1,188 +1,267 @@
 <template>
-    <div class="multiCheckbox" >
-        <div class="linkMulti_list" ref="mycheckMul">
-            <div class="title">{{title}}</div>
-            <ul class="linkMulti_list_one">
-                <li class="checkAll"><a-checkbox :indeterminate="indeterminate" :checked="checkAll" @change="onCheckAllChange"> 全选</a-checkbox> </li>
-                <li @click="listItemClick(item)" v-for="(item,index) in listArr" :key='index' :data-layers='curLayerNum' ref="checkList">
-                    <a-checkbox   @change="onChange($event,item,index)" :value='item.value' :checked='item.checked' :data-layers='curLayerNum'>{{item.name}}</a-checkbox>
-                    <!-- <span>{{item.name}}</span>                        -->
-                    <span class="more" v-show="item.children"><a-icon type="right" /></span>
-                </li>                    
-            </ul>                               
-        </div> 
-        <!-- <MultiCheckBox class="childClass"  :title='currentItem.name'  :listArr='currentItem.children'  v-if="currentItem" :curLayerNum='currentLayerNum'  />      -->
-    </div>    
+  <div class="multiCheckbox">
+    <div class="linkMulti_list" ref="mycheckMul">
+      <div class="title">{{title}}</div>
+      <ul class="linkMulti_list_one">
+        <li class="checkAll">
+          <a-checkbox :indeterminate="indeterminate" :checked="checkAll" @change="onCheckAllChange">全选</a-checkbox>
+        </li>
+        <li @click.stop="listItemClick($event,item)" v-for="(item,index) in listArr" :key="index"
+          :data-layers="curLayerNum" ref="checkList">
+          <a-checkbox @change="onChange($event,item,index)" :value="item.value" :checked="item.checked"
+            @click.stop="listItemClick($event,item)">{{item.name}}</a-checkbox>
+          <!-- <span>{{item.name}}</span>                        -->
+          <span class="more" v-show="item.children">
+            <a-icon type="right" />
+          </span>
+        </li>
+      </ul>
+    </div>
+    <!-- <MultiCheckBox class="childClass"  :title='currentItem.name'  :listArr='currentItem.children'  v-if="currentItem" :curLayerNum='currentLayerNum'  />      -->
+  </div>
 </template>
 
 <script>
+  export default {
+    name: 'MultiCheckBox',
+    props: {
+      title: {
+        type: String
+      },
+      listArr: {
+        type: Array,
+        default () {
+          return []
+        }
+      },
+      curLayerNum: {
+        type: Number,
+        default () {
+          return 1
+        }
+      },
+      parentChecked: {
+        type: Boolean,
+        default () {
+          return false
+        }
+      }
+    },
+    data() {
+      return {
+        checkedList: [],
+        indeterminate: false,
+        checkAll: false,
+        plainOptions: [],
+        layersNum: 0, //控制层级
+        currentLayerNum: 0, //当前层级是多少层,
+        currentItem: null
+      }
+    },
+    watch: {
+      checkAll: function (n, o) {
+        if (n != o) {
+          // this.onCheckAllChange()
+        }
+      },
+      // listArr(n,o){
+      //     this.listArr.forEach(element => {
 
-    export default {
-        name:'MultiCheckBox',
-        props:['title','listArr','curLayerNum'],
-        data() {
-            return {
-                checkedList: [],
-                indeterminate: false,
-                checkAll: false,
-                plainOptions:[],
-                layersNum:0,//控制层级
-                currentLayerNum:0,//当前层级是多少层,
-                currentItem:null,
-            }
+      //         this.plainOptions.push(element.value);
+      //         if(element.checked){
+      //             this.checkedList.push(element.value)
+      //         }
+      //     });
+      //     if(this.checkedList.length==this.plainOptions.length){
+      //         this.checkAll=true;
+      //     }
+      // },
+
+      parentChecked: {
+        handler(n, o) {
+          console.log(n, o, '--parentChecked', this.curLayerNum)
+          if (n) {
+            this.checkAll = true
+            this.listArr.forEach((item, index) => {
+              item.checked = n
+              this.checkedList.push(item.value)
+            })
+          } else if (n == false && o == true) {
+            this.checkAll = false
+            this.listArr.forEach((item, index) => {
+              item.checked = n
+            })
+            this.checkedList = []
+          }
         },
-        watch: {
-            checkAll:function(n,o){
-                if(n!=o){
-                    // this.onCheckAllChange()
-                }
+        immediate: true,
+        deep: true
+      }
+    },
+    methods: {
+      onChange(e, item, index) {
+        // console.log(e.target,item)
+
+        if (e.target.checked) {
+          // item.checked=true;
+          this.listArr.forEach((ele, i) => {
+            if (index == i) {
+              this.$set(ele, 'checked', e.target.checked)
+              this.checkedList.push(e.target.value)
             }
-        },
-        methods: {
-            onChange(e,item,index) {
-                console.log(e.target,item)
-                if(e.target.checked){
-                    // item.checked=true;
-                    this.listArr.forEach((ele,i)=>{
-                        if(index==i){
-                           this.$set(ele,'checked',true)
-                        }
-                    })
-                    
-                    this.checkedList.push(e.target.value)
-                    
-                }else{
-                    this.listArr.forEach((ele,i)=>{
-                        if(index==i){
-                           this.$set(ele,'checked',false)
-                        }
-                    })
-                    
-                    
-                    let num=this.checkedList.indexOf(e.target.value);
-                    if(num > -1){
-                        this.checkedList.splice(num,1)
-                    }
-                }
-                this.indeterminate = !!this.checkedList.length && this.checkedList.length < this.plainOptions.length;
-                this.checkAll = this.checkedList.length === this.plainOptions.length;
-                this.listItemClick(item);
-            },
-            onCheckAllChange(e) {
-                Object.assign(this, {
-                    checkedList: e.target.checked ? this.plainOptions : [],
-                    indeterminate: false,
-                    checkAll: e.target.checked,
-                });
-                if(this.checkedList.length){
-                    this.listArr.forEach((item)=>{
-                        this.$set(item,'checked',true)
-                    })
-                }else{
-                    this.listArr.forEach((item)=>{
-                       this.$set(item,'checked',false)
-                   })
-                }
-            },
-            listItemClick(item){
-               
-                    this.$emit('getItemData',{
-                        'clickObj':event.target,
-                        'data':item,
-                        
-                    })
-                
-                
-            },
-            // checkItemChange(e){
-            //     console.log(e.target.checked);
-            //     // if(e.target.checked){
-
-            //     // }   
-            // },
-            //判断传入的数组的children层数
-            getLayersNum(arr){
-                arr.map((item,index)=>{
-                    if(item.children){
-
-                    }
-                })
+          })
+        } else {
+          this.listArr.forEach((ele, i) => {
+            if (index == i) {
+              this.$set(ele, 'checked', e.target.checked)
             }
-        },
-        mounted() {
-            this.currentLayerNum=this.curLayerNum;
-           
-            this.listArr.forEach(element => {
-                
-                this.plainOptions.push(element.value);
-                if(element.checked){
-                    this.checkedList.push(element.value)
-                }
-            });
-            if(this.checkedList.length==this.plainOptions.length){
-                this.checkAll=true;
+          })
+
+          let num = this.checkedList.indexOf(e.target.value)
+          if (num > -1) {
+            this.checkedList.splice(num, 1)
+          }
+        }
+        this.indeterminate = !!this.checkedList.length && this.checkedList.length < this.plainOptions.length
+        this.checkAll = this.checkedList.length === this.plainOptions.length
+        // this.listItemClick(item);
+      },
+      onCheckAllChange(e) {
+        Object.assign(this, {
+          checkedList: e.target.checked ? this.plainOptions : [],
+          indeterminate: false,
+          checkAll: e.target.checked
+        })
+        if (this.checkedList.length) {
+          this.listArr.forEach(item => {
+            this.$set(item, 'checked', true)
+          })
+        } else {
+          this.listArr.forEach(item => {
+            this.$set(item, 'checked', false)
+          })
+        }
+      },
+      listItemClick(event, item) {
+        console.log(item)
+        this.$emit('getItemData', {
+          clickObj: event.target,
+          data: item
+        })
+      },
+      // checkItemChange(e){
+      //     console.log(e.target.checked);
+      //     // if(e.target.checked){
+
+      //     // }
+      // },
+      //判断传入的数组的children层数
+      getLayersNum(arr) {
+        arr.map((item, index) => {
+          if (item.children) {}
+        })
+      }
+    },
+    mounted() {
+      this.currentLayerNum = this.curLayerNum
+
+      this.listArr.forEach(element => {
+        this.plainOptions.push(element.value)
+        if (element.checked) {
+          this.checkedList.push(element.value)
+        }
+      })
+      if (this.checkedList.length == this.plainOptions.length) {
+        this.checkAll = true
+      }
+      // console.log(this.checkedList)
+      // console.log(this.curLayerNum)
+
+      // console.log(this.parentChecked)
+
+      console.log(this.$refs.checkList)
+      if (this.$refs.checkList) {
+        let refsCheckListArr = Array.from(this.$refs.checkList)
+        refsCheckListArr.forEach((item, index) => {
+          let nodeArr = Array.from(item.children[0].children)
+          // console.log(nodeArr)
+          nodeArr.forEach((ele, i) => {
+            if (i == 0) {
+              let nodeArr2 = Array.from(ele.children)
+              console.log(nodeArr2)
+              nodeArr2.forEach(element => {
+                element.dataset['layers'] = this.curLayerNum
+              })
+            } else {
+              ele.dataset['layers'] = this.curLayerNum
             }
-            console.log(this.checkedList)
-            // console.log(this.curLayerNum)
-        },
+          })
+        })
+      }
     }
+  }
 </script>
 
 <style lang="scss" scoped>
-.multiCheckbox{   
-    width:100%;   
+  .multiCheckbox {
+    width: 100%;
     height: 300px;
-    ul,li{
-        margin: 0;
-        padding: 0;
-        list-style: none;
+
+    ul,
+    li {
+      margin: 0;
+      padding: 0;
+      list-style: none;
     }
-    .linkMulti_list{
-        // padding: 5px 0px;
-        display: inline-block;
-        width: 100%;
-        height: 100%;
-        box-sizing: border-box;       
-        overflow: hidden;   
-        .title{
-            height: 36px;
-            line-height: 36px;
-            font-size: 14px;
-            font-weight: 600;
-            border-radius: 5px 5px 0 0;
-            background-color: rgb(248,249,250);
-            padding: 0 15px;
-            border-bottom: 1px solid #ccc;
-            box-sizing: border-box;    
-        }
-        ul{
-            height: 264px;
-            overflow: auto;
-        }
-        .checkAll{
-            
-        }
-        li{
-            height: 30px;
-            line-height: 30px;
-            cursor: pointer;
-            padding: 0 15px;
-            position: relative;
-            .more{
-                position:absolute;
-                top: 2px;
-                right: 10px;
-            }
-        }
-        li:hover{
-            background-color: rgb(240,240,240);
+
+    .linkMulti_list {
+      // padding: 5px 0px;
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+      box-sizing: border-box;
+      overflow: hidden;
+
+      .title {
+        height: 36px;
+        line-height: 36px;
+        font-size: 14px;
+        font-weight: 600;
+        border-radius: 5px 5px 0 0;
+        background-color: rgb(248, 249, 250);
+        padding: 0 15px;
+        border-bottom: 1px solid #ccc;
+        box-sizing: border-box;
+      }
+
+      ul {
+        height: 264px;
+        overflow: auto;
+      }
+
+      .checkAll {}
+
+      li {
+        height: 30px;
+        line-height: 30px;
+        cursor: pointer;
+        padding: 0 15px;
+        position: relative;
+
+        .more {
+          position: absolute;
+          top: 2px;
+          right: 10px;
         }
-    
-    }
-    .ant-checkbox-group{
-        width: 100%;
-    }
-}
+      }
 
+      li:hover {
+        background-color: rgb(240, 240, 240);
+      }
+    }
 
+    .ant-checkbox-group {
+      width: 100%;
+    }
+  }
 </style>

+ 199 - 179
src/views/modules/BatchCreate/linkMultiSelect.vue

@@ -1,204 +1,224 @@
 <template>
-    <div class="linkMultiSel">
-        <div class="leftBox">
-            <div class="bigBOX" ref="mycheckBox">
-                <div class="big_item" >
-                    <MultiCheckBox  :title="title" :listArr='listArr' :curLayerNum='1'  :parentChecked='false' @getItemData='getItemData' />
-                </div>
-                <div class="big_item">
-                    <MultiCheckBox  :title="title2" :listArr='listArr2' :curLayerNum='2' :parentChecked='parentChecked'  @getItemData='getItemData' v-if="listArr2.length>0" />
-                </div>
-                <div class="big_item">
-                    <MultiCheckBox  :title="title3" :listArr='listArr3' :curLayerNum='3'  @getItemData='getItemData' v-if="listArr3.length>0"/>
-                </div>
-                <div class="big_item">
-                    <MultiCheckBox  :title="title4" :listArr='listArr4' :curLayerNum='4'  @getItemData='getItemData' v-if="listArr4.length>0"/>
-                </div>
-            </div>
-               
-
+  <div class="linkMultiSel">
+    <div class="leftBox">
+      <div class="bigBOX" ref="mycheckBox">
+        <div class="big_item">
+          <MultiCheckBox :title="title" :listArr="listArr" :curLayerNum="1" :parentChecked="false"
+            @getItemData="getItemData" />
         </div>
-        
-        <div class="rightBox"  >
-            <div class="title">已选</div>
-            <div class="linkMulti_list">
-
-            </div>
+        <div class="big_item">
+          <MultiCheckBox :title="title2" :listArr="listArr2" :curLayerNum="2" :parentChecked="parentChecked1"
+            @getItemData="getItemData" v-if="listArr2.length>0" />
+        </div>
+        <div class="big_item">
+          <MultiCheckBox :title="title3" :listArr="listArr3" :curLayerNum="3" :parentChecked="parentChecked2"
+            @getItemData="getItemData" v-if="listArr3.length>0" />
         </div>
+        <div class="big_item">
+          <MultiCheckBox :title="title4" :listArr="listArr4" :curLayerNum="4" :parentChecked="parentChecked3"
+            @getItemData="getItemData" v-if="listArr4.length>0" />
+        </div>
+      </div>
     </div>
+
+    <div class="rightBox">
+      <div class="title">已选</div>
+      <div class="linkMulti_list"></div>
+    </div>
+  </div>
 </template>
 
 <script>
+  import MultiCheckBox from './MultiCheckBox'
+  export default {
+    props: ['title', 'listArr'],
+    components: {
+      MultiCheckBox
+    },
+    data() {
+      return {
+        title2: '',
+        listArr2: [],
+        title3: '',
+        listArr3: [],
+        title4: '',
+        listArr4: [],
+        clickKey: 0,
+        parentChecked1: false,
+        parentChecked2: false,
+        parentChecked3: false,
+
+        currentData: null,
+        layersNum: 0
+      }
+    },
+    watch: {},
+    methods: {
+      getItemData(val) {
+        this.$nextTick(() => {
+          this.clickKey = val.clickObj.dataset.layers
+          let index = parseInt(val.clickObj.dataset.layers)
+          this.currentData = val.data
+          console.log(val, val.clickObj.dataset.layers)
+          let childrensArr = Array.from(this.$refs.mycheckBox.children)
+          setTimeout(() => {
+            console.log(val.data.checked)
+            if (index == 1 || this.clickKey == 1) {
+              this.$refs.mycheckBox.style.width = '100%'
+              if (val.data.children) {
+                this.listArr3 = []
+                this.title3 = ''
+                this.listArr4 = []
+                this.title4 = ''
+
+                //处理样式
+                this.styleHandle(childrensArr, index)
+
+                // if(val.data.checked){
+                //     val.data.children.forEach((item)=>{
+                //         item.checked=true;
+                //     })
+                // }else{
+                //     val.data.children.forEach((item)=>{
+                //         // item.checked=false;
+                //         this.$set(item,'checked',false)
+                //     })
+                // }
 
-import MultiCheckBox from './MultiCheckBox'
-    export default {
-        props:['title','listArr'],
-        components:{
-            MultiCheckBox,
-        },
-        data() {
-            return {
-                title2:'',
-                listArr2:[],
-                title3:'',
-                listArr3:[],
-                title4:'',
-                listArr4:[],
-                clickKey:0,
-                parentChecked:false,
+                this.parentChecked1 = val.data.checked
+                this.parentChecked2 = val.data.checked
+                this.parentChecked3 = val.data.checked
+                this.listArr2 = val.data.children
+                this.title2 = val.data.name
+                console.log(
+                  'parentChecked1',
+                  this.parentChecked1,
+                  '--',
+                  'parentChecked2',
+                  this.parentChecked2,
+                  '--',
+                  'parentChecked3',
+                  this.parentChecked3
+                )
+              } else {
+                this.listArr3 = []
+                this.title3 = ''
+                this.listArr4 = []
+                this.title4 = ''
+                this.listArr2 = []
+                this.title2 = ''
+                this.resetStyle(childrensArr, index)
+              }
+            } else if (index == 2 || this.clickKey == 2) {
+              if (val.data.children) {
+                this.listArr4 = []
+                this.title4 = ''
+                this.listArr3 = val.data.children
+                this.title3 = val.data.name
+                this.$refs.mycheckBox.style.width = '150%'
+                this.styleHandle(childrensArr, index)
+                this.parentChecked2 = val.data.checked
+                this.parentChecked3 = val.data.checked
+              } else {
+                this.listArr4 = []
+                this.title4 = ''
+                this.listArr3 = []
+                this.title3 = ''
+                this.$refs.mycheckBox.style.width = '100%'
+                this.resetStyle(childrensArr, index)
+              }
+            } else if (index == 3 || this.clickKey == 3) {
+              if (val.data.children) {
+                this.listArr4 = val.data.children
+                this.title4 = val.data.name
+                this.$refs.mycheckBox.style.width = '200%'
+                this.styleHandle(childrensArr, index)
+                this.parentChecked3 = val.data.checked
+              } else {
+                this.$refs.mycheckBox.style.width = '150%'
+                this.resetStyle(childrensArr, index)
+              }
             }
-        },
-       
-        methods: {
-            getItemData(val){
-                this.clickKey=val.clickObj.dataset.layers;
-                let index=parseInt(val.clickObj.dataset.layers);
-                console.log(val,val.clickObj.dataset.layers);
-                this.clickKey=val.clickObj.dataset.layers;
-                let childrensArr= Array.from(this.$refs.mycheckBox.children);
-                
-                if(index==1){
-                    this.$refs.mycheckBox.style.width='100%';
-                    if(val.data.children){
-                        this.listArr3=[];
-                        this.title3='';
-                        this.listArr4=[];
-                        this.title4='';
-                        
-                        //处理样式                        
-                        this.styleHandle(childrensArr,index)
+          }, 100)
 
-                         if(val.data.checked){
-                            val.data.children.forEach((item)=>{
-                                item.checked=true;
-                            })
-                        }else{
-                            val.data.children.forEach((item)=>{
-                                // item.checked=false;
-                                this.$set(item,'checked',false)
-                            })
-                        }   
-                        this.listArr2=val.data.children;
-                        this.title2=val.data.name;
-                    }else{
-                        this.listArr3=[];
-                        this.title3='';
-                        this.listArr4=[];
-                        this.title4='';
-                        this.listArr2=[];
-                        this.title2='';
-                        this.resetStyle(childrensArr,index)
 
-                    }
-                    
-                }else if(index==2){
-                   
-                    if(val.data.children){
-                        this.listArr4=[];
-                        this.title4='';
-                        this.listArr3=val.data.children;
-                        this.title3=val.data.name;
-                         this.$refs.mycheckBox.style.width='150%'
-                        this.styleHandle(childrensArr,index)
-                    }else{
-                        this.listArr4=[];
-                        this.title4='';
-                        this.listArr3=[];
-                        this.title3='';
-                         this.$refs.mycheckBox.style.width='100%'
-                        this.resetStyle(childrensArr,index)
-                    }
-                    
-                }else if(index==3){
-                   
-                    if(val.data.children){
-                        this.listArr4=val.data.children;
-                        this.title4=val.data.name;      
-                        this.$refs.mycheckBox.style.width='200%'                 
-                        this.styleHandle(childrensArr,index)
-                    }else{
-                        this.$refs.mycheckBox.style.width='150%'
-                        this.resetStyle(childrensArr,index)
-                    }
-                    
-                }
-            },
-            styleHandle(arr,i){
-                arr.forEach((item,index) => {
-                    if(index<=i){
-                        item.style.width=`${100/(i+1)}%`;
-                        item.style.borderRight='1px solid #ccc';
-                    }
-                });
-            },   
-            resetStyle(arr,i){
-                arr.forEach((item,index) => {
-                    if(index<i){
-                        item.style.width=`${100/i}%`;
-                        item.style.borderRight='1px solid #ccc';
-                    }
-                    if(index==i-1){
-                        item.style.borderRight='none';
-                    }
-                });
-            }   
-        },
-        mounted() {
-            
-        },
-    }
+        })
+      },
+      styleHandle(arr, i) {
+        arr.forEach((item, index) => {
+          if (index <= i) {
+            item.style.width = `${100 / (i + 1)}%`
+            item.style.borderRight = '1px solid #ccc'
+          }
+        })
+      },
+      resetStyle(arr, i) {
+        arr.forEach((item, index) => {
+          if (index < i) {
+            item.style.width = `${100 / i}%`
+            item.style.borderRight = '1px solid #ccc'
+          }
+          if (index == i - 1) {
+            item.style.borderRight = 'none'
+          }
+        })
+      }
+    },
+    mounted() {}
+  }
 </script>
 
 <style lang="scss" scoped>
-.linkMultiSel{
+  .linkMultiSel {
     width: 100%;
     height: 310px;
     display: flex;
-    ul,li{
-        margin: 0;
-        padding: 0;
-        list-style: none;
-    }
-    .leftBox{
-        width: 62%;
-        margin-right: 3%;
-        border: 1px solid #ccc;
-        border-radius: 5px;
-        overflow-x: auto;
-    }
-    .rightBox{
-        width: 35%;
-        border: 1px solid #ccc;
-        border-radius: 5px;
-    }
-    .title{
-        height: 36px;
-        line-height: 36px;
-        font-size: 14px;
-        font-weight: 600;
-        border-radius: 5px 5px 0 0;
-        background-color: rgb(248,249,250);
-        padding: 0 15px;
-        border-bottom: 1px solid #ccc;
+
+    ul,
+    li {
+      margin: 0;
+      padding: 0;
+      list-style: none;
     }
-    
-    .big_item{
-        width: 100%;
-        // min-width: 200px;
-        // width: 426px;
-        display: inline-block;
-        // height: calc(100% - 10px);
+
+    .leftBox {
+      width: 62%;
+      margin-right: 3%;
+      border: 1px solid #ccc;
+      border-radius: 5px;
+      overflow-x: auto;
     }
 
-    .bigBOX{
-        // width: calc(2 * 100%);
-        height: calc(100% - 10px);
-        box-sizing: border-box;
-        // display: flex;
+    .rightBox {
+      width: 35%;
+      border: 1px solid #ccc;
+      border-radius: 5px;
     }
 
+    .title {
+      height: 36px;
+      line-height: 36px;
+      font-size: 14px;
+      font-weight: 600;
+      border-radius: 5px 5px 0 0;
+      background-color: rgb(248, 249, 250);
+      padding: 0 15px;
+      border-bottom: 1px solid #ccc;
+    }
 
+    .big_item {
+      width: 100%;
+      // min-width: 200px;
+      // width: 426px;
+      display: inline-block;
+      // height: calc(100% - 10px);
+    }
 
-    
-}
+    .bigBOX {
+      // width: calc(2 * 100%);
+      height: calc(100% - 10px);
+      box-sizing: border-box;
+      // display: flex;
+    }
+  }
 </style>

+ 18 - 18
src/views/modules/BatchCreate/newDirectedPackage.vue

@@ -391,16 +391,16 @@
         </div>
         <div class="optBOX">
             <div class="leftBox">
-                <a-form :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
-                    <a-form-item label="定向包名称">
+                <a-form :model="form">
+                    <a-form-item label="定向包名称" :label-col="labelCol" :wrapper-col="wrapperCol">
                        <a-input placeholder="请输入定向包名称,至多20个字符" style="width:40%" />
                     </a-form-item>
-                    <a-form-item label="媒体:">
+                    <a-form-item label="媒体:" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <a-radio-group default-value="toutiao" v-model="form.medialType" button-style="solid">
                             <a-radio-button :value="1">头条</a-radio-button>
                         </a-radio-group>
                     </a-form-item>
-                    <a-form-item label="地域:" class="optItem" >
+                    <a-form-item label="地域:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <a-radio-group default-value="" button-style="solid" v-model="regionValue">
                             <a-radio-button value="">不限</a-radio-button>
                             <a-radio-button value="REGION_LEVEL_PROVINCE">按省市</a-radio-button>
@@ -460,17 +460,17 @@
                             </div>
                         </div>                        
                     </a-form-item>
-                    <a-form-item label="性别:" class="optItem">
+                    <a-form-item label="性别:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                          <a-radio-group default-value="" v-model="form.sex" button-style="solid">
                             <a-radio-button value="">不限</a-radio-button>
                             <a-radio-button value="men">男</a-radio-button>
                             <a-radio-button value="women">女</a-radio-button>
                         </a-radio-group>
                     </a-form-item>
-                    <a-form-item label="年龄:" class="optItem">
+                    <a-form-item label="年龄:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <radioCheck :checkArr='ageArr' @getSonValue='getNewUser' />
                     </a-form-item>
-                    <a-form-item label="精选流量包:" class="optItem">
+                    <a-form-item label="精选流量包:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <a-radio-group default-value="" button-style="solid">
                             <a-radio-button value="">不限</a-radio-button>
                             <a-radio-button value="men">应用软件精选</a-radio-button>
@@ -478,7 +478,7 @@
                         </a-radio-group>
                         <span class="tishi"><a-icon type="exclamation-circle" class="tubiao" />精选流量包仅支持穿山甲、穿山甲-精选游戏广告位</span>
                     </a-form-item>
-                    <a-form-item label="行为兴趣:" class="optItem">
+                    <a-form-item label="行为兴趣:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <a-radio-group v-model="interestActionMode" button-style="solid">
                             <a-radio-button value="">不限</a-radio-button>
                             <a-radio-button value="RECOMMEND">
@@ -644,19 +644,19 @@
 
                             </a-form-item>
                         </div>
-                    <a-form-item label="平台:" class="optItem">
+                    <a-form-item label="平台:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <radioCheck :checkArr='platformArr' @getSonValue='getNewUser' />
                     </a-form-item>
-                    <a-form-item label="过滤已安装:" class="optItem">
+                    <a-form-item label="过滤已安装:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <a-radio-group default-value="" button-style="solid">
                             <a-radio-button value="">不过滤</a-radio-button>
                             <a-radio-button value="filter">过滤</a-radio-button>
                         </a-radio-group>
                     </a-form-item>
-                    <a-form-item label="运营商:" class="optItem">
+                    <a-form-item label="运营商:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                        <radioCheck :checkArr='carrierArr' @getSonValue='getNewUser' />
                     </a-form-item>
-                    <a-form-item label="网络:" class="optItem">
+                    <a-form-item label="网络:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                        <radioCheck :checkArr='networkArr' @getSonValue='getNewUser' />
                     </a-form-item>
                     <!-- <a-form-item label="设备类型:" class="optItem">
@@ -666,7 +666,7 @@
                             <a-radio-button value="2G">平板</a-radio-button>
                         </a-radio-group>
                     </a-form-item> -->
-                    <a-form-item label="手机品牌:" class="optItem">
+                    <a-form-item label="手机品牌:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                        <a-radio-group default-value="" v-model="deviceBrand" button-style="solid">
                             <a-radio-button value="">不限</a-radio-button>
                             <a-radio-button value="byBrand">按品牌</a-radio-button>
@@ -690,7 +690,7 @@
                             
                         </div>
                     </a-form-item>
-                    <a-form-item label="手机价格:"  class="optItem">
+                    <a-form-item label="手机价格:"  class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                        <a-radio-group default-value="" v-model="launchPrice" button-style="solid">
                             <a-radio-button value="">不限</a-radio-button>
                             <a-radio-button value="custom">自定义</a-radio-button>
@@ -700,23 +700,23 @@
                         </span>
                         <span v-else></span>
                     </a-form-item>
-                    <a-form-item label="新用户:" class="optItem">                      
+                    <a-form-item label="新用户:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">                      
                         <radioCheck :checkArr='newUser' @getSonValue='getNewUser' />
                     </a-form-item>
-                    <a-form-item label="智能放量:" class="optItem">
+                    <a-form-item label="智能放量:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <a-radio-group default-value="" button-style="solid">
                             <a-radio-button value="">不启用</a-radio-button>
                             <a-radio-button value="open">启用</a-radio-button>
                         </a-radio-group>
                         <span class="tishi"><a-icon type="exclamation-circle" class="tubiao" />智能放量不支持受众预估</span>
                     </a-form-item>
-                    <a-form-item label="保存为模板:" class="optItem">
+                    <a-form-item label="保存为模板:" class="optItem" :label-col="labelCol" :wrapper-col="wrapperCol">
                         <a-radio-group default-value="no" button-style="solid">
                             <a-radio value="yes">是</a-radio>
                             <a-radio value="no">否</a-radio>
                         </a-radio-group>
                     </a-form-item>
-                    <a-form-item :wrapper-col="{ span: 14, offset: 4 }">
+                    <a-form-item :wrapper-col="{ span: 14, offset: 4 }" :label-col="labelCol"> 
                         <a-button type="primary" @click="applicatiSubmit">
                             应用
                         </a-button>

+ 5 - 0
vue.config.js

@@ -73,8 +73,13 @@ module.exports = {
         // target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
+<<<<<<< HEAD
         target: 'http://api.tjyourong.com.cn/jeecg-boot', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+=======
+        // target: 'http://api.tjyourong.com.cn/jeecg-boot', //请求本地 需要jeecg-boot后台项目 
+        target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+>>>>>>> 6c6ca1355430eb6ec2be730b342e112441291393
         // target: 'http://192.168.1.251:8088', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目