Browse Source

'更新上线公告'

魏志佳 4 years ago
parent
commit
cbd25a70c9

+ 1 - 1
package.json

@@ -131,4 +131,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}

+ 7 - 7
src/router/index.js

@@ -1,14 +1,14 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import {constantRouterMap} from '@/config/router.config'
+import { constantRouterMap } from '@/config/router.config'
 
 try {
-    const originalPush = Router.prototype.push
-    Router.prototype.push = function push(location) {
-      return originalPush.call(this, location).catch(err => err)
-    }
-  } catch (e) {
+  const originalPush = Router.prototype.push
+  Router.prototype.push = function push(location) {
+    return originalPush.call(this, location).catch(err => err)
   }
+} catch (e) {
+}
 
 Vue.use(Router)
 
@@ -22,6 +22,6 @@ Vue.use(Router)
 export default new Router({
   mode: 'history',
   base: process.env.BASE_URL,
-  scrollBehavior: () => ({y: 0}),
+  scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap
 })

+ 2 - 2
src/utils/request.js

@@ -15,8 +15,8 @@ else if (process.env.NODE_ENV == 'debug') {
 else if (process.env.NODE_ENV == 'production') { 
   
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
-  axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';     
-  // axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
+  // axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';     
+  axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
 }
 const service = axios.create({
 //   baseURL: '/jeecg-boot', // api base_url

+ 24 - 79
src/views/dashboard/Analysis.vue

@@ -237,105 +237,50 @@
          <a-icon type="notification" theme='twoTone'/> 更新通告
       </div>
       <div class="Updatecontent">
+        
         <div class="Updateitem">
             <div class="Updatetime">
                  <a-icon type="dashboard" theme='twoTone' class="updateicon" />
-                 <span class="updateSpan">{{updateTime[3]}}</span>
-            </div>
-            <div class="updateText">
-              <div class="updateBox">
-                <h3 class="textTitle">1.脚本库加word下载;</h3>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">2.上线媒介报表;</h3>
-                
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">3.快手批量工具更新:</h3>
-                <ul class="updatelist">
-                  <li> <span class="circular"></span>创建组时--商业兴趣加智能推荐</li>
-                  <li><span class="circular"></span>在复制组时可选是否修改定向</li>
-                  <li><span class="circular"></span>计划、组、创意列表页加id、名称模糊搜索</li>
-                  <li><span class="circular"></span>复制组时连带组名一起复制,可对组名进行修改</li>
-                </ul>
-              </div>
-                      
-            </div>
-        </div>
-        <div class="Updateitem">
-            <div class="Updatetime">
-                 <a-icon type="dashboard" theme='twoTone' class="updateicon" />
-                 <span class="updateSpan">{{updateTime[2]}}</span>
+                 <span class="updateSpan">{{updateTime[0]}}</span>
             </div>
             <div class="updateText">
               <div class="updateBox">
-                <h3 class="textTitle">1.快手批量工具更新:</h3>
+                <h3 class="textTitle">1.预警管理新功能上线</h3>
                 <ul class="updatelist">
-                  <li> <span class="circular"></span> 批量创建创意页面加入推荐文案,可根据关键词匹配文案;</li>
-                  <li><span class="circular"></span>批量创建创意选择内部素材可根据时间排序、筛选(天维度);</li>
+                  <li><span class="circular"></span>预警检查频率提升到15分钟一次;</li>
+                  <li><span class="circular"></span>预警系统增加历史导出记录;</li>
+                  <li><span class="circular"></span>推送预警模板增加操作符显示;</li>
                 </ul>
               </div>
               <div class="updateBox">
-                <h3 class="textTitle">2.脚本库重磅上线(位置:素材管理--脚本库)</h3>
-                <ul class="updatelist">
-                  <li> <span class="circular"></span> 脚本可在线编辑,并实时保存;</li>
-                  <li><span class="circular"></span>可在线打印,支持导出脚本;</li>
-                  <li><span class="circular"></span>可在线打印,支持导出脚本;</li>
-                </ul>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">3.支持飞书扫码登录助手</h3>
-                
-              </div>
-                      
-            </div>
-        </div>
-        <div class="Updateitem">
-            <div class="Updatetime">
-                 <a-icon type="dashboard" theme='twoTone' class="updateicon" />
-                 <span class="updateSpan">{{updateTime[1]}}</span>
-            </div>
-            <div class="updateText">
-              <div class="updateBox">
-                <h3 class="textTitle">1.快手批量工具更新:</h3>
-                <ul class="updatelist">
-                  <li> <span class="circular"></span> 批量更改监测链接;</li>
-                  <li><span class="circular"></span>素材审核驳回在企业微信发消息提醒;</li>
-                  <li><span class="circular"></span>推送失败在企业微信发消息;</li>
-                  <li><span class="circular"></span>广告语加入动态词包;</li>
-                  <li><span class="circular"></span>屏蔽停投的账户;</li>
+                <h3 class="textTitle">2.头条内广更新</h3>
+                <ul>
+                  <li><span class="circular"></span>头条内广数据API重新接入,历史数据持续补充;</li>
                 </ul>
               </div>
               <div class="updateBox">
-                <h3 class="textTitle">2.素材管理--视频素材-加素材名称搜索</h3>
-              </div>
-                      
-            </div>
-        </div>
-        <div class="Updateitem">
-            <div class="Updatetime">
-                 <a-icon type="dashboard" theme='twoTone' class="updateicon" />
-                 <span class="updateSpan">{{updateTime[0]}}</span>
-            </div>
-            <div class="updateText">
-              <div class="updateBox">
-                <h3 class="textTitle">1.头条-账户报表上线通知</h3>
-                <ul class="updatelist">
-                  <li><span class="circular"></span>点击“统计报表-头条报表-账户报表”查看模块</li>
-                  <li><span class="circular"></span>可根据项目账户筛选查看数据,支持时间筛选</li>
-                  <li><span class="circular"></span>支持报表导出</li>
+                <h3 class="textTitle">3.素材下单制优化</h3>
+                <ul>
+                  <li><span class="circular"></span>优化视频(视频、标签、封面)、脚本下方位置按钮,根据屏幕适配位置;</li>
+                  <li><span class="circular"></span>已上传未审核的脚本,视频支持重新上传;</li>
+                  <li><span class="circular"></span>当投放系统为安卓时,apk的链接修改为非必填;</li>
+                  <li><span class="circular"></span>运营下单时,日均产量修改非必填;</li>
+                  <li><span class="circular"></span>视频素材入库区分类型(真人、剪辑);</li>
+                  <li><span class="circular"></span>修复了相关BUG;</li>
                 </ul>
               </div>
               <div class="updateBox">
-                <h3 class="textTitle">2.快手批量工具更新</h3>
+                <h3 class="textTitle">4.预警管理优化</h3>
                 <ul>
-                  <li><span class="circular"></span>在创建创意模块加了时间维度筛选</li>
+                  <li><span class="circular"></span>预警模版新增字段添加;</li>
+                  <li><span class="circular"></span>相关字段后台逻辑优化;</li>
                 </ul>
               </div>
               <div class="updateBox">
-                <h3 class="textTitle">3.视频报表修改</h3>
+                <h3 class="textTitle">5.优化浏览器进入汇创助手加载速度,清理缓存垃圾;</h3>
                 <ul>
-                  <li><span class="circular"></span>添加了视频上传时间字段</li>
+                  <!-- <li><span class="circular"></span>预警模版新增字段添加;</li>
+                  <li><span class="circular"></span>相关字段后台逻辑优化;</li> -->
                 </ul>
               </div>
             </div>
@@ -412,7 +357,7 @@
         indicator: <a-icon type="loading" style="font-size: 24px" spin />,
         roleCode: localStorage.getItem('roleCode'),
         visible:false,//更新通知消息提示框
-        updateTime:['2020-06-10','2020-06-17','2020-06-24','2020-07-01'],
+        updateTime:['2021-01-20'],
         versionId:0,//存储版本号 判断通知什么时候显示
       }
     },

+ 0 - 9
src/views/modules/BatchCreate/newCreate.vue

@@ -99,7 +99,6 @@
               </a-form-item>
             </div>
           </div>
-
           <div class="row-item">
             <div class="hint-item"></div>
             <div class="label-item">
@@ -129,7 +128,6 @@
             </div> -->
             <material ref="material" :creativeType="getFormData('creativeWay')"></material>
           </div>
-
           <div class="row-item">
             <div class="hint-item"></div>
             <div class="label-item">
@@ -145,7 +143,6 @@
               </a-form-item>
             </div>
           </div>
-
           <div class="row-item">
             <div class="hint-item"></div>
             <div class="label-item">
@@ -158,7 +155,6 @@
               </a-form-item>
             </div>
           </div>
-
           <div class="row-item">
             <div class="hint-item"></div>
             <div class="label-item">
@@ -178,7 +174,6 @@
               </a-form-item>
             </div>
           </div>
-
           <div class="row-item">
             <div class="hint-item"></div>
             <div class="label-item">
@@ -191,7 +186,6 @@
               </a-form-item>
             </div>
           </div>
-
           <div class="row-item">
             <div class="hint-item"></div>
             <div class="label-item">
@@ -204,7 +198,6 @@
               </a-form-item>
             </div>
           </div>
-
           <div class="row-item">
             <div class="hint-item"></div>
             <div class="label-item">
@@ -220,7 +213,6 @@
               </a-form-item>
             </div>
           </div>
-
           <div class="row-item">
             <div class="hint-item"></div>
             <div class="label-item">
@@ -678,7 +670,6 @@
                     // res.data.forEach((item)=>{
                     //   this.$message.error(item.message)
                     // })
-
                   } else {
                     this.loading=false;
                   }

