浏览代码

'该样式'

魏志佳 4 年之前
父节点
当前提交
0d7b2dc8e3

+ 13 - 7
src/views/modules/earlyWarningRules/configRules.vue

@@ -49,18 +49,18 @@
                     </div>
                     <div class="row-item" >
                         <div class="hint-item">
-                            <a-tooltip>
+                            <!-- <a-tooltip>
                                 <template slot="title">
-                                    <!-- 针对计划或者账户粒度的消耗、成本、转化数等数据设置阈值作为监控条件,方便系统判断当前的计划状态;条件之间为「且」的关系  -->
+                                    针对计划或者账户粒度的消耗、成本、转化数等数据设置阈值作为监控条件,方便系统判断当前的计划状态;条件之间为「且」的关系 
                                 </template>
                                 <a-icon type="question-circle" />
-                            </a-tooltip>
+                            </a-tooltip> -->
                         </div>
                         <div class="label-item">
                             <div class="text-item">规则条件</div>
                             <div class="required-item"></div>
                         </div>
-                        <div class="input-item" > 
+                        <div class="input-item  extraClass" style="min-width:80%" > 
                             <a-collapse accordion >
                                 <a-collapse-panel v-for="(item,index) in form.ruleList" :key="index" :header="item.groupName" :style="customStyle">
                                     <span slot="extra">
