朱鑫波 před 4 roky
rodič
revize
52156014a1

+ 184 - 0
src/components/ctop/propModal.vue

@@ -0,0 +1,184 @@
+<template>
+  <a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" @ok="handleOk"
+    @cancel="handleCancel" cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="道具名称">
+          <a-input placeholder="请输入道具名称" v-decorator="['name', validatorRules.name ]" />
+        </a-form-item>
+        <a-form-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <uploadFile  v-if="visible" :value.sync="imageUrl" :fileCount="10"
+            uploadType="image" />
+          <!-- <upload-to-ali v-model="imageUrl" :customDomain="customDomain" multiple preview :region="region"
+            :bucket="bucket" :accept="acceptImage" :max="10" :size="1024000" :accessKeyId="accessKeyId"
+            :accessKeySecret="accessKeySecret"></upload-to-ali> -->
+        </a-form-item>
+        <a-form-item label="道具类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入道具类型" v-decorator="['type']" />
+        </a-form-item>
+        <!-- <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-date-picker
+            style="width: 100%"
+            placeholder="请选择生日"
+            v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"/>
+        </a-form-item>
+
+        <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-select v-decorator="[ 'sex', {}]" placeholder="请选择性别">
+            <a-select-option :value="1">男</a-select-option>
+            <a-select-option :value="2">女</a-select-option>
+          </a-select>
+        </a-form-item> -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
+          <a-input placeholder="请输入道具描述" v-decorator="['desc']" />
+        </a-form-item>
+
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import {
+    httpAction
+  } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import JTreeSelect from '@/components/jeecg/JTreeSelect'
+  import moment from 'moment'
+  import UploadToAli from '@femessage/upload-to-ali'
+  import uploadFile from '@/components/uploadFile.vue'
+  export default {
+    name: "ActorModal",
+    components: {
+      UploadToAli,
+      JTreeSelect,
+      uploadFile
+    },
+    data() {
+      return {
+        title: "操作",
+        visible: false,
+        model: {},
+        videoUrl: [],
+        imageUrl: [],
+        customDomain: '',
+        region: 'oss-cn-beijing',
+        bucket: 'ctop-media',
+        acceptVideo: 'video/mpeg,video/mp4',
+        acceptImage: 'image/jpeg,image/jpg,image/png',
+        accessKeyId: 'LTAIbNbqWzSOklQV',
+        accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
+        dateFormat: "YYYY-MM-DD",
+        labelCol: {
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 5
+          },
+        },
+        wrapperCol: {
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 16
+          },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          name: {
+            rules: [{
+              required: true,
+              message: '请输入演员姓名!'
+            }]
+          },
+          // sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))},
+        },
+        url: {
+          add: "/ctop/prop/add",
+          edit: "/ctop/prop/edit",
+        },
+      }
+    },
+    created() {},
+    methods: {
+      add() {
+        this.edit({});
+      },
+      edit(record) {
+
+        let that = this;
+        that.form.resetFields();
+        that.model = Object.assign({}, record);
+        that.visible = true;
+        that.$nextTick(() => {
+          that.form.setFieldsValue(pick(this.model, 'name', 'desc'))
+          //时间格式化
+        });
+
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+      },
+      moment,
+      handleOk() {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if (!this.model.id) {
+              httpurl += this.url.add;
+              method = 'post';
+            } else {
+              httpurl += this.url.edit;
+              method = 'put';
+            }
+            // if (!values.birthday) {
+            //   values.birthday = '';
+            // } else {
+            //   values.birthday = values.birthday.format(this.dateFormat);
+            // }
+            values.coverUrl = this.imageUrl[0]
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+
+            console.log(formData)
+            httpAction(httpurl, formData, method).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit('ok');
+                that.$emit("updateList")
+              } else {
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+          }
+        })
+      },
+      handleCancel() {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

+ 12 - 5
src/components/ctop/vm-card.vue

@@ -192,7 +192,7 @@ li {
           </div>
         </a-tab-pane>
       </a-tabs>
-      <div v-else>
+      <div v-if="pageTitle=='道具列表'">
         <div style="display:flex;flex-direction:row;height:200px;">
             <div
               style="height:200px;width:30%;border:1px solid #f2f2f2;"
@@ -258,7 +258,8 @@ li {
         :accessKeySecret="accessKeySecret"
       ></upload-to-ali> -->
     </a-modal>
-    <actor-modal ref="modalForm" @ok="modalFormOk" @updateList="updateList" @close="closeVideo"></actor-modal>
+    <actor-modal ref="modalForm" @ok="modalFormOk" @updateList="updateList" @close="closeVideo" v-show="pageTitle=='演员管理'" ></actor-modal>
+    <propModal ref="modalForm" @ok="modalFormOk" @updateList="updateList" @close="closeVideo" v-show="pageTitle=='道具管理'" ></propModal>
   </div>
 </template>
 <script>
@@ -281,13 +282,16 @@ import UploadToAli from '@femessage/upload-to-ali'
   import uploadFile from '@/components/uploadFile.vue'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { closeAllVideoFun } from '@/utils/videoControl'
+
+import propModal from './propModal'
 export default {
   name: 'VmCard',
   mixins: [JeecgListMixin],
   components: {
     actorModal,
     UploadToAli,
-    uploadFile
+    uploadFile,
+    propModal
   },
   props: {
     type: {
@@ -311,8 +315,10 @@ export default {
     },
     desc: {
       type: String,
-      default:
-        "Lorem Ipsum is simply dummy text of the printing and typesetting industry,Lorem Ipsum has been the industry's standard dummy text ever since the 1500s"
+      default(){
+        return ""
+      }
+       
     },
     detailUrl: {
       type: String,
@@ -451,6 +457,7 @@ export default {
     },
     // 删除
     deleteItemCard(){
+  
       this.$emit('delete-ok', {id:this.id})
     },
     getDetail() {

+ 18 - 8
src/components/ctop/vm-image-list.vue

@@ -68,9 +68,8 @@
       </a-row>
     </a-row>
     <a-row class="image-list" :gutter="16" style="padding:0 8px">
-      <a-col :lg="6" :sm="12" class="vm-margin" v-for="(item, index) of dataShow" :key="index" style="padding:0">
-        
-        <vm-card
+      <a-col :lg="6" :sm="12" class="vm-margin" style="padding:0"  v-for="(item, index) of dataShow" :key="index" >
+          <vm-card
           style="margin: 0 15px;"
           :editable="true"
           :title="item.name"
@@ -80,13 +79,14 @@
           :editUrl="item.editUrl"      
           :pageTitle='title'   
           :id="item.id"
-          :record="item"
-          @delete-ok="deleteOk(item)"
+          :record="item"          
+          @delete-ok="deleteOk({...item,'page':currentPage})"
           @updateList="updateList"
         ></vm-card>
       </a-col>
     </a-row>
-    <actor-modal ref="modalForm" @ok="modalFormOk" @updateList="updateList"></actor-modal>
+    <actor-modal ref="modalForm" @ok="modalFormOk" @updateList="updateList" v-if="title=='演员列表'"></actor-modal>
+    <propModal ref="modalForm" @ok="modalFormOk" @updateList="updateList" v-if="title=='道具列表'"></propModal>
   </div>
 </template>
 
@@ -95,6 +95,7 @@ import VmCard from '@/components/ctop/vm-card'
 import ARow from 'ant-design-vue/es/grid/Row'
 import ACol from 'ant-design-vue/es/grid/Col'
 import actorModal from './ActorModal'
+import propModal from './propModal'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 export default {
   name: 'VmImageList',
@@ -102,9 +103,11 @@ export default {
     ACol,
     ARow,
     VmCard,
-    actorModal
+    actorModal,
+    propModal
   },
   mixins: [JeecgListMixin],
+  
   props: {
     title: {
       type: String,
@@ -182,6 +185,9 @@ export default {
       ]
     }
   },
+  // provide:{
+  //   page:this.currentPage,
+  // },
   methods: {
     updateList() {
       this.$emit('updateList')
@@ -211,8 +217,12 @@ export default {
     //     }
     //   })
     // },
+    // deleteItem(data){
+    //     console.log(data,1)
+    //     this.$emit('delete-ok', {page:this.currentPage,...data})
+    // },
     deleteOk: function(data) {
-      this.$emit('delete-ok', data)
+      this.$emit('delete-ok', {page:this.currentPage,...data})
     },
     search() {
       if (this.keyword) {

+ 8 - 0
src/views/modules/Statistics/imageStatics/imageCostReport.vue

@@ -664,9 +664,17 @@ export default {
                             }
                             
                         }
+
+
                         });
                         // console.log(this.treeData)
 
+
+                      if(this.tabKey==1){
+                        this.treeData=this.TTaccountList
+                      }else{
+                        this.treeData=this.KSaccountList
+                      }
                     }
                 }
             })

+ 134 - 90
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue

@@ -170,8 +170,8 @@
   <div class="newPlanStatic">
     <div class="tabbody">
       <a-tabs v-model="tabKey" @change="tabChange">
-        <!-- <a-tab-pane :key="1" tab="头条">        
-        </a-tab-pane> -->
+        <a-tab-pane :key="1" tab="头条">        
+        </a-tab-pane>
         <a-tab-pane :key="2" tab="快手">       
         </a-tab-pane>
       </a-tabs>
@@ -346,26 +346,26 @@ let TTcolumns=[
   },
   {
     title: '账户所属人',
-    dataIndex: 'people',
-    scopedSlots: { customRender: 'people' },
+    dataIndex: 'userName',
+    scopedSlots: { customRender: 'userName' },
     align: 'center',
-    key:'people'
+    key:'userName'
     
   },
   {
-    title: '新计划数',
-    dataIndex: 'newPlan',
-    scopedSlots: { customRender: 'newPlan' },
+    title: '新计划数',
+    dataIndex: 'new',
+    scopedSlots: { customRender: 'new' },
     align: 'center',
-    key:'newPlan'
+    key:'new'
     
   },
   {
     title: '最近上新',
-    dataIndex: 'statDate',
-    scopedSlots: { customRender: 'statDate' },
+    dataIndex: 'maxCreateTime',
+    scopedSlots: { customRender: 'maxCreateTime' },
     align: 'center',
-    key:'statDate'
+    key:'maxCreateTime'
     
   },
 ]
@@ -388,26 +388,26 @@ let TTcolumnsVaild=[
   },
   {
     title: '账户所属人',
-    dataIndex: 'people',
-    scopedSlots: { customRender: 'people' },
+    dataIndex: 'userName',
+    scopedSlots: { customRender: 'userName' },
     align: 'center',
-    key:'people'
+    key:'userName'
     
   },
   {
     title: '有效计划数',
-    dataIndex: 'newPlan',
-    scopedSlots: { customRender: 'newPlan' },
+    dataIndex: 'valid',
+    scopedSlots: { customRender: 'valid' },
     align: 'center',
-    key:'newPlan'
+    key:'valid'
     
   },
   {
     title: '最近上新',
-    dataIndex: 'statDate',
-    scopedSlots: { customRender: 'statDate' },
+    dataIndex: 'maxCreateTime',
+    scopedSlots: { customRender: 'maxCreateTime' },
     align: 'center',
-    key:'statDate'
+    key:'maxCreateTime'
     
   },
 ]
@@ -447,7 +447,7 @@ let KScolumns=[
     
   },
   {
-    title: '新推广组',
+    title: '新推广组',
     dataIndex: 'new',
     scopedSlots: { customRender: 'new' },
     align: 'center',
@@ -529,7 +529,7 @@ let sectionOption={
         }, 
     },
     legend: {
-        data: ['新上计划数','有效计划数']
+        data: ['新上推广组','有效推广组']
     },
     grid: {
         left: '2%',
@@ -579,7 +579,7 @@ let sectionOption={
     ],
     series: [
         {
-            name: '新上计划数',
+            name: '新上推广组',
             type: 'line',
             smooth: true,
             data:  [],
@@ -599,7 +599,7 @@ let sectionOption={
             },
         },
         {
-            name: '有效计划数',
+            name: '有效推广组',
             type: 'line',
             smooth: true,
             data:  [],           
@@ -633,6 +633,12 @@ export default {
 
   data: function() {
     return {
+      KSaccountList:[],
+      TTaccountList:[],
+
+      KSoperateList:[],
+      TToperateList:[],
+
       accountDisabled:false,
       operateDisabled:false,
       userId:JSON.parse(localStorage.getItem('pro__Login_Userinfo')).value.id,
@@ -679,6 +685,7 @@ export default {
       //选择一个后禁用其他
       if(val.length==1){
         this.operateDisabled=true;
+        this.opendate=''
           if(val[0]*1){
             let selectindex=0
               this.treeData.forEach((ele,index)=>{                   
@@ -723,16 +730,7 @@ export default {
               })
           }
           // console.log(this.mediaId)
-          if(this.mediaId=='1'){
-            
-              this.discountDisabled=true;
-              this.rebatePropDisabled=false;
-              this.discount=this.rebateProp;
-          }else{
-            this.rebatePropDisabled=true;
-            this.discountDisabled=false;
-            this.discount=this.discountSelect;
-          }
+          
       }
 
       if(val.length==0){
@@ -747,7 +745,7 @@ export default {
               
           });
         this.operateDisabled=false;
-        this.opendate=''
+        
       }
       if(val){
         val.forEach((ele,index)=>{
@@ -798,14 +796,18 @@ export default {
       
       if(key==1){
         // toutiao
+        this.treeData=this.TTaccountList;
+        this.operateList=this.TToperateList
         this.columns=this.tableTab==1?[...TTcolumns]:[...TTcolumnsVaild]
         this.sectionOption.legend.data=['新上计划数','有效计划数']
       }else{
         // kuaishou
+        this.operateList=this.KSoperateList
+        this.treeData=this.KSaccountList;
         this.columns=this.tableTab==1?[...KScolumns]:[...KScolumnsVaild]
         this.sectionOption.legend.data=['新上推广组','有效推广组']
       }
-      this.accountHttp()
+      this.getNewPlan()
     },
     operateChange(value){
       console.log(value);
@@ -926,39 +928,65 @@ export default {
 
 
      //请求项目和账户内容
-    accountHttp(){
-    
-     this.treeValue=[];
-     getAction(`/ctop/projectMember/getProjectAccountByUserId?mediaType=${this.tabKey}`, {}).then(res => {
+    accountHttp(key){
+      this.treeData=[]
+      this.treeValue=[];
+     getAction(`/ctop/projectMember/getProjectAccountByUserId?mediaType=${key}`, {}).then(res => {
        if(res.success){
             // console.log(res);
             
             if(res.result){
-              this.treeData=[];
-                res.result.forEach((element,index) => {
-                  if(element){                  
-                      this.treeData.push({});                    
-                      this.treeData[index].title=element.project.projectName +'_('+ element.project.advertiserName +')';
-                      this.treeData[index].value='project'+element.project.projectId;
-                      this.treeData[index].key=element.project.projectId;
-                      this.treeData[index].mediaId=element.project.mediaId;
-                      this.treeData[index].children=[];
-                                          
-                    if(element.account.length){
-                      element.account.forEach((ele,i)=>{
-                          this.treeData[index].children.push({});
-                          this.treeData[index].children[i].title=ele.userName+'_'+ele.authName+'_'+element.project.projectName +'_('+(ele.accountStatus?'已停投':'投放中')+')';
-                          this.treeData[index].children[i].value=ele.accountId;
-                          this.treeData[index].children[i].key=ele.accountId;
-                          // this.treeData[index].children[i].accountStatus=ele.accountStatus;
-                      })
+              res.result.forEach((element,index) => {
+                if(element){
+                    if(key==1){
+                        this.TTaccountList.push({});
+                        this.TTaccountList[index].title=element.project.projectName +'_('+ element.project.advertiserName +')';
+                        this.TTaccountList[index].value='project'+element.project.projectId;
+                        this.TTaccountList[index].key=element.project.projectId;
+                        this.TTaccountList[index].mediaId=element.project.mediaId;
+                        this.TTaccountList[index].children=[];
+
+                        if(element.account.length){
+                            element.account.forEach((ele,i)=>{
+                                this.TTaccountList[index].children.push({});
+                                this.TTaccountList[index].children[i].title=ele.userName+'_'+ele.authName+'_'+element.project.projectName;
+                                this.TTaccountList[index].children[i].value=ele.accountId;
+                                this.TTaccountList[index].children[i].key=ele.accountId;
+                            })
+
+                        }
                         
-                    }                           
-                  }      
-                });
-                // console.log(this.treeData)
-                
-            }
+                    }else if(key==2){
+                        this.KSaccountList.push({});
+                        this.KSaccountList[index].title=element.project.projectName +'_('+ element.project.advertiserName +')';
+                        this.KSaccountList[index].value='project'+element.project.projectId;
+                        this.KSaccountList[index].key=element.project.projectId;
+                        this.KSaccountList[index].mediaId=element.project.mediaId;
+                        this.KSaccountList[index].children=[];
+
+                        if(element.account.length){
+                            element.account.forEach((ele,i)=>{
+                                this.KSaccountList[index].children.push({});
+                                this.KSaccountList[index].children[i].title=ele.userName+'_'+ele.authName+'_'+element.project.projectName;
+                                this.KSaccountList[index].children[i].value=ele.accountId;
+                                this.KSaccountList[index].children[i].key=ele.accountId;
+                            })
+
+                        }
+                        
+                    }
+                    
+
+                    if(this.tabKey==1){
+                      this.treeData=this.TTaccountList
+                    }else{
+                      this.treeData=this.KSaccountList
+                    }
+                }
+              });
+                        // console.log(this.treeData)
+
+                    }
        }
      })
     },
@@ -971,11 +999,12 @@ export default {
     },
 
     // 获取所有运营
-    getAllOperator(){
+    getAllOperator(key){
       let url=''
-      if(this.tabKey==1){
+      this.operateList=[]
+      if(key==1){
         // 头条
-        url=''
+        url='/ctop/bytedance/newPlan/report/AllOperator'
       }else{
         // 快手
         url='/ctop/kuaishou/newPlan/report/AllOperator'
@@ -983,7 +1012,18 @@ export default {
       postAction(url,{}).then(res=>{
         console.log(res);
         if(res.success){
-          this.operateList=res.result
+          if(key==1){
+            this.TToperateList=res.result;
+          }else{
+            this.KSoperateList=res.result;
+          }
+
+          if(this.tabKey==1){
+            this.operateList=this.TToperateList
+          }else{
+            this.operateList=this.KSoperateList
+          }
+          
         }
       })
     },
@@ -994,22 +1034,32 @@ export default {
       let url=''
       if(this.tabKey==1){
         // 头条
-        url=''
+        url='/ctop/bytedance/newPlan/report/data'
       }else{
         // 快手
         url='/ctop/kuaishou/newPlan/report/data'
       }
-      if(this.accountId){
-        this.operate='';
-      }else if(this.operate){
-        this.accountId=''
-      }
+      // if(this.accountId){
+      //   this.operate='';
+      // }else if(this.operate){
+      //   this.accountId=''
+      // }
       this.loading=true;
       
       this.sectionOption=JSON.parse(JSON.stringify(sectionOption));
+      if(this.tabKey==1){
+        this.sectionOption.legend.data=['新上计划数','有效计划数']
+        this.sectionOption.series[0].name='新上计划数'
+        this.sectionOption.series[1].name='有效计划数'
+      }else{
+        this.sectionOption.legend.data=['新上推广组','有效推广组']
+        this.sectionOption.series[0].name='新上推广组'
+        this.sectionOption.series[1].name='有效推广组'
+      }
+      
       postAction(url,{
         accountIds:this.accountId,
-        userId:this.operate ,
+        userId:this.operate || '',
         startDate:this.dateValue[0].format('YYYY-MM-DD'),
         endDate:this.dateValue[1].format('YYYY-MM-DD'),
         target:this.tableTab=='1'?'new':'valid',
@@ -1029,21 +1079,14 @@ export default {
             this.sectionOption.series[0].data.push(item.new)
             this.sectionOption.series[1].data.push(item.valid)
           })
-          if(this.tabKey==1){
-            this.sectionOption.legend.data=['新上计划数','有效计划数']
-            this.sectionOption.series[0].name='新上计划数'
-            this.sectionOption.series[1].name='有效计划数'
-          }else{
-            this.sectionOption.legend.data=['新上推广组','有效推广组']
-            this.sectionOption.series[0].name='新上推广组'
-            this.sectionOption.series[1].name='有效推广组'
-          }
+         
 
 
           this.getEchartData('sectionChart', this.sectionOption);
 
         }
       })
+      this.getEchartData('sectionChart', this.sectionOption);
     },
 
     // 查询按钮
@@ -1075,15 +1118,16 @@ export default {
     }
   },
   mounted() {
-     this.accountHttp()
+    this.accountHttp(1);
+    this.accountHttp(2);
+    this.getAllOperator(1)
+    this.getAllOperator(2)
   },
   activated: function() {
     this.$nextTick(()=>{
-      this.accountHttp()
       this.getEchartData('sectionChart', this.sectionOption);
-     
-      this.getAllOperator()
-      this.tabChange(2)
+
+      // this.tabChange(2)
       let userInfo=localStorage.getItem('pro__Login_Userinfo')
       if(userInfo){
         this.userId=JSON.parse(userInfo).value.id;

+ 3 - 2
src/views/modules/actor/ActorList.vue

@@ -14,6 +14,7 @@
     components: {
       VmImageList
     },
+    // inject:[page],
     mounted() {
       this.$nextTick(() => {
         this.getActorList(1)
@@ -21,7 +22,7 @@
     },
     methods: {
       deletefn: function (data) {
-        console.log('最外层deleteFn执行')
+        console.log('最外层deleteFn执行',data)
         actorListDelete({
           id:data.id
         }).then(res=>{
@@ -32,7 +33,7 @@
             //     this.dataImageList.splice(i, 1)
             //   }
             // }
-            this.getActorList(1)
+            this.getActorList(data.page)
           }else{
             this.$message.error('删除失败,稍后再试')
           }

+ 1 - 0
src/views/modules/attendanceRecords/attendanceRecordsList.vue

@@ -337,6 +337,7 @@ export default {
             this.btnLoading=false;
             this.loading=false;
             this.data=[];
+            this.ipagination.current=1
             switch (this.tabKey){
                 case 1:
                     this.columns=[...allDataColumns]

+ 1 - 0
src/views/modules/prop/modules/vm-image-list.vue

@@ -81,6 +81,7 @@
           :record="item"
           @delete-ok="deleteOk(item)"
           @updateList="updateList"
+          
         ></vm-card>
       </a-col>
     </a-row>

+ 3 - 3
src/views/modules/prop/prop.vue

@@ -4,7 +4,7 @@
 </template>
 
 <script>
-  import VmImageList from './modules/vm-image-list'
+  import VmImageList from '@/components/ctop/vm-image-list'
   import {
     propList,
     propListDelete
@@ -21,7 +21,7 @@
     },
     methods: {
       deletefn: function (data) {
-        // console.log('最外层deleteFn执行')
+        console.log('最外层deleteFn执行',data)
         propListDelete({
           id:data.id
         }).then(res=>{
@@ -32,7 +32,7 @@
             //     this.dataImageList.splice(i, 1)
             //   }
             // }
-            this.getActorList(1)
+            this.getActorList(data.page)
           }else{
             this.$message.error('删除失败,稍后再试')
           }

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

@@ -58,8 +58,11 @@
 
     }
     .section{
+        background: white;
         .sectionBody{
             // background: white;
+            width:960px;
+            margin: 0 auto ;
             margin-top: 20px;
             ul,
             li {
@@ -71,8 +74,8 @@
                 margin-bottom: 16px;
                 position: relative;
                 padding: 32px 24px 48px 32px;
-                border-radius: 4px;
-                box-shadow: 0px 1px 6px 0px rgba(0, 0, 0, 0.05);
+                // border-radius: 4px;
+                // box-shadow: 0px 1px 6px 0px rgba(0, 0, 0, 0.05);
                 .moduler-title {
                     display: flex;
                     align-items: center;
@@ -158,6 +161,11 @@
         .ant-form-item {          
             margin-bottom: 0px; 
         }
+        .ant-radio-button-wrapper {
+            min-width: 80px;
+            text-align: center;
+            
+        }
     }
 </style>
 <template>
@@ -280,7 +288,7 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="APKLink"  prop="APKLink">
+                            <a-form-model-item ref="dataValue"  prop="dataValue">
                                 <a-range-picker v-model="form.dataValue" />
                             </a-form-model-item>
                         </div>
@@ -424,7 +432,7 @@ export default {
             },
             rules: {
                 name: [
-                    { required: true, message: '请填写规则的具体名称', trigger: 'blur' },
+                    { required: true, message: '请填写订单名称', trigger: 'blur' },
                     { min: 2, message: '长度不得小于2', trigger: 'blur' },
                 ],
                 APKLink: [

+ 1 - 1
vue.config.js

@@ -75,9 +75,9 @@ module.exports = {
 
         // target: 'http://192.168.1.74:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         
-        // target: 'http://192.168.0.170:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
 
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安