+ 2 - 2
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue

@@ -766,7 +766,7 @@ export default {
       SHOW_PARENT,
 
       type:3,
-      dateValue:[moment().subtract(7,'days'), moment()],
+      dateValue:[moment().subtract(7, 'days'), moment().subtract(1, 'days')],
 
       operate:'',
       operateList:[],
@@ -927,7 +927,7 @@ export default {
     tabChange(key){
       console.log(key);
       this.treeValue=[];
-      this.operate=''
+      this.operate=undefined;
       if(key==1){
         // toutiao
         this.treeData=this.TTaccountList;

src/views/modules/autoLaunch/setCreate.vue → src/views/modules/autoLaunch/configLaunchInfo.vue


File diff suppressed because it is too large
+ 1083 - 0
src/views/modules/autoLaunch/configLaunchList.vue


+ 1 - 2
src/views/modules/autoLaunch/index.vue

@@ -23,8 +23,7 @@ export default {
     },
     components:{   
         createStrategy: () => import('./createStrategy'), 
-        setDirectional: () => import('./setDirectional'), 
-        setCreate: () => import('./setCreate'), 
+        setDirectional: () => import('./setDirectional'),  
         previewStrategy: () => import('./previewStrategy'), 
         
     },

+ 7 - 9
src/views/modules/autoLaunch/setDirectional.vue

@@ -1507,17 +1507,15 @@ export default {
                     postAction('/kuaishouStrategy/add',params).then(res=>{
                         console.log(res)
                         this.goNextloading=false
-                        if(res.success){
-                            
-                            // this.$parent.strategyInfo={}
-                            // this.$router.replace('/autoLaunch/autoLaunchList')
-                            // this.$bus.$emit('remove', '/autoLaunch/newStrategy')
-                            
+                        if(res.success){                            
+                            this.$parent.strategyInfo={}
+                            this.$router.replace('/autoLaunch/autoLaunchList')
+                            this.$bus.$emit('remove', '/autoLaunch/newStrategy')                            
                         }else{
                             this.$messgae.error(res.message)
-                            // this.$parent.strategyInfo={}
-                            // this.$router.replace('/autoLaunch/autoLaunchList')
-                            // this.$bus.$emit('remove', '/autoLaunch/newStrategy')
+                            this.$parent.strategyInfo={}
+                            this.$router.replace('/autoLaunch/autoLaunchList')
+                            this.$bus.$emit('remove', '/autoLaunch/newStrategy')
                         }
                     })
 

+ 1 - 1
src/views/modules/autoRules/newBlankRule.vue

@@ -915,7 +915,7 @@ export default {
         },
 
         goBack() {
-            this.$router.replace('/autoRules')
+            this.$router.push('/autoRules')
             this.$bus.$emit('remove', '/newBlankRule')
            
         },

+ 198 - 292
src/views/modules/earlyWarningRules/historyWarning.vue

@@ -1,27 +1,34 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" title="预警管理">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
-            <a-form-item label="产品名称">
-              <a-input placeholder="请输入产品名称" v-model="productName"></a-input>
+            <a-form-item label="媒体">
+              <a-radio-group v-model="mediaType">
+                <a-radio-button value=""> 全部 </a-radio-button>
+                <a-radio-button value="快手"> 快手 </a-radio-button>
+                <a-radio-button value="头条"> 头条 </a-radio-button>
+              </a-radio-group>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
-            <a-form-item label="广告主名称">
-              <a-input placeholder="请输入广告主名称" v-model="advertiserName"></a-input>
+            <a-form-item label="运营名称">
+              <a-input placeholder="请输入运营名称" v-model="userId"></a-input>
             </a-form-item>
           </a-col>
+          <template>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="账户ID">
+                <Treeselect :appId.sync="accountId" :multiple="false" ref="treeSelect" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+          </template>
           <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">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -29,315 +36,214 @@
     </div>
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
+    <!-- <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-    </div>
+    </div>-->
 
     <!-- table区域-begin -->
     <!-- 供应商 -->
     <div>
-
-      <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
-        :pagination="ipagination" :loading="loading" @change="handleTableChange"
-        style="word-break: break-all;font-size:16px;font-weight:600">
-        <span slot="mediaId"
-          slot-scope="mediaId">{{ mediaId == 1 ? '头条' :mediaId == 2? '快手':mediaId == 3?'头条内广':'快手内广' }}</span>
-        <span slot="projectList" slot-scope="text">
-          <span v-for="(item,index) in text"
-            :key="index">{{index+1}}.{{item.projectName}}{{index==(text.length-1)?'':';'}}</span>
-        </span>
-        <span slot="yunyingList" slot-scope="text">
-          <span v-for="(item,index) in text" :key="index">{{item.realname}}{{index==(text.length-1)?'':','}}</span>
-        </span>
-        <span slot="saleList" slot-scope="text">
-          <span v-for="(item,index) in text" :key="index">{{item.saleName}}{{index==(text.length-1)?'':','}}</span>
-        </span>
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleAddList(record)">绑定项目</a>
-
-          <a-divider type="vertical" />
-
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a>删除</a>
-          </a-popconfirm>
-        </span>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        style="word-break: break-all"
+      >
+        <span slot="userId" slot-scope="text">{{ text.split('_')[0] }}</span>
+        <div slot="alarmDetail" slot-scope="text" style="text-align: left; width: 100%; padding: 0 10px">
+          {{ text }}
+        </div>
       </a-table>
     </div>
-    <a-modal title="项目展示" :width="800" :visible="visible" :footer="null" @cancel="handleCancel" destroyOnClose
-      cancelText="关闭">
-      <a-button @click="handleProjectAdd" type="primary" icon="plus" style="margin:20px 0">新增</a-button>
-      <a-list bordered :data-source="dataList">
-        <a-list-item slot="renderItem" slot-scope="item, index">
-          {{ item.projectName }}
-          <div slot="actions">
-            <a @click="removeTitleCun(item,index)">删除</a>
-          </div>
-        </a-list-item>
-
-        <!-- <div slot="header">
-          Header
-        </div>
-        <div slot="footer">
-          Footer
-        </div> -->
-      </a-list>
-    </a-modal>
-    <a-modal title="新增项目" :width="800" :visible="visibleAdd" :confirmLoading="confirmLoading" @ok="handleOk"
-      destroyOnClose cancelText="关闭" @cancel="handleCancelAdd">
-      <a-select optionFilterProp="children" showSearch :filterOption="filterOption" mode="multiple" v-model="projectIds"
-        style="width:100%">
-        <a-select-option :value="item.id" v-for="(item, index) of supplierList" :key="index">{{
-              item.projectName
-            }}</a-select-option>
-      </a-select>
-    </a-modal>
   </a-card>
 </template>
 
 <script>
-  import JTreeSelect from '@/components/jeecg/JTreeSelect'
-  import {
-    httpAction,
-    getAction,
-    postAction,
-    deleteAction
-  } from '@/api/manage'
-  import {
-    JeecgListMixin
-  } from '@/mixins/ipagination'
-
-  export default {
-    name: 'ProjectList',
-    mixins: [JeecgListMixin],
-    components: {
-      JTreeSelect
-    },
-    data() {
-      return {
-        description: '产品管理页面',
-        loading: false,
-        visible: false,
-        visibleAdd: false,
-        dataList: [],
-        productIdDelete: null,
-        confirmLoading: false,
-        projectIds: [],
-        supplierList: [],
-        advertiserId: null,
-        // 表头
-        columns: [
-
-          {
-            title: '媒体',
-            align: 'center',
-            dataIndex: 'mediaId',
-            scopedSlots: {
-              customRender: 'mediaId'
-            },
-            width: 100
-          }, {
-            title: '产品名称',
-            align: 'center',
-            dataIndex: 'productName',
-            width: 200
-          },
-          {
-            title: '广告主名称',
-            align: 'center',
-            dataIndex: 'advertiserName',
-            width: 200
+import JTreeSelect from '@/components/jeecg/JTreeSelect'
+import { httpAction, getAction } from '@/api/manage'
+import Treeselect from './pushTreeSelect.vue'
+export default {
+  name: 'ProjectList',
+  components: {
+    JTreeSelect,
+    Treeselect,
+  },
+  data() {
+    return {
+      dataSource: [],
+      mediaType: '',
+      userId: '',
+      accountId: '',
+      description: '项目管理页面',
+      // 表头
+      columns: [
+        {
+          title: '媒体',
+          align: 'center',
+          dataIndex: 'mediaType',
+          width: 100,
+        },
+        {
+          title: '账户ID',
+          align: 'center',
+          dataIndex: 'accountId',
+          width: 200,
+        },
+        {
+          title: '运营',
+          align: 'center',
+          dataIndex: 'userId',
+          scopedSlots: {
+            customRender: 'userId',
           },
-          {
-            title: '项目名称',
-            align: 'center',
-            dataIndex: 'projectList',
-            scopedSlots: {
-              customRender: 'projectList'
-            },
+          width: 100,
+        },
+        {
+          title: '预警字段',
+          align: 'center',
+          dataIndex: 'groupName',
+          scopedSlots: {
+            customRender: 'groupName',
           },
-          {
-            title: '运营',
-            align: 'center',
-            dataIndex: 'yunyingList',
-            scopedSlots: {
-              customRender: 'yunyingList'
-            },
-            width: 120,
-
+          width: 100,
+        },
+        {
+          title: '预警时间',
+          align: 'center',
+          dataIndex: 'createTime',
+          scopedSlots: {
+            customRender: 'createTime',
           },
-          {
-            title: '销售',
-            align: 'center',
-            dataIndex: 'saleList',
-            scopedSlots: {
-              customRender: 'saleList'
-            },
-            width: 120
+          width: 200,
+        },
+        {
+          title: '预警信息',
+          align: 'center',
+          dataIndex: 'alarmDetail',
+          scopedSlots: {
+            customRender: 'alarmDetail',
           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: 'center',
-            scopedSlots: {
-              customRender: 'action'
-            },
-            width: 300
-          }
-        ],
-        dataSource: [],
-        url: {
-          list: '/ctop/product/getProductList',
-          delete: '/ctop/product/deleteProduct',
-          deleteBatch: '/ctop/project/deleteBatch',
-          exportXlsUrl: 'ctop/project/exportXls',
-          importExcelUrl: 'ctop/project/importExcel'
         },
-        options: [],
-        advertiserName: null,
-        productName: null,
-      }
+      ],
+      list: [],
+      options: [],
+      loading: false,
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        //   pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          return range[0] + '-' + range[1] + ' 共' + total + '条'
+        },
+        showQuickJumper: true,
+        //   showSizeChanger: true,
+        total: 0,
+        onChange: (current) => {
+          // 切换分页时的回调,
+          // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
+          this.ipagination.current = current
+        },
+      },
+    }
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     },
-    computed: {},
-    watch: {
-      'ipagination.current': function (n, o) {
-        console.log(n, o)
-        if (n != o) {
-          this.tableHttp()
-        }
-
+  },
+  watch: {
+    'ipagination.current': function (n, o) {
+      if (n != o) {
+        this.getHistoryList()
       }
     },
-    methods: {
-      searchQuery() {
-        this.tableHttp()
-      },
-      searchReset() {
-        this.advertiserName = null
-        this.productName = null
-        this.tableHttp()
-      },
-      handleTableChange() {
+  },
+  methods: {
+    searchQuery() {
+      this.ipagination.current = 1
+      this.getHistoryList()
+    },
+    searchReset() {
+      this.mediaType = ''
+      this.userId = ''
+      this.accountId = ''
+      this.ipagination.current = 1
+      this.getHistoryList()
+    },
+    getHistoryList() {
+      this.loading = true
+      var params = {}
+      params.mediaType = this.mediaType
+      params.userId = this.userId
+      params.accountId = this.accountId
+      params.pageNo = this.ipagination.current
+      params.pageSize = this.ipagination.pageSize
 
-      },
-      handleDelete: function (id) {
-        if (!this.url.delete) {
-          this.$message.error("请设置url.delete属性!")
-          return
+      getAction('/alarm/alarmEventSend/pageList', params).then((res) => {
+        this.loading = false
+        if (res.success) {
+          this.dataSource = res.result.list.map((item, index) => {
+            return { ...item, key: index }
+          })
+          this.ipagination.total = res.result.total
+        } else {
+          this.$message.error(res.message)
         }
-        var that = this;
-        postAction(that.url.delete, {
-          productId: id
-        }).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message);
-            this.ipagination.current = 1
-            this.tableHttp()
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      handleProjectAdd() {
-        this.visibleAdd = true
-        // this.supplierList = 
-        postAction('/ctop/product/getProjectListByAdvertiserId', {
-          "advertiserId": this.advertiserId
-        }).then(res => {
-          if (res.success) {
-            this.supplierList = res.result
-            this.projectIds = this.dataList.map(item => {
-              return item.projectId
-            })
-          }
-        })
-      },
-      handleCancelAdd() {
-        this.visibleAdd = false
-      },
-      handleOk() {
-        this.confirmLoading = true
-        postAction('/ctop/product/insertProductProjectMap', {
-          "productId": this.productIdDelete,
-          "projectIds": this.projectIds
-        }).then(res => {
+      })
+    },
+    getList() {
+      var params = {}
+      // params.userId = this.userInfo().id
+      params.pageSize = 1000
+      params.pageNo = 1
+      getAction('/ctop/advertiser/list', params)
+        .then((res) => {
           if (res.success) {
-            this.confirmLoading = false
-            this.visibleAdd = false
-            this.handleCancel()
+            this.list = res.result.records
           } else {
-            this.confirmLoading = false
-            this.$message.error(res.message)
-          }
-        })
-      },
-      removeTitleCun(item, index) {
-        postAction('/ctop/product/deleteByProjectIdAndProductId', {
-          "projectId": item.projectId,
-          "productId": this.productIdDelete
-        }).then(res => {
-          if (res.success) {
-            this.dataList.splice(index, 1)
-            this.tableHttp()
-          }
-        })
-      },
-      handleCancel() {
-        this.visible = false
-        this.tableHttp()
-      },
-
-      handleAddList(record) {
-        this.visible = true
-        this.dataList = record.projectList
-        this.productIdDelete = record.id
-        this.advertiserId = record.advertiserId
-      },
-      handleEdit: function (record) {
-        console.log(record)
-        this.$refs.modalForm.edit(record);
-        this.$refs.modalForm.title = "编辑";
-        this.$refs.modalForm.disableSubmit = false;
-      },
-      handleAdd: function () {
-        this.$refs.modalForm.add();
-        this.$refs.modalForm.title = "新增";
-        this.$refs.modalForm.disableSubmit = false;
-      },
-      modalFormOk() {
-        this.ipagination.current = 1
-        this.tableHttp()
-      },
-      filterOption(input, option) {
-        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      },
-      tableHttp() {
-        this.loading = true;
-        this.dataSource = []
-        var params = {}
-        params.pageNum = this.ipagination.current
-        params.pageSize = this.ipagination.pageSize
-        params.advertiserName = this.advertiserName
-        params.productName = this.productName
-        // {"pageNum":1,"pageSize":10,"advertiserName":"","productName":""}
-        postAction('/ctop/product/getProductList', params).then(res => {
-          if (res.success) {
-            // console.log(res)
-            this.loading = false;
-            this.ipagination.total = res.result.total
-            this.dataSource = res.result.list
+            this.$message.warning(res.message)
           }
         })
-      },
+        .finally(() => {})
+    },
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    mounted() {
-      this.tableHttp()
+    getAllUserList(value) {
+      this.options = []
+      getAction('/sys/user/getAllUserList', { pageSize: 50, pageNo: 1, userName: value }).then((res) => {
+        if (res.success) {
+          this.options = res.result.list
+        }
+      })
+    },
+    search(value) {
+      this.options = []
+      if (value != '') {
+        // this.options = this.list.filter(item => {
+        //   var data = item.realName + ' ' + item.roleName
+        //   return data.toLowerCase().indexOf(value.toLowerCase()) > -1
+        // })
+        // this.options = [...this.options]
+        this.getAllUserList(value)
+      } else {
+        this.getAllUserList()
+      }
     },
-  }
+  },
+  created() {},
+  mounted() {
+    this.getHistoryList()
+    // this.getAllUserList()
+    // this.getList()
+  },
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>

+ 5 - 1
src/views/modules/earlyWarningRules/useRuleList.vue

@@ -9,7 +9,7 @@
       <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 slot="tabBarExtraContent" type="link"> 预警历史 </a-button>
+        <a-button slot="tabBarExtraContent" type="link" @click="toHistory"> 预警历史 </a-button>
       </a-tabs>
     </div>
     <div class="tableBody">
@@ -283,6 +283,10 @@ export default {
     Treeselect,
   },
   methods: {
+    toHistory() {
+      this.$router.replace({ path: '/earlyWarningRules/historyWarning' })
+    },
+
     searchQuery() {
       this.ipagination.current = 1
       let url = ''

+ 5 - 4
src/views/modules/kuaishouapp/account/stepForm/Step2.vue

@@ -941,10 +941,7 @@
             }
             postAction('/kuaishou/batch/createUnit', paramsEnd).then(res => {
               if (res.success) {
-                this.visible = true
-                this.allForm.fail = res.result.fail
-                this.allForm.success = res.result.success
-                this.loading = false
+               
                 if (res.result.success.length > 0) {
 
                   var dataElse =  res.result.success.map(item => {
@@ -959,6 +956,10 @@
                   var dataJson = JSON.stringify(dataElse)
                   localStorage.setItem('pans', dataJson)
                   localStorage.setItem('appId', this.getData('appId'))
+                  this.visible = true
+                  this.allForm.fail = res.result.fail
+                  this.allForm.success = res.result.success
+                  this.loading = false
                 }
               } else {
                 this.loading = false

+ 2 - 2
src/views/modules/kuaishouapp/batchCreation/creat/creatCampaign.vue

@@ -135,10 +135,10 @@ export default {
               localStorage.setItem('campaignList', res.result)
               localStorage.setItem('campaignType', this.type)
               this.loading = false
-              this.$router.replace({
+              this.$bus.$emit('remove', '/creat/creatCampaign')
+              this.$router.push({
                 path: '/creat/creatUnit',
               })
-              this.$bus.$emit('remove', '/creat/creatCampaign')
             } else {
               this.$message.error(res.message)
               this.loading = false

+ 1 - 1
src/views/modules/workBench/designLeader/platForm.vue

@@ -100,7 +100,7 @@
                                             <span class="item-icon"></span>
                                             <div class="content">
                                                 <p class="name">{{item.orderTitle}}</p>
-                                                <p class="desc">{{item.orderRemark}}</p>
+                                                <p class="desc">{{item.orderRemark || '-'}}</p>
                                             </div>
                                         </div>
                                         

+ 1 - 1
src/views/modules/workBench/designPeople/platForm.vue

@@ -80,7 +80,7 @@
                                             <span class="item-icon"></span>
                                             <div class="content">
                                                 <p class="name">{{item.orderTitle}}</p>
-                                                <p class="desc">{{item.orderRemark}}</p>
+                                                <p class="desc">{{item.orderRemark || '-'}}</p>
                                             </div>
                                         </div>
                                         

+ 54 - 14
src/views/modules/workBench/materialList.vue

@@ -235,11 +235,11 @@
 }
 .videomarterialInfo{
     position: relative;
-    height: 800px;
+    // height: 800px;
 }
 .marterialInfo{
     overflow: auto;   
-    height: 800px;
+    // height: 800px;
     position: relative;
     p{margin-bottom: 0;}
     ul,li{
@@ -430,11 +430,12 @@
                                             :value.sync="urlList.url"
                                             @overUpload="overUpload"
                                             @removeUpload="removeUpload"
-                                            :fileCount="10"
+                                            :fileCount="1"
                                             uploadType="video"
                                             :multiple="false"
                                         />
                                         <span v-if="repeat" style="color: red">此素材重复,请重新选择上传</span>
+                                        <!-- {{urlList.url }} -->
                                         <span v-if="confirmLoading && urlList.url != ''" style="color: green">上传成功</span>
                                     </a-form-item>
                                     
@@ -555,7 +556,7 @@
                                         <a-textarea
                                             placeholder="请输入描述"
                                             v-decorator="[
-                                            'materialDescribe', // 给表单赋值或拉取表单时,该input对应的key
+                                            'description', // 给表单赋值或拉取表单时,该input对应的key
                                             ]"
                                             :auto-size="{ minRows: 3, maxRows: 10 }"
                                         />
@@ -637,14 +638,30 @@
                                 <p>{{ currentVideo.videoAdvise }}</p>
                             </div>
                             <!-- <div class="info-item btnBody"> -->
-                                <div class="bottom-btn">
-                                    <a-button type='primary' v-if="currentVideo.videoStatus==2" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>
+                                <!-- <div class="bottom-btn">
+                                    <a-button type='primary' v-if="currentVideo.videoStatus>=1" @click="modifyVideo"  :disabled="!(currentVideo.clip==userInfo.id)" style="margin-right:20px">修改视频信息</a-button>
                                     <a-button type='default' @click="onClose">关闭</a-button>
-                                </div>
+                                </div> -->
                             <!-- </div> -->
                             
                         </div>
                         </a-spin>
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='primary' v-if="currentVideo.videoStatus>=1" @click="modifyVideo"  :disabled="!(currentVideo.clip==userInfo.id)" style="margin-right:20px">修改视频信息</a-button>
+                            <a-button type='default' @click="onClose">关闭</a-button>
+                        </div>    
                     </a-drawer>
                     
 
@@ -656,7 +673,7 @@
                     :visible="scriptVisible"
                     @close="scriptClose"
                     >
-                        
+                        <a-spin :spinning="visibleLoading">
                         <div class="marterialInfo">
                             <div class="info-item">
                                 <span>脚本状态:</span>
@@ -687,7 +704,7 @@
                                 <div v-if="currentScript.scriptStatus>0" style="margin-right:20px">
                                     <a :href="currentScript.url">{{currentScript.scriptName}}</a>
                                 </div>
-                                <div v-if="currentScript.scriptStatus==0||currentScript.scriptStatus==2">
+                                <div v-if="currentScript.scriptStatus<3">
                                    
                                     <p v-if="currentMaterial.plan==userInfo.id">
                                         <a-upload
@@ -728,11 +745,27 @@
                                 
                             </div>
                                                        
-                            <div class="scriptbottom-btn">
+                            <!-- <div class="scriptbottom-btn">
  
                                 <a-button type='default' @click="scriptClose">关闭</a-button>
-                            </div>
+                            </div> -->
                         </div>
+                        </a-spin>  
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='default' @click="scriptClose">关闭</a-button>
+                        </div>    
                     </a-drawer>
 
 
@@ -756,7 +789,7 @@
                                 <a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
                                 </a-select>
                             </a-form-model-item>
-                            <a-form-model-item  label="拍摄"  ref="shot"  prop="shot">
+                            <a-form-model-item  label="拍摄"  ref="shot"  prop="shot" :rules='[{ required: currentMaterial.materialType==1, message: "拍摄人员必须指派" ,trigger: "change" }]'>
                                 <a-select
                                     
                                     v-model="formPerson.shot"
@@ -1339,10 +1372,12 @@ export default {
             this.currentMaterial=record
             this.currentScript={};
             if(record.scriptId){
+                this.visibleLoading=true 
                 getAction(this.url.scriptDetail,{
                     scriptId:record.scriptId
                 }).then(res=>{
                     console.log(res);
+                    this.visibleLoading=false
                     if(res.success){
                         this.currentScript=res.result;
                         this.scriptVisible = true;
@@ -1414,6 +1449,7 @@ export default {
            
         },
 
+
         handlerParamsRole(role){
             if(this.$parent.role=='operator'){
                 this.panes=this.operatorPanes
@@ -1425,9 +1461,9 @@ export default {
 
         beforeUpload(file) {
 
-            // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
             const fileName = file.name
@@ -1579,6 +1615,10 @@ export default {
 
         // 上传视频相关方法
         removeUpload() {
+            this.urlList.url='';
+            this.urlList.md5='';
+            this.urlList.name='';
+           
             this.form.setFieldsValue({
                 contentTagList: null,
                 modalityTagList: null,

+ 173 - 78
src/views/modules/workBench/operator/materialList.vue

@@ -236,11 +236,11 @@
 }
 .videomarterialInfo{
     position: relative;
-    height: 800px;
+    // height: 800px;
 }
 .marterialInfo{
     overflow: auto;
-    height: 800px;
+    // height: 800px;
     position: relative;
     p{margin-bottom: 0;}
     ul,li{
@@ -449,16 +449,34 @@
                                 <p>{{ currentVideo.videoAdvise }}</p>
                             </div>
                             
-                            <div class="bottom-btn">
+                            <!-- <div class="bottom-btn">
                                 <a-button type='primary' @click="approved" v-if="currentMaterial.materialStatus==5" :loading='acceptLoading' style="margin-right:20px">通过审核</a-button>                               
                                 <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="currentMaterial.materialStatus==5"  style="margin-right:20px">驳回</a-button>
                                                             
                                 <a-button type='default' @click="onClose">关闭</a-button>
-                            </div>
+                            </div> -->
                             
                         
                         </div>
-                        </a-spin>   
+                        </a-spin>
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='primary' @click="approved" v-if="currentMaterial.materialStatus==5" :loading='acceptLoading' style="margin-right:20px">通过审核</a-button>                               
+                                <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="currentMaterial.materialStatus==5"  style="margin-right:20px">驳回</a-button>
+                                                            
+                                <a-button type='default' @click="onClose">关闭</a-button>
+                        </div>   
                     </a-drawer>
                     <a-drawer
                     title="脚本详情"
@@ -499,14 +517,33 @@
                             </div>
                                                        
                             <div class="scriptbottom-btn">
-                                <a-button type='primary' @click="scriptApproved" v-if="currentMaterial.materialStatus==2" style="margin-right:20px" >通过审核</a-button>
+                                <!-- <a-button type='primary' @click="scriptApproved" v-if="currentMaterial.materialStatus==2" :loading='acceptLoading' style="margin-right:20px" >通过审核</a-button>
                                
                                 <a-button type='default' v-if="currentMaterial.materialStatus==2" @click="()=>{scriptRejectVisiable=true}"  style="margin-right:20px">驳回</a-button>
                                 
-                                <a-button type='default' @click="scriptClose">关闭</a-button>
+                                <a-button type='default' @click="scriptClose">关闭</a-button> -->
                             </div>
                         </div>
-                        </a-spin>   
+                        </a-spin>
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='primary' @click="scriptApproved" v-if="currentMaterial.materialStatus==2" :loading='acceptLoading' style="margin-right:20px" >通过审核</a-button>
+                               
+                                <a-button type='default' v-if="currentMaterial.materialStatus==2" @click="()=>{scriptRejectVisiable=true}"  style="margin-right:20px">驳回</a-button>
+                                
+                                <a-button type='default' @click="scriptClose">关闭</a-button>
+                        </div>    
                     </a-drawer>
 
                     <!-- bohui -->
@@ -515,24 +552,32 @@
                         <a-button key="back" @click="()=>{videoRejectVisiable=false}">取消</a-button>
                         <a-button type="primary"  @click="reject" :loading="loadingElse">确定驳回</a-button>
                     </template>
-                   <a-textarea
-                    v-model="videoAdvise"
-                    placeholder="请填写驳回理由"
-                    :auto-size="{ minRows: 3, maxRows: 5 }"
-                    />
+                    <div style="position:relative">
+                        <a-textarea
+                        v-model="videoAdvise"
+                        placeholder="请填写驳回理由"
+                        :auto-size="{ minRows: 3, maxRows: 5 }"
+                        :maxLength='50'
+                        />
+                        <span style="position:absolute;bottom:5px;right:10px;line-height:24px"><span style="color:#1890ff">{{videoAdvise.length}}</span>/50</span> 
+                    </div>
+                   
                 </a-modal>
                 <a-modal v-model="scriptRejectVisiable" title="脚本驳回"  width='600px'>
                      <template slot="footer">
                         <a-button key="back" @click="()=>{scriptRejectVisiable=false}">取消</a-button>
                         <a-button type="primary"  @click="scriptReject" :loading="loadingElse">确定驳回</a-button>
                     </template>                   
-                    
+                    <div style="position:relative">
                         <a-textarea
-                        v-model="scriptAdvise"
-                        placeholder="请填写驳回理由"
-                        :auto-size="{ minRows: 3, maxRows: 5 }"
+                            v-model="scriptAdvise"
+                            placeholder="请填写驳回理由"
+                            :auto-size="{ minRows: 3, maxRows: 5 }"
+                            :maxLength='50'
                         />
-                                      
+                        <span style="position:absolute;bottom:5px;right:10px;line-height:24px"><span style="color:#1890ff">{{scriptAdvise.length}}</span>/50</span>     
+                    </div>
+                               
                 </a-modal>
                 
                 </div>
@@ -809,95 +854,145 @@ export default {
 
         // 脚本通过审核
         scriptApproved(){
-            postAction(this.url.scriptAccept,{
-                id:this.currentMaterial.materialId,
-                orderCode:this.currentMaterial.orderCode,
-                materialCode:this.currentMaterial.materialCode
+            this.acceptLoading=true;
+            getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
             }).then(res=>{
-                console.log(res);
-
-                this.scriptVisible=false;
                 if(res.success){
-                    this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    postAction(this.url.scriptAccept,{
+                        id:this.currentMaterial.materialId,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false;
+                        this.scriptVisible=false;
+                        if(res.success){
+                            
+                            this.$message.success(res.message);
+                            this.tableHttp(this.$parent.materialStatus)
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
+                    this.acceptLoading=false;
+                    this.scriptVisible=false;
+                    this.tableHttp(this.$parent.materialStatus)
                     this.$message.error(res.message)
                 }
             })
+            
         },
         // 脚本驳回
         scriptReject(){
             this.loadingElse=true
-            if(this.scriptAdvise){
-                postAction(this.url.scriptReject,{
-                    id:this.currentMaterial.materialId,
-                    scriptAdvise:this.scriptAdvise,
-                    materialCode:this.currentMaterial.materialCode
-                }).then(res=>{
-                    console.log(res);
-                    this.scriptAdvise=''
-                    this.scriptVisible=false;
-                    this.loadingElse=false;
-                    this.scriptRejectVisiable=false
-                    if(res.success){
-                        this.$message.success(res.message);
-                        this.tableHttp(this.$parent.materialStatus)
+             getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
+            }).then(res=>{
+                if(res.success){
+                    if(this.scriptAdvise){
+                        postAction(this.url.scriptReject,{
+                            id:this.currentMaterial.materialId,
+                            scriptAdvise:this.scriptAdvise,
+                            materialCode:this.currentMaterial.materialCode
+                        }).then(res=>{
+                            console.log(res);
+                            this.scriptAdvise=''
+                            this.scriptVisible=false;
+                            this.loadingElse=false;
+                            this.scriptRejectVisiable=false
+                            if(res.success){
+                                this.$message.success(res.message);
+                                this.tableHttp(this.$parent.materialStatus)
+                            }else{
+                                this.$message.error(res.message)
+                            }
+                        })
                     }else{
-                        this.$message.error(res.message)
+                        this.loadingElse=false;
+                        this.$message.error('请填写驳回理由')
                     }
-                })
-            }else{
-                this.loadingElse=false;
-                this.$messgae.error('请填写驳回理由')
-            }
-            
+                }else{
+                    this.loadingElse=false;
+                    this.scriptVisible=false;
+                    this.tableHttp(this.$parent.materialStatus)
+                    this.$message.error(res.message)
+                }
+            })
         },
         // 视频通过审核
         approved(){
             this.acceptLoading=true;
-            postAction(this.url.videoAccept,{
-                id:this.currentMaterial.materialId,
-                orderCode:this.currentMaterial.orderCode,
+            getAction('/platform/material/verifyVideo',{
                 materialCode:this.currentMaterial.materialCode,
-                videoId:this.currentVideo.videoId
+                videoId:this.currentMaterial.videoId,
             }).then(res=>{
-                console.log(res);
-                this.acceptLoading=false;
-                this.visible=false;
                 if(res.success){
-                    this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    postAction(this.url.videoAccept,{
+                        id:this.currentMaterial.materialId,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode,
+                        videoId:this.currentVideo.videoId
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false;
+                        this.visible=false;
+                        if(res.success){
+                            this.$message.success(res.message);
+                            this.tableHttp(this.$parent.materialStatus)
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
                     this.$message.error(res.message)
+                    this.acceptLoading=false
+                    this.visible=false;
+                    this.tableHttp(this.$parent.materialStatus)
                 }
             })
+            
         },
         // 视频驳回
         reject(){
             this.loadingElse=true
-            if(this.videoAdvise){
-                postAction(this.url.videoReject,{
-                    id:this.currentMaterial.materialId,
-                    videoAdvise:this.videoAdvise,
-                    materialCode:this.currentMaterial.materialCode
-                }).then(res=>{
-                    console.log(res);
-                    this.videoAdvise='';
-                    this.visible=false;
-                    this.loadingElse=false;
-                    this.videoRejectVisiable=false
-                    if(res.success){
-                        this.$message.success(res.message);
-                        this.tableHttp(this.$parent.materialStatus)
+            getAction('/platform/material/verifyVideo',{
+                materialCode:this.currentMaterial.materialCode,
+                videoId:this.currentMaterial.videoId,
+            }).then(res=>{
+                if(res.success){
+                    if(this.videoAdvise){
+                        postAction(this.url.videoReject,{
+                            id:this.currentMaterial.materialId,
+                            videoAdvise:this.videoAdvise,
+                            materialCode:this.currentMaterial.materialCode
+                        }).then(res=>{
+                            console.log(res);
+                            this.videoAdvise='';
+                            this.visible=false;
+                            this.loadingElse=false;
+                            this.videoRejectVisiable=false
+                            if(res.success){
+                                this.$message.success(res.message);
+                                this.tableHttp(this.$parent.materialStatus)
+                            }else{
+                                this.$message.error(res.message)
+                            }
+                        })
                     }else{
-                        this.$message.error(res.message)
+                        this.loadingElse=false;
+                        this.$message.error('请填写驳回理由')
                     }
-                })
-            }else{
-                this.loadingElse=false;
-                this.$message.error('请填写驳回理由')
-            }
-            
+                }else{
+                    this.$message.error(res.message)
+                    this.loadingElse=false
+                    this.visible=false;
+                    this.tableHttp(this.$parent.materialStatus)
+                }
+            })
         },
         
         search(){

+ 2 - 2
src/views/modules/workBench/operator/platForm.vue

@@ -93,7 +93,7 @@
                                             <span class="item-icon"></span>
                                             <div class="content">
                                                 <p class="name">{{item.orderTitle}}</p>
-                                                <p class="desc">{{item.orderRemark}}</p>
+                                                <p class="desc">{{item.orderRemark|| '-'}}</p>
                                             </div>
                                         </div>
                                         
@@ -269,7 +269,7 @@ export default {
                        
                             let time='';
                             let startTime=moment(item.createTime)
-                            console.log(startTime) 
+                            // console.log(startTime) 
                             if(moment().diff(startTime,'hours')>24){
                                 time=item.createTime.split(/[ ]+/)[0]
                                 return {

+ 238 - 161
src/views/modules/workBench/orderDetail.vue

@@ -238,11 +238,11 @@
 }
 .videomarterialInfo{
     position: relative;
-    height: 800px;
+    // height: 800px;
 }
 .marterialInfo{
     overflow: auto;
-     height: 800px;
+    //  height: 800px;
     position: relative;
     p{margin-bottom: 0;}
     ul,li{
@@ -363,21 +363,8 @@
                 <div class="optBody">
                     <div class="btnBody" v-if="role=='designLeader'">
                         <a-button type='primary' @click="confirmOrder" :loading='confirmOrderBtnLoading' v-if="currentOrderInfo.orderStatus==0">确定订单</a-button>
-                        <a-popover
-                            title="驳回"
-                            trigger="click"
-                            >
-                            <div slot="content">
-                               <a-textarea
-                                v-model="orderAdvice"
-                                placeholder="请填写驳回理由"
-                                :auto-size="{ minRows: 3, maxRows: 5 }"
-                                />
-                                <a @click="rejectOrder" style="margin-top:30px;text-align:right">确定驳回</a>
-                            </div>
-                             <a-button type='default'   :loading='rejectOrderBtnLoading' v-if="currentOrderInfo.orderStatus==0">驳回订单</a-button>
-                        </a-popover>
-                       
+                        <a-button type='default' @click="()=>{orderRejectVisiable=true}"  :loading='rejectOrderBtnLoading' v-if="currentOrderInfo.orderStatus==0">
+                            驳回订单</a-button>                
                     </div>
                     <div class="btnBody" v-if="role=='operator'">
                         <a-popconfirm
@@ -401,12 +388,27 @@
                             <p class="big">{{ currentOrderInfo.orderStatus | handlerOrderStatus}}</p>
                         </div>
                         <div>
-                            <p class="markName">订单度</p>
+                            <p class="markName">订单完成度</p>
                             <p class="big">{{Math.round((currentOrderInfo.materialFinishAmount/currentOrderInfo.materialAmount)*100)|| 0 }}%</p>
                         </div>
                     </div>
                 </div>
-                
+                <a-modal v-model="orderRejectVisiable" title="订单驳回"  width='600px'>
+                     <template slot="footer">
+                        <a-button key="back" @click="()=>{orderRejectVisiable=false}">取消</a-button>
+                        <a-button type="primary"  @click="rejectOrder" :loading="loadingElse">确定驳回</a-button>
+                    </template>
+                    <div style="position:relative">
+                    <a-textarea
+                    v-model="orderAdvice"
+                    placeholder="请填写驳回理由"
+                    :auto-size="{ minRows: 3, maxRows: 5 }"
+                    :maxLength='50'
+                    />
+                    <span style="position:absolute;bottom:5px;right:10px;line-height:24px"><span style="color:#1890ff">{{orderAdvice.length}}</span>/50</span>
+                    </div>
+                   
+                </a-modal>
             </div>
         </div>
         <div class="section">
@@ -489,7 +491,7 @@
                         </div>
                         <div class="bottom">
                             <h4>备注</h4>
-                            <p>{{currentOrderInfo.orderRemark}}</p>
+                            <p style="line-height:24px;text-indent:2em">{{currentOrderInfo.orderRemark}}</p>
                         </div>
                     </div>
 
@@ -586,7 +588,7 @@
                                             :multiple="false"
                                         />
                                         <span v-if="repeat" style="color: red">此素材重复,请重新选择上传</span>
-                                        <span v-if="confirmLoading && videoinfo.url != ''" style="color: green">上传成功</span>
+                                        <span v-if="confirmLoading && urlList.url != ''" style="color: green">上传成功</span>
                                     </a-form-item>
                                     <a-form-item
                                         label="封面上传"
@@ -697,34 +699,7 @@
                                             style="width: 100%"
                                         ></el-cascader>
                                     </a-form-item>
-                                    <!-- <a-form-item
                                     
-                                        label="其他"
-                                        v-if="add"
-                                        >
-                                        <template v-for="(tag, index) in tags">
-                                            <a-tooltip v-if="tag.length > 20" :key="tag" :title="tag">
-                                            <a-tag :key="tag" :closable="index !== 0" :afterClose="() => handleClose(tag)">{{
-                                                `${tag.slice(0, 20)}...`
-                                            }}</a-tag>
-                                            </a-tooltip>
-                                            <a-tag v-else :key="tag" :closable="true" :afterClose="() => handleClose(tag)">{{ tag }}</a-tag>
-                                        </template>
-                                        <a-input
-                                            v-if="inputVisible"
-                                            ref="input"
-                                            type="text"
-                                            size="small"
-                                            :style="{ width: '78px' }"
-                                            :value="inputValue"
-                                            @change="handleInputChange"
-                                            @blur="handleInputConfirm"
-                                            @keyup.enter="handleInputConfirm"
-                                        />
-                                        <a-tag v-else @click="showInput" style="background: #fff; borderstyle: dashed">
-                                            <a-icon type="plus" />New Tag
-                                        </a-tag>
-                                    </a-form-item> -->
                                     <a-form-item
                                     
                                         label="描述"
@@ -733,7 +708,7 @@
                                         <a-textarea
                                             placeholder="请输入描述"
                                             v-decorator="[
-                                            'describe', // 给表单赋值或拉取表单时,该input对应的key
+                                            'description', // 给表单赋值或拉取表单时,该input对应的key
                                             ]"
                                             :auto-size="{ minRows: 3, maxRows: 10 }"
                                         />
@@ -815,13 +790,32 @@
                                 <p>{{ currentVideo.videoAdvise }}</p>
                             </div>
                             <div class="bottom-btn">
-                                <a-button type='primary' @click="approved" v-if="role=='operator'&&currentMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
+                                <!-- <a-button type='primary' @click="approved" v-if="role=='operator'&&currentMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
                                 <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="role=='operator'&&currentMaterial.materialStatus==5"  style="margin-right:20px">驳回</a-button>            
-                                 <a-button type='primary' v-if="role!='operator'&&currentVideo.videoStatus==2" :disabled="currentVideo.clip!=userInfo.id" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>                                                   
-                                <a-button type='default' @click="onClose">关闭</a-button>
+                                 <a-button type='primary' v-if="role!='operator'&&currentVideo.videoStatus>=1" :disabled="currentVideo.clip!=userInfo.id" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>                                                   
+                                <a-button type='default' @click="onClose">关闭</a-button> -->
                             </div>
                         </div>
+                        
                         </a-spin>   
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='primary' @click="approved" v-if="role=='operator'&&currentMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
+                            <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="role=='operator'&&currentMaterial.materialStatus==5"  style="margin-right:20px">驳回</a-button>            
+                                <a-button type='primary' v-if="role!='operator'&&currentVideo.videoStatus>=1" :disabled="currentVideo.clip!=userInfo.id" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>                                                   
+                            <a-button type='default' @click="onClose">关闭</a-button>
+                        </div>
                     </a-drawer>
                     
 
@@ -864,7 +858,7 @@
                                 <div v-if="currentScript.scriptStatus>0" style="margin-right:20px">
                                     <a :href="currentScript.url">{{currentScript.scriptName}}</a>
                                 </div>
-                                <div v-if="currentScript.scriptStatus==0||currentScript.scriptStatus==2">
+                                <div v-if="currentScript.scriptStatus<3">
                                    
                                     <p v-if="currentMaterial.plan==userInfo.id">
                                         <a-upload
@@ -904,16 +898,28 @@
                                 </div>
                                 
                             </div>
-                                                       
-                            <div class="scriptbottom-btn">
-                                <a-button type='primary' @click="scriptApproved" style="margin-right:20px" v-if="role=='operator'&&currentMaterial.materialStatus==2">通过审核</a-button>
+                        </div>
+                        
+                        </a-spin>  
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='primary' @click="scriptApproved" style="margin-right:20px" :loading='acceptLoading' v-if="role=='operator'&&currentMaterial.materialStatus==2">通过审核</a-button>
                                 
                                 <a-button type='default' v-if="role=='operator'&&currentMaterial.materialStatus==2" @click="()=>{scriptRejectVisiable=true}"  style="margin-right:20px">驳回</a-button>
                                 <!-- <a-button type='primary' @click="dowmLoadScript" style="margin-right:20px">下载脚本</a-button> -->
                                 <a-button type='default' @click="scriptClose">关闭</a-button>
-                            </div>
-                        </div>
-                        </a-spin>   
+                        </div> 
                     </a-drawer>
                     
                 </div>
@@ -939,13 +945,14 @@
                                 <a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
                                 </a-select>
                             </a-form-model-item>
-                            <a-form-model-item  label="拍摄"  ref="shot"  prop="shot">
-                                <a-select
-                                    
+                            <!-- {{currentMaterial.materialType==1?true:false}} -->
+                            <a-form-model-item  label="拍摄"  ref="shot"  prop="shot" :rules='[{ required: currentMaterial.materialType==1, message: "拍摄人员必须指派" ,trigger: "change" }]'>
+                                <a-select                                   
                                     v-model="formPerson.shot"
                                     showSearch
                                     optionFilterProp="children"
                                     :filterOption="filterOption"
+                                    
                                 >
                                 <a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
                                 </a-select>
@@ -970,23 +977,32 @@
                         <a-button key="back" @click="()=>{videoRejectVisiable=false}">取消</a-button>
                         <a-button type="primary"  @click="reject" :loading="loadingElse">确定驳回</a-button>
                     </template>
-                    
-                   <a-textarea
-                    v-model="videoAdvise"
-                    placeholder="请填写驳回理由"
-                    :auto-size="{ minRows: 3, maxRows: 5 }"
-                    />
+                    <div style="position:relative">
+                        <a-textarea
+                        v-model="videoAdvise"
+                        placeholder="请填写驳回理由"
+                        :auto-size="{ minRows: 3, maxRows: 5 }"
+                        :maxLength='50'
+                        />
+                        <span style="position:absolute;bottom:5px;right:10px;line-height:24px"><span style="color:#1890ff">{{videoAdvise.length}}</span>/50</span>
+                    </div>
+                   
                 </a-modal>
                 <a-modal v-model="scriptRejectVisiable" title="脚本驳回"  width='600px'>
                     <template slot="footer">
                         <a-button key="back" @click="()=>{scriptRejectVisiable=false}">取消</a-button>
                         <a-button type="primary"  @click="scriptReject" :loading="loadingElse">确定驳回</a-button>
                     </template>
-                   <a-textarea
-                    v-model="scriptAdvise"
-                    placeholder="请填写驳回理由"
-                    :auto-size="{ minRows: 3, maxRows: 5 }"
-                    />
+                    <div style="position:relative">
+                        <a-textarea
+                        v-model="scriptAdvise"
+                        placeholder="请填写驳回理由"
+                        :auto-size="{ minRows: 3, maxRows: 5 }"
+                        :maxLength='50'
+                        />
+                        <span style="position:absolute;bottom:5px;right:10px;line-height:24px"><span style="color:#1890ff">{{scriptAdvise.length}}</span>/50</span>
+                    </div>
+                   
                 </a-modal>
             </div>
         </div>
@@ -1130,15 +1146,17 @@ export default {
     },
     data() {
         return {
+            orderRejectVisiable:false,
+            acceptLoading:false,
             videoEchoInfo:{},
             videoUploadLoading:false,
             videoRejectType:'1',
             assignVisibleLoading:false,
             visibleLoading:false,
-             rules: {
+            rules: {
                 
                 clip: [{ required: true, message: '剪辑人员必须指派', trigger: 'change' }],
-                // shot: [{ required: true, message: '拍摄人员必须指派', trigger: 'change' }],
+                // shot: [],
                 plan: [{ required: true, message: '编导人员必须指派', trigger: 'change' }],
                 
             },
@@ -1486,6 +1504,7 @@ export default {
                 postAction(this.url.rejectOrder,params).then(res=>{
                     console.log(res)
                     this.rejectOrderBtnLoading=false;
+                    this.orderRejectVisiable=false;
                     if(res.success){
                         this.$message.success(res.message)
                         this.orderDetailHttp()
@@ -1615,7 +1634,9 @@ export default {
                 this.data=[]
                 if(res.success){
                     this.data=res.result.list;
+                    // this.data=res.result.list.filter(item=>item.materialType==this.tabKey);
                     this.ipagination.total=res.result.total
+                    // this.ipagination.total=this.data.length
                     this.loading=false
                 }
             })
@@ -1625,73 +1646,111 @@ export default {
 
         // tabqiehuan
         tabChange(key){
-            console.log(key);
-            
+            // console.log(key);
+            this.materialHttp()
+            this.ipagination.current=1
         },
 
         // shipin通过审核
         approved(){
-            postAction(this.url.videoAccept,{
-                id:this.currentMaterial.id,
-                orderCode:this.currentMaterial.orderCode,
+            this.acceptLoading=true;
+            getAction('/platform/material/verifyVideo',{
                 materialCode:this.currentMaterial.materialCode,
-                videoId:this.currentVideo.videoId
+                videoId:this.currentMaterial.videoId,
             }).then(res=>{
-                console.log(res);
-
-                this.visible=false;
-                this.videoAdvise=''
                 if(res.success){
-                    this.$message.success(res.message);
-                    // this.tableHttp(this.$parent.materialStatus)
-                    this.materialHttp()
+                    postAction(this.url.videoAccept,{
+                        id:this.currentMaterial.id,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode,
+                        videoId:this.currentVideo.videoId
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false
+                        this.visible=false;
+                        this.videoAdvise=''
+                        if(res.success){
+                            this.$message.success(res.message);
+                            
+                            this.materialHttp()
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
                     this.$message.error(res.message)
+                    this.acceptLoading=false
+                    this.materialHttp()
                 }
             })
         },
         // 视频驳回
         reject(){   
             this.loadingElse=true;
-            if(this.videoAdvise){
-                postAction(this.url.videoReject,{
-                    id:this.currentMaterial.id,
-                    videoAdvise:this.videoAdvise,
-                    materialCode:this.currentMaterial.materialCode
-                    
-                }).then(res=>{
-                    console.log(res);
-                    this.videoAdvise=''
-                    this.visible=false;
-                    this.videoRejectVisiable=false;
-                    if(res.success){
-                        this.$message.success(res.message);
-                        this.materialHttp()
+            getAction('/platform/material/verifyVideo',{
+                materialCode:this.currentMaterial.materialCode,
+                videoId:this.currentMaterial.videoId,
+            }).then(res=>{
+                if(res.success){
+                    if(this.videoAdvise){
+                        postAction(this.url.videoReject,{
+                            id:this.currentMaterial.id,
+                            videoAdvise:this.videoAdvise,
+                            materialCode:this.currentMaterial.materialCode
+                            
+                        }).then(res=>{
+                            console.log(res);
+                            this.loadingElse=false
+                            this.videoAdvise=''
+                            this.visible=false;
+                            this.videoRejectVisiable=false;
+                            if(res.success){
+                                this.$message.success(res.message);
+                                this.materialHttp()
+                            }else{
+                                this.$message.error(res.message)
+                            }
+                        })
                     }else{
-                        this.$message.error(res.message)
-                    }
-                })
-            }else{
-                this.loadingElse=false;
-                this.$message.error('请填写驳回理由')
-            }        
-            
+                        this.loadingElse=false;
+                        this.$message.error('请填写驳回理由')
+                    }        
+                }else{
+                    this.$message.error(res.message)
+                    this.loadingElse=false
+                    this.materialHttp()
+                }
+            })
 
         },
         // 脚本通过审核
         scriptApproved(){
-            postAction(this.url.scriptAccept,{
-                id:this.currentMaterial.id,
-                 orderCode:this.currentMaterial.orderCode,
-                 materialCode:this.currentMaterial.materialCode
+            // console.log(this.currentMaterial)
+            this.acceptLoading=true;
+            getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
             }).then(res=>{
-                console.log(res);
-
-                this.scriptVisible=false;
                 if(res.success){
-                    this.$message.success(res.message);
-                    this.materialHttp()
+                    postAction(this.url.scriptAccept,{
+                        id:this.currentMaterial.id,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false
+                        this.scriptVisible=false;
+                        if(res.success){
+                            this.$message.success(res.message);
+                            this.materialHttp()
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
+                    this.acceptLoading=false;
+                    this.scriptVisible=false;
+                    this.materialHttp()
                     this.$message.error(res.message)
                 }
             })
@@ -1699,30 +1758,41 @@ export default {
         // 脚本驳回
         scriptReject(){
             this.loadingElse=true;
-            if(this.scriptAdvise){
-                postAction(this.url.scriptReject,{
-                    id:this.currentMaterial.id,
-                    scriptAdvise:this.scriptAdvise,
-                    materialCode:this.currentMaterial.materialCode
-                }).then(res=>{
-                    console.log(res);
+            getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
+            }).then(res=>{
+                if(res.success){
+                    if(this.scriptAdvise){
+                        postAction(this.url.scriptReject,{
+                            id:this.currentMaterial.id,
+                            scriptAdvise:this.scriptAdvise,
+                            materialCode:this.currentMaterial.materialCode
+                        }).then(res=>{
+                            console.log(res);
 
-                    this.scriptVisible=false;
-                    this.scriptAdvise=''
-                    this.scriptRejectVisiable=false;
-                    this.loadingElse=false;
-                    if(res.success){
-                        this.$message.success(res.message);
-                        this.materialHttp()
+                            this.scriptVisible=false;
+                            this.scriptAdvise=''
+                            this.scriptRejectVisiable=false;
+                            this.loadingElse=false;
+                            if(res.success){
+                                this.$message.success(res.message);
+                                this.materialHttp()
+                            }else{
+                                this.$message.error(res.message)
+                            }
+                        })
                     }else{
-                        this.$message.error(res.message)
+                        this.loadingElse=false;
+                        this.$message.error('请填写驳回理由')
                     }
-                })
-            }else{
-                this.loadingElse=false;
-                this.$messgae.error('请填写驳回理由')
-            }
-            
+                }else{
+                    this.loadingElse=false;
+                    this.scriptVisible=false;
+                    this.materialHttp()
+                    this.$message.error(res.message)
+                }
+            })
         },
         // 生成水印
         getWater() {
@@ -1748,30 +1818,29 @@ export default {
         // 请求order详情数据
         orderDetailHttp(){
             this.pageSpinning=true;
+            this.currentOrderInfo={}
             getAction(this.url.orderDetail,{
                 id:this.currentOrderId
             }).then(res=>{
                 console.log(res)
                 this.pageSpinning=false;
-                this.currentOrderInfo={}
                 if(res.success){
                     this.currentOrderInfo=res.result;
-                    if(res.result.orderStatus){
-                        switch(res.result.orderStatus){
-                            case 0:
-                                this.currentStep=1;
-                                break
-                            case 1:
-                                this.currentStep=2;
-                                break
-                            case 2:
-                                this.currentStep=0;
-                                break
-                            case 3:
-                                this.currentStep=3;
-                                break
+                    // res.result.orderStatus
+                    console.log(this.currentOrderInfo.orderStatus)
+                    if(this.currentOrderInfo.orderStatus || this.currentOrderInfo.orderStatus==0){
+                        if(this.currentOrderInfo.orderStatus==0){
+                            this.currentStep=1;
+                        }else if(this.currentOrderInfo.orderStatus==1){
+                            this.currentStep=2;
+                        }else if(this.currentOrderInfo.orderStatus==2){
+                            this.currentStep=0;
+                        }else if(this.currentOrderInfo.orderStatus==3){
+                            this.currentStep=3;
                         }
+                        
                     }
+                    console.log(this.currentStep)
 
                     this.materialHttp()
                 }
@@ -1803,8 +1872,8 @@ export default {
 
 
         beforeUpload(file) {
-            // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
             // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
 
             this.loadDisabled = true
@@ -2027,6 +2096,10 @@ export default {
 
         // 上传视频相关方法
         removeUpload() {
+            this.urlList.url='';
+            this.urlList.md5='';
+            this.urlList.name='';
+           
             this.form.setFieldsValue({
                 contentTagList: null,
                 modalityTagList: null,
@@ -2324,10 +2397,7 @@ export default {
         // });
 
         this.getTagListAll()
-        
-    },
-    mounted() {
-       let userInfo=localStorage.getItem('pro__Login_Userinfo');
+         let userInfo=localStorage.getItem('pro__Login_Userinfo');
         if(userInfo){
             this.userInfo=JSON.parse(userInfo).value
         }
@@ -2338,6 +2408,13 @@ export default {
         if(this.currentOrderId){
             this.orderDetailHttp()
         } 
+        
+    },
+    mounted() {
+       
+    },
+    destroyed() {
+        this.currentOrderInfo={}
     },
     activated() {
         this.currentOrderId=this.$parent.orderId;

+ 1 - 1
src/views/modules/workBench/orderList.vue

@@ -333,7 +333,7 @@
                         </div>
                         <div class="opt-item">
                             <a-button type='primary' @click="search" style="margin-right:20px">查询</a-button>
-                            <a-button type='default' @click="reset">查询</a-button>
+                            <a-button type='default' @click="reset">重置</a-button>
                         </div>
                     </div>
                         

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

@@ -266,7 +266,7 @@
                         <div class="hint-item"></div>
                         <div class="label-item">
                             <div class="text-item">APK链接</div>
-                            <div class="required-item"></div>
+                            <!-- <div class="required-item"></div> -->
                         </div>
                         <div class="input-item"> 
                             <a-form-model-item ref="sysPackage"  prop="sysPackage">
@@ -302,7 +302,7 @@
                         <div class="hint-item"></div>
                         <div class="label-item">
                             <div class="text-item">日均产量</div>
-                            <div class="required-item"></div>
+                            <!-- <div class="required-item"></div> -->
                         </div>
                         <div class="input-item"> 
                             <a-form-model-item ref="materialAmountDay"  prop="materialAmountDay">
@@ -362,8 +362,10 @@
                                 <a-textarea
                                     v-model="form.orderRemark"
                                     placeholder="请输入订单备注"
-                                    :auto-size="{ minRows: 3,  }"
+                                    :auto-size="{ minRows: 7, }"
+                                    :maxLength='200'
                                 />
+                                <span style="position:absolute;bottom:0px;right:10px;line-height:24px"><span style="color:#1890ff">{{form.orderRemark.length}}</span>/200</span>
                             </a-form-model-item>
                         </div>
                     </div>
@@ -465,15 +467,15 @@ export default {
             rules: {
                 orderTitle: [
                     { required: true, message: '请填写订单标题', trigger: 'blur' },
-                    { min: 2, message: '长度不得小于2', trigger: 'blur' },
-                ],
-                sysPackage: [
-                    { required: true, message: '请输入APK链接', trigger: 'blur' },
-                    { min: 2, message: '长度不得小于2', trigger: 'blur' },
+                    { min: 2, message: '订单标题长度不得小于2', trigger: 'blur' },
                 ],
+                // sysPackage: [
+                //     { required: true, message: '请输入APK链接', trigger: 'blur' },
+                //     { min: 2, message: '长度不得小于2', trigger: 'blur' },
+                // ],
                 dataValue: [{ required: true, message: '请选择订单周期', trigger: 'change' }],
-                materialAmount: [{ required: true, message: '素材总数必须大于1', trigger: 'change' }],
-                materialAmountDay: [{required: true, message: '日均产量必须填写', trigger: 'change' }],
+                materialAmount: [{ required: true, message: '素材总数必须大于等于1', trigger: 'change' }],
+                // materialAmountDay: [{required: true, message: '日均产量必须填写', trigger: 'change' }],
                 project: [{required: true, message: '请选择关联项目', trigger: 'change' }],
                 design: [{required: true, message: '请选择设计组长', trigger: 'change' }],
                 cutAmount: [
@@ -501,6 +503,7 @@ export default {
         }
     },
     methods: {
+        
         goPlantForm(){
             if(this.$parent.role=='operator'){
                 this.$parent.currentTabComponent='operatorPlatform'
@@ -509,6 +512,7 @@ export default {
             }else if(this.$parent.role=='design'){
                 this.$parent.currentTabComponent='operatorPlatform'
             }
+            this.$parent.isEdit=false;
         },
         disabledDate(current) {
             return current && current < moment().subtract(1,'days')
@@ -698,8 +702,8 @@ export default {
 
         beforeUpload(file) {
             // ${this.form.project}
-            // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadAttachment?projectId=772`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadAttachment?projectId=772`
+            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadAttachment?projectId=772`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadAttachment?projectId=772`
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
             const fileName = file.name

+ 3 - 4
vue.config.js

@@ -63,13 +63,13 @@ module.exports = {
 
   devServer: {
     hot:true,
-    // inline: true,
+    // inline: true,
     port: 3000,
     open : true,
     proxy: {
       '/jeecg-boot': {
         //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪.1963
+        // 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后台项目  祚云
         // target: 'http://192.168.1.43:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
@@ -77,7 +77,7 @@ module.exports = {
         // target: 'http://192.168.1.43:8087', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
-        // target: 'http://192.168.1.193:8088', //请求本地 需要jeecg-boot后台项目  李煜一
+        // target: 'http://192.168.1.193:8080', //请求本地 需要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后台项目
@@ -86,7 +86,6 @@ module.exports = {
         // target:'http://118.24.244.213:8804',
         // target:'http://139.186.151.174:8804', //测试
 
-
         ws: false,
 
         changeOrigin: true,