소스 검색

提交代码

zhuxinbo 4 년 전
부모
커밋
e998d76246

+ 1 - 1
package.json

@@ -3,7 +3,7 @@
   "version": "2.0.2",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve  --max_old_space_size=8048 --open",
+    "serve": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit",

+ 3 - 3
src/views/modules/Statistics/accountReport.vue

@@ -90,7 +90,7 @@
                   </span>
                 </a-tooltip>
             </div>
-            <div class="infoNum">
+            <div class="infoNum">
                 <span class="red">{{clickLink.click | formatCurrency }}</span> 
                 <span class="green" v-if="dateValue[0].format('YYYY-MM-DD')==dateValue[1].format('YYYY-MM-DD')"><span class="huanbi">环比: </span> {{ clickLink.clickLink|toPercentage  }}</span> 
             </div>
@@ -105,7 +105,7 @@
                   </span>
                 </a-tooltip>
             </div>
-            <div class="infoNum">
+            <div class="infoNum">
                 <span class="red">{{showNumLink.showNum | formatCurrency }}</span> 
                 <span class="green" v-if="dateValue[0].format('YYYY-MM-DD')==dateValue[1].format('YYYY-MM-DD')"><span class="huanbi">环比: </span> {{ showNumLink.showNumLink|toPercentage  }}</span> 
             </div>
@@ -120,7 +120,7 @@
                   </span>
                 </a-tooltip>
             </div>
-            <div class="infoNum">
+            <div class="infoNum">
                 <span class="red">{{convertNumLink.convertNum | formatCurrency }}</span> 
                 <span class="green" v-if="dateValue[0].format('YYYY-MM-DD')==dateValue[1].format('YYYY-MM-DD')"><span class="huanbi">环比: </span> {{ convertNumLink.convertNumLink|toPercentage  }}</span> 
             </div>

+ 1 - 1
src/views/modules/Statistics/alipayStatistics.vue