@@ -310,7 +310,7 @@ export default {
     data() {
         return {
             tabActiveKey:[0],
-            customStyle:'background: #fff;border-radius: 4px;;overflow: hidden',
+            customStyle:'background: #f9f9fa;border-radius: 4px;margin-bottom:20px;overflow: hidden',
             conditionList:[],
             url:{
                 fieldList:'/ruleIndicator/list',
@@ -709,7 +709,7 @@ export default {
     },
 
     mounted(){
-        this.spinning=true;
+        // this.spinning=true;
         this.currentRuleId=this.$route.query.id
         getAction(this.url.fieldList,{   
             mediaType:3,
@@ -802,11 +802,17 @@ export default {
         font-size: 22px;
         margin-bottom: 20px;
         }
+        .extraClass{
+            .row-item {
+                margin-bottom: 20px;
+            }
+            
+        }
         .row-item {
         display: flex;
         justify-content: flex-start;
         align-items: center;
-        margin-bottom: 20px;
+        margin-bottom: 25px;
         }
         .row-item:last-of-type {
         margin-bottom: 0;

+ 39 - 26
src/views/modules/earlyWarningRules/index.vue

@@ -1,12 +1,9 @@
 <template>
     <div class="ruleSetList">
-        <p class="title">模板列表</p>
+        <div class="toolbox-automate-rules-create-content_title"><h3> 新建空白模板</h3></div>
         <div class="tabBody">
             
-            <!-- <a-tabs v-model="tabKey" @change="tabChange">
-                <a-tab-pane key="1" tab="规则管理"></a-tab-pane>
-                <a-tab-pane key="2" tab="运行记录" ></a-tab-pane>
-            </a-tabs> -->
+            
             <div>
                 <span>模板名称:</span>
                 <a-input v-model="templateName" placeholder="模板名字" style="width:250px;margin-right:40px"/>
@@ -23,12 +20,10 @@
         </div>
         <div class="tableBody">
             <div class="opt" >
-                <a-button type='primary' @click='createNewRule'>新建空白规则模板</a-button>
-                <p class="title">已创建的规则模板</p>
+                <a-button type='primary' @click='createNewRule'>新建模板</a-button>
+               
             </div>
-            <!-- <div class="opts">
-                 <a-input-search placeholder="请输入规则id" style="width:350px" v-model="rulesId" enter-button @search="onSearch" />
-            </div> -->
+            
             <div class="table">
                 <a-table
                     size="middle"
@@ -95,19 +90,26 @@ let existColumns=[
         scopedSlots: { customRender: 'templateName' }
     },
     {
+        title: '模板ID',
+        dataIndex: 'id',
+        align: 'center',
+        key: 'id',
+        scopedSlots: { customRender: 'id' }
+    },
+    {
         title: '应用媒体',
         dataIndex: 'mediaType',
         align: 'center',
         key: 'mediaType',
         scopedSlots: { customRender: 'mediaType' }
     },
-    {
-        title: '结果操作',
-        dataIndex: 'processMethod',
-        align: 'center',
-        key: 'processMethod',
-        scopedSlots: { customRender: 'processMethod' }
-    },
+    // {
+    //     title: '结果操作',
+    //     dataIndex: 'processMethod',
+    //     align: 'center',
+    //     key: 'processMethod',
+    //     scopedSlots: { customRender: 'processMethod' }
+    // },
     // {
     //     title: '创建者',
     //     dataIndex: 'createrName',
@@ -340,16 +342,23 @@ export default {
 .ruleSetList{
     background: white;
     padding: 20px;
-    .title{         
-        height: 28px;
-        font-size: 22px;
-        font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: 500;
-        color: rgba(0, 0, 0, 0.85);
-        line-height: 28px;
+    .toolbox-automate-rules-create-content_title {
+        background-color: #fff;
+        display: flex;
+        flex-flow: row nowrap;
+        justify-content: flex-start;
+        align-items: center;
+        margin-bottom: 28px;
+        h3 {
+            font-size: 22px;
+            margin: 0;
+            font-weight: 400;
+            height: 30px;
+            line-height: 30px;
+        }
     }
     .tabBody{
-        margin-bottom: 20px;
+        margin-bottom: 28px;
         display: flex;
         position: relative;
         font-size: 16px;
@@ -360,6 +369,7 @@ export default {
     }
     .tableBody{
         .opt{
+            margin-bottom: 28px;
             .title{
                 margin: 15px 0;
                 height: 57px;
@@ -374,7 +384,10 @@ export default {
             }
         }
         .opts{
-            margin-bottom: 15px;
+            margin-bottom: 28px;
+        }
+        .table{
+            // margin-top: 20px;
         }
     }
 }

+ 18 - 20
src/views/modules/workBench/operator/materialList.vue

@@ -465,36 +465,28 @@
                                 <p>未审核</p>
                             </div>
                             <div class="info-item">
-                                <span>生成水印:</span>
-                                <a-select :defaultValue="4" v-model="size" style="width:70%;">
-                                    <a-select-option :value="item.id" :key="item.id" v-for="item of sizeType">{{
-                                        item.name
-                                    }}</a-select-option>
-                                </a-select>
+                                <span>所属项目:</span>
+                                <p>所属项目:充电得宝 快手 北京汇创思拓有限公司</p>
                                 
                             </div>
                             <div class="info-item">
-                                <span>视频标签:</span>
-                                <a-tag>Tag 1</a-tag>
-                                <a-tag>Tag 1</a-tag>
+                                <span>所属物料:</span>
+                                <p>所属项目:充电得宝 快手 北京汇创思拓有限公司</p>
                             </div>
-                            <div class="info-item info">
-                                <ul>
-                                    <li><span>视频时长:</span> 17秒 </li>
-                                    <li><span>视频尺寸:</span> 1080*1920 </li>
-                                    <li><span>视频大小:</span> 31.42M </li>
-                                    <li><span>策划:</span> 吴永前 </li>
-                                    <li><span>拍摄:</span> 吴永前 </li>
-                                    <li><span>剪辑:</span> 吴永前 </li>                                    
-                                </ul>
+                            <div class="info-item">
+                                <span>编导:</span>
+                                <p>吴永前</p>
                             </div>
                             <div class="info-item">
-                                <span>广告语:</span>
-                                <p>14354534324454354水电费水电费方式手动</p>
+                                <span>脚本:</span>
+                                <p></p>
                             </div>
+                                                       
                             <div class="bottom-btn">
                                 <a-button type='primary' @click="approved" style="margin-right:20px">通过审核</a-button>
                                 <a-button type='default' @click="reject">驳回</a-button>
+                                <a-button type='default' @click="dowmLoadScript">下载脚本</a-button>
+                                <a-button type='default' @click="scriptClose">关闭</a-button>
                             </div>
                         </div>
                     </a-drawer>
@@ -614,6 +606,12 @@ export default {
         }
     },
     methods: {
+        closeBox(){
+
+        },
+        dowmLoadScript(){
+            
+        },
         goPlantForm(){
             if(this.$parent.role=='operator'){
                 this.$parent.currentTabComponent='operatorPlatform'

+ 60 - 76
src/views/modules/workBench/orderDetail.vue

@@ -169,6 +169,25 @@
                         color: rgba(0, 0, 0, 0.85);
                         margin-bottom: 25px;
                     }
+                    ul{
+                        width: 850px;
+                        display: flex;
+                        justify-content: space-between;
+                        padding: 0 15px;
+                        li{
+                            width: 400px;
+                            height: 32px;
+                            line-height: 32px;
+                            padding: 0 10px;
+                            box-sizing: border-box;
+                            cursor: pointer;
+                            text-overflow: ellipsis;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            background: rgba(245, 245, 245, 0.5);
+                            border-radius: 5px;;
+                        }
+                    }
                 }
                 .shenhe{
                     width: 6px;
@@ -410,33 +429,42 @@
                         <div class="top">
                             <ul>
                                 <li>
-                                    订单发起人:<span>吴永前</span>
+                                    订单所含物料总数:<span>20</span>
+                                </li>
+                                <li>
+                                    真人物料数<span>10</span>
                                 </li>
                                 <li>
-                                    订单所含素材总数:<span>20</span>
+                                    投放系统<span>安卓</span>
                                 </li>
                                 <li>
-                                    订单状态:<span>设计中</span>
+                                    要求日更物料数:<span>4</span>
                                 </li>
                                 <li>
-                                    订单所属项目:<span>北京聚划算</span>
+                                    剪辑物料数:<span>10</span>
                                 </li>
                                 <li>
-                                    要求日更素材:<span>4</span>
+                                    APK包<span>https://down.xmiles.cn/down/18205/1873295</span>
                                 </li>
+                               
                             </ul>
                         </div>
                         <div class="bottom">
-                            <h4>素材负责人</h4>
+                            <h4>附件</h4>
                             <ul>
-                                <li> 设计组长:<span>毕洁泉</span></li>
-                                <li> 摄像:<span>王垒</span></li>
-                                <li> </li>
-                                <li> 编导:<span>毕洁泉</span></li>
-                                <li> 剪辑:<span>毕洁泉</span></li>
-                                <li> </li>
+                                <li> 附件名</li>
+                                <li> 附件名</li>
+                                <li> 附件名</li>
+                                <li> 附件名</li>
+                                <li> 附件名</li>
+                                <li> 附件名</li>
+                                
                             </ul>
                         </div>
+                        <div class="bottom">
+                            <h4>备注</h4>
+                            <p>我是北方的方式发送到发送到发送到地方个梵蒂冈地方滚滚滚的方法滴滴答答滴滴答答滴滴答答滴滴答答滴滴答答滴滴答答滴滴答答滴滴答答滴滴答答滴滴答答滴滴答答</p>
+                        </div>
                     </div>
 
                 </div>
@@ -444,9 +472,8 @@
                 <div class="section-item">
                     <div class="tabBox">
                         <a-tabs v-model="tabKey" @change="tabChange">
-                            <a-tab-pane :key='1' tab="素材"></a-tab-pane>
-                            <a-tab-pane :key='2' tab="脚本"></a-tab-pane>
-                            <a-button type='primary' slot="tabBarExtraContent">上传素材</a-button>
+                            <a-tab-pane :key='1' tab="真人物料"></a-tab-pane>
+                            <a-tab-pane :key='2' tab="剪辑物料"></a-tab-pane>
                         </a-tabs>
                     </div>
                         
@@ -496,6 +523,12 @@
                                     <a href="javascript:;" >删除</a>
                                 </a-popconfirm> -->                                
                             </span>
+                            <span slot="scriptOptions" slot-scope="text,record">
+                                <a href="javascript:;" @click="viewDetails(record)">预览脚本</a>                                   
+                            </span>
+                            <span slot="scriptOptions" slot-scope="text,record">
+                                <a href="javascript:;" @click="viewDetails(record)">预览视频</a>                                            
+                            </span>
 
                         </a-table>
                     </div>
@@ -567,96 +600,47 @@
 import moment from 'moment';
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 
-let materialColumns=[
+let realColumns=[
     {
-        title: '素材名称',
+        title: '物料标题',
         dataIndex: 'name',
         align: 'center',        
         key: 'name',
         scopedSlots: { customRender: 'name' }
     },
     {
-        title: '素材类型',
+        title: '物料编号',
         dataIndex: 'type',
         align: 'center',        
         key: 'type',
         scopedSlots: { customRender: 'type' }
     },
     {
-        title: '素材状态',
+        title: '物料进度',
         dataIndex: 'status',
         align: 'center',        
         key: 'status',
         scopedSlots: { customRender: 'status' }
     },
     {
-        title: '完结时间',
-        dataIndex: 'time',
-        align: 'center',        
-        key: 'time',
-        scopedSlots: { customRender: 'time' }
-    },
-    {
-        title: '备注',
-        dataIndex: 'remarks',
-        align: 'center',        
-        key: 'remarks',
-        scopedSlots: { customRender: 'remarks' }
-    },
-    {
-        title: '操作',
-        dataIndex: 'options',
+        title: '脚本',
+        dataIndex: 'scriptOptions',
         align: 'center',        
         key: 'options',
         width:250,
-        scopedSlots: { customRender: 'options' }
+        scopedSlots: { customRender: 'scriptOptions' }
     },
-]
-let scriptColumns=[
     {
-        title: '素材名称',
-        dataIndex: 'name',
-        align: 'center',        
-        key: 'name',
-        scopedSlots: { customRender: 'name' }
-    },
-    {
-        title: '素材标签',
-        dataIndex: 'tag',
-        align: 'center',        
-        key: 'tag',
-        scopedSlots: { customRender: 'tag' }
-    },
-    {
-        title: '素材状态',
-        dataIndex: 'status',
-        align: 'center',        
-        key: 'status',
-        scopedSlots: { customRender: 'status' }
-    },
-    {
-        title: '完结时间',
-        dataIndex: 'time',
-        align: 'center',        
-        key: 'time',
-        scopedSlots: { customRender: 'time' }
-    },
-    {
-        title: '备注',
-        dataIndex: 'remarks',
-        align: 'center',        
-        key: 'remarks',
-        scopedSlots: { customRender: 'remarks' }
-    },
-    {
-        title: '操作',
-        dataIndex: 'options',
+        title: '视频',
+        dataIndex: 'videoOptions',
         align: 'center',        
         key: 'options',
-        scopedSlots: { customRender: 'options' }
+        width:250,
+        scopedSlots: { customRender: 'videoOptions' }
     },
 ]
 
+
 let marterialData=[
     {
         name:'1111',

+ 2 - 2
vue.config.js

@@ -68,7 +68,7 @@ module.exports = {
     open : true,
     proxy: {
       '/jeecg-boot': {
-        //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+         target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -77,7 +77,7 @@ module.exports = {
         // target: 'http://192.168.1.43:8888', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
-         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+        //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目