@@ -508,7 +508,7 @@ export default {
       params.discount = this.discount
       downFilePost('/ctop/daily/exportDailyReport', params).then(res => {
         let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接

+ 1 - 1
src/views/modules/Statistics/caicaicai/dayStatistics.vue

@@ -373,7 +373,7 @@ export default {
       })[0].projectName
       downFilePost('/ctop/advertiser/exportXxlDailyReport', param).then(res => {
         let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接

+ 1 - 1
src/views/modules/Statistics/companyDetail.vue

@@ -299,7 +299,7 @@ export default {
       downFilePost('/agent/kuaiShouDailyAgent/companyReportAccountDetailListExportExcel', params).then(
         res => {
           let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
+            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
           })
           let downloadElement = document.createElement('a')
           let href = window.URL.createObjectURL(blob) //创建下载的链接

+ 2 - 1
src/views/modules/Statistics/companyStatistics.vue

@@ -387,7 +387,8 @@ export default {
     exportExcel() {
       downFilePost('/agent/kuaiShouDailyAgent/companyReportExportExcel', this.params).then(res => {
         let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+          
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接

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

@@ -236,4 +236,4 @@ export default {
 /*.clear{*/
 /*  margin:20px 0px 20px 0px;*/
 /*}*/
-</style>
+</style>

+ 1 - 1
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -448,7 +448,7 @@ export default {
       // })[0].projectName
       // downFilePost('/ctop/yiche/report/exportDailyReport', params).then(res => {
       //   let blob = new Blob([res], {
-      //     type: 'application/vnd.ms-excel'
+      //     type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       let column = this.columns.map((item, index) => {
         return item.dataIndex
       })

+ 1 - 1
src/views/modules/Statistics/yicheStatistics/dayStatistics.vue

@@ -637,7 +637,7 @@ export default {
       })[0].projectName
       downFilePost('/ctop/yiche/report/exportDailyReport', params).then(res => {
         let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接

+ 1 - 1
src/views/modules/Statistics/yicheStatistics/timeStatistics.vue

@@ -383,7 +383,7 @@ export default {
       })[0].projectName
       downFilePost('/ctop/yiche/report/exportHourReport', params).then(res => {
         let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
         let downloadElement = document.createElement('a')
         let href = window.URL.createObjectURL(blob) //创建下载的链接

+ 44 - 19
src/views/modules/material/labelMaterial.vue

@@ -64,12 +64,16 @@
         <span slot="action" slot-scope="text, record">
           <a href="javascript:;" @click="handleAddSub(record)" :disabled="record.level==3">添加下级</a>
           <a-divider type="vertical" />
-
+          <a @click="handleDeleteModel(record)" :disabled="!IsURL(record.model)">查看示例</a>
+          <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link" @click="e => e.preventDefault()">
               更多
             </a>
             <a-menu slot="overlay">
+              <!-- <a-menu-item key="4" :disabled="!IsURL(record.model)">
+                <a style="margin-right:20px" @click="handleDeleteModel(record)">查看示例</a>
+              </a-menu-item> -->
               <a-menu-item key="0">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteElse(record.id)">
                   <a>删除</a>
@@ -201,25 +205,26 @@
           return text
         }
       },
-      align: 'center'
-    },
-    {
-      title: '标签示例',
-      dataIndex: 'model',
-      key: 'model',
-      scopedSlots: {
-        customRender: 'model'
-      },
-      //   customRender: function (text) {
-      //     if (text == null) {
-      //       return '-'
-      //     } else {
-      //       return text
-      //     }
-      //   },
       align: 'center',
-      width: 200
+      width: 400
     },
+    // {
+    //   title: '标签示例',
+    //   dataIndex: 'model',
+    //   key: 'model',
+    //   scopedSlots: {
+    //     customRender: 'model'
+    //   },
+    //   //   customRender: function (text) {
+    //   //     if (text == null) {
+    //   //       return '-'
+    //   //     } else {
+    //   //       return text
+    //   //     }
+    //   //   },
+    //   align: 'center',
+    //   width: 200
+    // },
     {
       title: '操作',
       dataIndex: 'action',
@@ -227,7 +232,7 @@
         customRender: 'action'
       },
       align: 'center',
-      width: 150
+      width: 250
     }
   ]
   export default {
@@ -253,6 +258,26 @@
       }
     },
     methods: {
+      IsURL(res) {
+        //   var strRegex = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/|www\.)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/
+        var strRegex =
+          /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+(.+[A-Za-z0-9-~\/])+$/
+        var re = new RegExp(strRegex)
+        // console.log(re.test(res))
+        if (re.test(res)) {
+          return true
+        } else {
+          return false
+        }
+      },
+      handleDeleteModel(record) {
+        if (record.model) {
+          if (this.IsURL(record.model)) {
+            window.open(record.model, '_blank')
+          }
+
+        }
+      },
       handleDeleteStatus(id, status) {
         httpAction('/ctop/tagInfo/edit', {
           id: id,

+ 11 - 3
src/views/modules/material/modules/DepartModal.vue

@@ -5,7 +5,8 @@
       <a-form :form="form">
 
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签分类" :hidden="false" hasFeedback>
-          <a-select v-decorator="['tagCategoryId', {rules: [{ required: true, message: '请选择标签分类'}]} ]" placeholder="请选择">
+          <a-select v-decorator="['tagCategoryId', {rules: [{ required: true, message: '请选择标签分类'}]} ]"
+            placeholder="请选择">
             <a-select-option :value="1">形式</a-select-option>
             <a-select-option :value="2">基调</a-select-option>
             <a-select-option :value="3">内容</a-select-option>
@@ -16,7 +17,7 @@
           <a-input id="tagName" placeholder="请输入标签名称" v-decorator="['tagName', validatorRules.departName ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签编码">
-          <a-input placeholder="请输入标签编码" v-decorator="['tagCode',validatorRules.orgCode]" :maxLength="4" />
+          <a-input placeholder="请输入标签编码,以字母加数字拼接,如A001" v-decorator="['tagCode',validatorRules.orgCode]" :maxLength="4" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签描述">
           <a-input placeholder="请输入标签描述" v-decorator="['description']" />
@@ -88,7 +89,7 @@
             rules: [{
               required: true,
               message: '请输入标签编码!'
-            }]
+            }], validator: this.validate
           },
           mobile: {
             rules: [{
@@ -104,6 +105,13 @@
     },
     created() {},
     methods: {
+      validate(rule, value, callback) {
+        const regex = /^http(.*)$/
+        if (!regex.test(value)) {
+          callback('需要以 http 开头')
+        }
+        callback()
+      },
       loadTreeData() {
         var that = this;
         queryIdTree().then((res) => {

+ 165 - 36
src/views/modules/material/videoMaterial.vue

@@ -310,7 +310,7 @@
   <a-card :bordered="false">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
-      <a-form layout="inline">
+      <a-form layout="inline" :selfUpdate="true">
         <a-row :gutter="24">
           <a-col :md="8" :sm="8">
             <!-- <a-form-item label="项目名称"> -->
@@ -658,6 +658,18 @@
       <a-form :form="form">
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="项目选择">
           <!-- <selectTable :projectId.sync="projectId" /> -->
+          <!-- <a-select v-decorator="[
+              'projectId', // 给表单赋值或拉取表单时,该input对应的key
+              { rules: [{ required: true, message: '请选择项目!' }] }
+            ]" @change="getProjectId" showSearch optionFilterProp="children" :filterOption="filterOption"
+            :default-active-first-option="false" :show-arrow="false" :not-found-content="null" :disabled="!add"
+            @search="getParticipateList">
+            <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
+              {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
+              item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
+              }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
+            </a-select-option>
+          </a-select> -->
           <a-select v-decorator="[
               'projectId', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请选择项目!' }] }
@@ -758,13 +770,42 @@
         <a-form-item :label-col="labelCol" :wrapper-col="{
             xs: { span: 24 },
             sm: { span: 12 }
-          }" label="标签" v-if="add">
-          <el-cascader placeholder="搜索你想要的标签" :options="departTree" v-decorator="[
-              'tagList', // 给表单赋值或拉取表单时,该input对应的key
-              { rules: [{ required: true, message: '请选择标签!' }] }
+          }" label="形式标签" v-if="add">
+          <el-cascader placeholder="搜索你想要的形式标签" :options="departTreeModality" v-decorator="[
+              'modalityTagList', // 给表单赋值或拉取表单时,该input对应的key
+              { rules: [{ required: true, message: '请选择形式标签!' }] }
+            ]" :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
+          </el-cascader>
+        </a-form-item>
+        <a-form-item :label-col="labelCol" :wrapper-col="{
+            xs: { span: 24 },
+            sm: { span: 12 }
+          }" label="内容标签" v-if="add">
+          <el-cascader placeholder="搜索你想要的内容标签" :options="departTreeContent" v-decorator="[
+              'contentTagList', // 给表单赋值或拉取表单时,该input对应的key
+              { rules: [{ required: true, message: '请选择内容标签!' }] }
+            ]" :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
+          </el-cascader>
+        </a-form-item>
+        <a-form-item :label-col="labelCol" :wrapper-col="{
+            xs: { span: 24 },
+            sm: { span: 12 }
+          }" label="场景标签" v-if="add">
+          <el-cascader placeholder="搜索你想要的场景标签" :options="departTreeSence" v-decorator="[
+              'senceTagList', // 给表单赋值或拉取表单时,该input对应的key
+              { rules: [{ required: true, message: '请选择场景标签!' }] }
+            ]" :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
+          </el-cascader>
+        </a-form-item>
+        <a-form-item :label-col="labelCol" :wrapper-col="{
+            xs: { span: 24 },
+            sm: { span: 12 }
+          }" label="基调标签" v-if="add">
+          <el-cascader placeholder="搜索你想要的基调标签" :options="departTreeMod" v-decorator="[
+              'modTagList', // 给表单赋值或拉取表单时,该input对应的key
+              { rules: [{ required: true, message: '请选择基调标签!' }] }
             ]" :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
           </el-cascader>
-          <a @click="handleAdd({status:0})" style="margin-top:25px">自定义标签新增</a>
         </a-form-item>
         <a-form-item :label-col="labelCol" :wrapper-col="{
             xs: { span: 24 },
@@ -1092,18 +1133,53 @@
     </a-modal>
     <a-modal title="标签修改" v-model="tagInfoListVisible">
       <template slot="footer">
-        <a-button key="back" @click="(tagInfoListVisible=false);(departValueInfo=[]);(tagCode=null)">取消</a-button>
+        <a-button key="back"
+          @click="(tagInfoListVisible=false);(departValueInfoModality=[]);(departValueInfoMod=[]);(departValueInfoContent=[]);(departValueInfoSence=[]);(tagCode=null)">
+          取消
+        </a-button>
         <a-button key="submit" type="primary" :loading="loadingTag" @click="handleOkTag">
           确定
         </a-button>
       </template>
-      <a-form-item :label-col="labelCol" :wrapper-col="{
+      <!-- <a-form-item :label-col="labelCol" :wrapper-col="{
             xs: { span: 24 },
             sm: { span: 12 }
           }" label="标签">
         <el-cascader placeholder="搜索你想要的标签" :options="departTree" v-model="departValueInfo"
           :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
         </el-cascader>
+      </a-form-item> -->
+      <a-form-item :label-col="labelCol" :wrapper-col="{
+            xs: { span: 24 },
+            sm: { span: 12 }
+          }" label="形式">
+        <el-cascader placeholder="搜索你想要的形式标签" :options="departTreeModality" v-model="departValueInfoModality"
+          :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
+        </el-cascader>
+      </a-form-item>
+      <a-form-item :label-col="labelCol" :wrapper-col="{
+            xs: { span: 24 },
+            sm: { span: 12 }
+          }" label="内容">
+        <el-cascader placeholder="搜索你想要的内容标签" :options="departTreeContent" v-model="departValueInfoContent"
+          :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
+        </el-cascader>
+      </a-form-item>
+      <a-form-item :label-col="labelCol" :wrapper-col="{
+            xs: { span: 24 },
+            sm: { span: 12 }
+          }" label="场景">
+        <el-cascader placeholder="搜索你想要的场景标签" :options="departTreeSence" v-model="departValueInfoSence"
+          :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
+        </el-cascader>
+      </a-form-item>
+      <a-form-item :label-col="labelCol" :wrapper-col="{
+            xs: { span: 24 },
+            sm: { span: 12 }
+          }" label="基调">
+        <el-cascader placeholder="搜索你想要的基调标签" :options="departTreeMod" v-model="departValueInfoMod"
+          :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable style="width:100%">
+        </el-cascader>
       </a-form-item>
     </a-modal>
     <a-modal title="推荐封面" v-model="chouzhen" width="60%">
@@ -1164,7 +1240,7 @@
   import accountCheck from './accountCheck'
 
   export default {
-    name: 'YardList',
+    name: 'video-material',
     mixins: [JeecgListMixin],
     components: {
       JEllipsis,
@@ -1178,8 +1254,16 @@
     data() {
       return {
         departTree: [],
+        departTreeModality: [],
+        departTreeContent: [],
+        departTreeSence: [],
+        departTreeMod: [],
         departValue: [],
         departValueInfo: [],
+        departValueInfoModality: [],
+        departValueInfoContent: [],
+        departValueInfoSence: [],
+        departValueInfoMod: [],
         tagInfoList: [],
         tagInfoListVisible: false,
         tagCode: null,
@@ -1377,7 +1461,7 @@
       this.active = localStorage.getItem('key') ? localStorage.getItem('key') : '0'
       // this.queryParam.status = key
       this.ipagination.pageSize = 8
-      this.getParticipateList()
+        this.getParticipateList()
       // /sys/user/getRoleInfo
       getAction('/sys/user/getRoleInfo', {
         userId: this.userInfo().id
@@ -1416,23 +1500,30 @@
       }
     },
     methods: {
-      modalFormOkElse(){
+      modalFormOkElse() {
         this.getTagListAll()
       },
       handleOkTag(e) {
         this.loadingTag = true
+        var data = [...this.departValueInfoModality, ...this.departValueInfoMod, ...this.departValueInfoContent,
+          ...this.departValueInfoSence
+        ]
         postAction('/ctop/materialTagInfo/mark', {
           code: this.tagCode,
-          tagList: this.departValueInfo
+          tagList: data
         }).then(res => {
-            console.log(res)
-            if(res.success){
-                this.loadingTag = false
-                this.tagInfoListVisible = false
-            }else{
-                this.loadingTag = false
-                this.$message.error(res.message)
-            }
+          console.log(res)
+          if (res.success) {
+            this.departValueInfoModality = []
+            this.departValueInfoMod = []
+            this.departValueInfoContent = []
+            this.departValueInfoSence = []
+            this.loadingTag = false
+            this.tagInfoListVisible = false
+          } else {
+            this.loadingTag = false
+            this.$message.error(res.message)
+          }
         })
       },
       editTagList(item) {
@@ -1442,16 +1533,26 @@
       },
       getTagListAll() {
         this.departTree = []
-        getAction('/ctop/tagInfo/queryTreeList').then((res) => {
+        this.departTreeModality = [] //形式
+        this.departTreeContent = [] // 内容
+        this.departTreeSence = [] // 场景
+        this.departTreeMod = [] //基调
+        this.getQueryTree(1, 'departTreeModality')
+        this.getQueryTree(2, 'departTreeMod')
+        this.getQueryTree(3, 'departTreeContent')
+        this.getQueryTree(4, 'departTreeSence')
+      },
+      getQueryTree(type, arr) {
+        getAction('/ctop/tagInfo/queryTreeList', {
+          categoryId: type
+        }).then((res) => {
           if (res.success) {
             //部门全选后,再添加部门,选中数量增多
-            for (let i = 0; i < res.result.length; i++) {
-              let temp = res.result[i]
-              this.departTree.push(temp)
-            }
+            this[arr].push(...res.result)
           }
         })
       },
+
       showBoHui(item) {
         this.bohui = item
         this.bohuiShow = true
@@ -1672,11 +1773,19 @@
       },
       getList(value) {
         if (value) {
-          this.mediaId = this.dataElse.filter(item => {
-            if (value == item.projectId) {
-              return item
-            }
-          })[0].mediaId
+            this.mediaId = this.dataElse.filter(item => {
+              if (value == item.projectId) {
+                return item
+              }
+            })[0].mediaId
+        //   getAction('/ctop/projectMember/participateListV2', {
+        //     userId: this.userInfo().id,
+        //     projectId: value
+        //   }).then(res => {
+        //     if (res.code == 0) {
+        //       this.mediaId = res.result.records[0].mediaId
+        //     }
+        //   })
         }
         this.loadData()
       },
@@ -1792,13 +1901,28 @@
         this.getTagListInfo(item.code)
       },
       getTagListInfo(md5) {
-        getAction('/ctop/materialTagInfo/list', {
+        this.departValueInfoModality = []
+        this.departValueInfoMod = []
+        this.departValueInfoContent = []
+        this.departValueInfoSence = []
+        getAction('/ctop/materialTagInfo/detail', {
           code: md5
         }).then(res => {
           if (res.success) {
-            this.tagInfoList = res.result.records
+            this.tagInfoList = [...res.modalityTagList, ...res.contentTagList, ...res
+              .senceTagList, ...res.modTagList
+            ]
             if (this.tagInfoListVisible) {
-              this.departValueInfo = res.result.records.map(item => {
+              this.departValueInfoModality = res.modalityTagList.map(item => {
+                return item.tagId
+              })
+              this.departValueInfoMod = res.modTagList.map(item => {
+                return item.tagId
+              })
+              this.departValueInfoContent = res.contentTagList.map(item => {
+                return item.tagId
+              })
+              this.departValueInfoSence = res.senceTagList.map(item => {
                 return item.tagId
               })
             }
@@ -1991,7 +2115,10 @@
           if (err) {
             // 这里做逻辑处理
           } else {
-            var params = {}
+
+            var params = {
+              ...values
+            }
             var roleCode = {}
             for (const key in this.role) {
               if (key == 'roleCode') {
@@ -2010,7 +2137,7 @@
             params.projectId = values.projectId
             params.materialDescribe = values.materialDescribe
             params.type = 'VIDEO'
-            params.tagList = values.tagList
+            //   params.tagList = values.tagList
             params.ascription =
               this.activeKey == 'image' ?
               roleCode : {
@@ -2092,12 +2219,14 @@
                 }
 
               })
+
             }
           }
         })
       },
       close() {
         this.visible = false
+        this.dataElse = []
         this.form.resetFields()
         this.urlList = {
           url: '',
@@ -2335,7 +2464,7 @@
       },
       getParticipateList() {
         getAction('/ctop/projectMember/participateList', {
-          userId: this.userInfo().id
+          userId: this.userInfo().id,
         }).then(res => {
           if (res.code == 0) {
             this.dataElse = res.result

+ 11 - 7
src/views/modules/material/videoTemplate.vue

@@ -157,10 +157,12 @@
       </template>
       <a-form :form="form">
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="视频素材上传">
-          <upload-to-ali v-model="urlList.url" :customDomain="customDomain" preview :region="region" :bucket="bucket"
+          <!-- <upload-to-ali v-model="urlList.url" :customDomain="customDomain" preview :region="region" :bucket="bucket"
             :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret" :before-upload="file" :dir="dirVideo" @loaded="overUpload">
-          </upload-to-ali>
+          </upload-to-ali> -->
+          <uploadFile :value.sync="urlList.url" :fileCount="1" uploadType="video" :multiple="false"
+            @overUpload="overUpload" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="模板标题">
           <a-input placeholder="请输入模板标题" v-decorator="['title',{ rules: [{ required: true, message: '请输入模板标题' }]}]" />
@@ -199,10 +201,12 @@
         </div>
         <div style="flex:3;padding:10px;box-sizing:border-box;">
           <span style="color:black;font-size:18px;text-align:center;width:100%">合成视频上传</span>
-          <upload-to-ali v-model="urlListMerge.url" :customDomain="customDomain" preview :region="region"
+          <!-- <uploadFile v-model="urlListMerge.url" :customDomain="customDomain" preview :region="region"
             :bucket="bucket" :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret" :before-upload="file" :dir="dirMerge" @loaded="overUploadMerge">
-          </upload-to-ali>
+          </uploadFile> -->
+          <uploadFile :value.sync="urlListMerge.url" :fileCount="1" uploadType="video" :multiple="false"
+            @overUpload="overUploadMerge" />
         </div>
       </div>
     </a-modal>
@@ -221,7 +225,7 @@
     JeecgListMixin
   } from '@/mixins/JeecgListMixin'
   import BMF from 'browser-md5-file'
-  import UploadToAli from '@femessage/upload-to-ali'
+  import uploadFile from '@/components/uploadFile.vue'
   import {
     stopOtherVideo,
     closeAllVideoFun
@@ -229,7 +233,7 @@
   export default {
     mixins: [JeecgListMixin],
     components: {
-      UploadToAli,
+      uploadFile,
     },
 
     data() {
@@ -244,7 +248,7 @@
         url: {
           list: '/ctop/modelVideoInfo/list'
         },
-        columns:[],
+        columns: [],
         urlList: {
           url: '',
           md5: ''

+ 2 - 3
vue.config.js

@@ -60,7 +60,7 @@ module.exports = {
       '/jeecg-boot': {
         //  target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
-        // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8088', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.0.230:8088', //请求本地 需要jeecg-boot后台项目  孙震
@@ -69,7 +69,7 @@ module.exports = {
         // target: 'http://192.168.1.51:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.170:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
-         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+        //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
          
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目 
@@ -94,7 +94,6 @@ module.exports = {
     //     })
     // }
   },
-
   lintOnSave: undefined,
 //   publicPath:'./'
 }