参数调整

src/page/check/display/index.vue

@@ -340,7 +340,7 @@ export default {
         if (valid) {
           _this
             .$https(
-              { url: "assetType/update", method: "put", authType: this.backToken },
+              { url: "videoContentCat/update", method: "put", authType: this.backToken },
               _this.$qs.stringify(_this.classForm)
               // _this.classForm
             )
@@ -462,7 +462,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/get/" + id,
+          url: "videoContentCat/get/" + id,
           method: "get",
           authType: this.backToken
         },
@@ -533,7 +533,7 @@ export default {
         .then(() => {
           _this.$https({
             method: 'delete',
-            url: 'assetType/delete/'+ row.id,
+            url: 'videoContentCat/delete/'+ row.id,
             authType: this.backToken
           }).then((res) => {
               this.$message({type: 'success', message: '删除成功!'});

src/page/check/learn/index.vue

@@ -332,7 +332,7 @@ export default {
         if (valid) {
           _this
             .$https(
-              { url: "assetType/update", method: "put", authType: this.backToken },
+              { url: "videoContentCat/update", method: "put", authType: this.backToken },
               _this.$qs.stringify(_this.classForm)
               // _this.classForm
             )
@@ -454,7 +454,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/get/" + id,
+          url: "videoContentCat/get/" + id,
           method: "get",
           authType: this.backToken
         },
@@ -488,7 +488,7 @@ export default {
         .then(() => {
           _this.$https({
             method: 'delete',
-            url: 'assetType/delete/'+ row.id,
+            url: 'videoContentCat/delete/'+ row.id,
             authType: this.backToken
           }).then((res) => {
               this.$message({type: 'success', message: '删除成功!'});

src/page/check/video/index.vue

@@ -201,7 +201,7 @@ export default {
       formLabelWidth: "100px",
       form: {
         name: "",
-        type:'ASSET'
+        type:'VIDEO_CONTENT'
       },
       editform: {
         menuName: "",
@@ -312,14 +312,14 @@ export default {
         _size: _this.page.pageSize,
         name: _this.form.name,
         status:_this.form.status,
-        type:'ASSET'
+        type:'VIDEO_CONTENT'
       };
       this.getTableData(searchObj);
     },
     // 重置
     Reset(){
       // this.$refs["form"].resetFields();
-      this.form = {type:"ASSET"}
+      this.form = {type:"VIDEO_CONTENT"}
       this.Search()
     },
     // // 获取当前查询参数
@@ -350,7 +350,7 @@ export default {
         if (valid) {
           _this
             .$https(
-              { url: "assetType/save", method: "post", authType: this.backToken },
+              { url: "videoContentCat/save", method: "post", authType: this.backToken },
               // _this.$qs.stringify(_this.classForm)
               _this.classForm
             )
@@ -392,7 +392,7 @@ export default {
         if (valid) {
           _this
             .$https(
-              { url: "assetType/update", method: "put", authType: this.backToken },
+              { url: "videoContentCat/update", method: "put", authType: this.backToken },
               _this.$qs.stringify(_this.classForm)
               // _this.classForm
             )
@@ -467,7 +467,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/get/" + id,
+          url: "videoContentCat/get/" + id,
           method: "get",
           authType: this.backToken
         },
@@ -500,7 +500,7 @@ export default {
         .then(() => {
           _this.$https({
             method: 'delete',
-            url: 'assetType/delete/'+ row.id,
+            url: 'videoContentCat/delete/'+ row.id,
             authType: this.backToken
           }).then((res) => {
               this.$message({type: 'success', message: '删除成功!'});

src/page/content/components/dialog/addCopyright.vue

@@ -39,7 +39,7 @@
             @change="getSelectDep"
           >
             <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
-            <el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option>
+            <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="备注">
@@ -62,14 +62,14 @@ export default {
       ruleForm: {
         assetTypeIdList: [],
         name: "",
-        ownerType: "ASSET"
+        ownerType: "VIDEO_CONTENT"
       },
             ruleForm: {
         assetTypeIdList: [],
         name: "",
-        ownerType: "ASSET"
+        ownerType: "VIDEO_CONTENT"
       },
-      assetType: [
+      videoContentCat: [
         {
           value: "Beijing",
           label: "北京"
@@ -131,7 +131,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "assetType/save",
+              url: "videoContentCat/save",
               method: "post",
               authType: this.backToken
             },
@@ -166,13 +166,13 @@ export default {
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })
@@ -181,7 +181,7 @@ export default {
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -191,7 +191,7 @@ export default {
       // debugger
       this.ruleForm.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.ruleForm.assetTypeIdList.push(item.id);
         });
       } else {

src/page/content/components/mulClassify/mulDisplay.vue

@@ -7,7 +7,7 @@
     @change="getSelectDep"
   >
     <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
-    <el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option>
+    <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
   </el-select>
 </template>
 
@@ -15,7 +15,7 @@
 export default {
   data() {
     return {
-      assetType: [],
+      videoContentCat: [],
       assetTypeIdList: [],
       checkedThing: false,
       selfstyle: {
@@ -32,7 +32,7 @@ export default {
     }
   },
   methods: {
-    // this.$refs.mulDisplay.assetType	// 使用时父组件直接获取此值即可
+    // this.$refs.mulDisplay.videoContentCat	// 使用时父组件直接获取此值即可
     // 获取视频版权方
     getAssetTypeData() {
       let vm = this;
@@ -42,11 +42,11 @@ export default {
         authType: this.backToken
       },
       // _this.$qs.stringify(_this.permisform)
-      {copyrightOwnerType:'ASSET'}
+      {copyrightOwnerType:'VIDEO_CONTENT'}
       )
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })
@@ -55,7 +55,7 @@ export default {
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -66,7 +66,7 @@ export default {
       // debugger
       this.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.assetTypeIdList.push(item.id);
         });
       } else {

src/page/content/components/mulClassify/mulVideo.vue

@@ -7,7 +7,7 @@
     @change="getSelectDep"
   >
     <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
-    <el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option>
+    <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
   </el-select>
 </template>
 
@@ -15,7 +15,7 @@
 export default {
   data() {
     return {
-      assetType: [],
+      videoContentCat: [],
       assetTypeIdList: [],
       checkedThing: false,
       selfstyle: {
@@ -26,18 +26,18 @@ export default {
     };
   },
   methods: {
-    // this.$refs.mulDisplay.assetType	// 使用时父组件直接获取此值即可
+    // this.$refs.mulDisplay.videoContentCat	// 使用时父组件直接获取此值即可
     // 获取视频分类列表
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })
@@ -46,7 +46,7 @@ export default {
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -57,7 +57,7 @@ export default {
       // debugger
       this.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.assetTypeIdList.push(item.id);
         });
       } else {

src/page/content/components/uploadVue/uploadFile.vue

@@ -23,10 +23,12 @@
     },
     methods: {
     handleAvatarSuccess(res, file) {
-        console.log(res)
-        console.log(res.url)
-        this.$emit('videoList', res.urlList)
-       
+      const data = res.data.fileList
+      let newArray = data.map((item) => {
+          return item.id;
+      })
+      this.$emit('videoList', newArray)
+      // console.log(newArray,'----idArray')
     },
       submitUpload() {
         this.$refs.upload.submit();

src/page/content/components/uploadVue/uploadImg.vue

@@ -32,9 +32,11 @@ export default {
   methods: {
     // 图片上传成功的返回值
     handleAvatarSuccess(res, file) {
+  
         console.log(res)
-        console.log(res.url)
-        this.$emit('imgUrl', res.url)
+        console.log(res.data.url)
+        this.$emit('imgUrl', res.data.url)
+        // console.log(data.fileList[0].url)
         // this.imageUrl = URL.createObjectURL(file.raw);
     },
     handleRemove(file, fileList) {

src/page/content/components/uploadVue/uploadQrcode.vue

@@ -34,7 +34,7 @@ export default {
     handleAvatarSuccess(res, file) {
         console.log(res)
         console.log(res.url)
-        this.$emit('qrcodeUrl', res.url)
+        this.$emit('qrcodeUrl', res.data.url)
         // this.imageUrl = URL.createObjectURL(file.raw);
     },
     handleRemove(file, fileList) {

src/page/content/display/content/add-.vue

@@ -125,7 +125,7 @@ export default {
        let vm = this;
       vm.$https(
         {
-          url: "asset/dddddgetPageList",
+          url: "videoContent/dddddgetPageList",
           method: "post",
           authType: this.backToken
         },

src/page/content/display/content/add.vue

@@ -93,7 +93,7 @@
                   @change="getAssetType"
                 >
                   <el-option
-                    v-for="item in assetType"
+                    v-for="item in videoContentCat"
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
@@ -178,7 +178,7 @@ export default {
         assetTypeId: "",
         videoUrlList: []
       },
-      assetType: [
+      videoContentCat: [
         {
           value: "Beijing",
           label: "北京"
@@ -314,7 +314,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "assetType/save",
+              url: "videoContentCat/save",
               method: "post",
               // headers: {
               //   'Content-Type': 'application/json'
@@ -406,7 +406,7 @@ export default {
           method: "get",
           authType: this.backToken
         },
-        { copyrightOwnerType: "ASSET" }
+        { copyrightOwnerType: "VIDEO_CONTENT" }
       )
         .then(res => {
           let data = res.data.data;
@@ -456,13 +456,13 @@ export default {
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
         })
         .catch(function(err) {
           console.log(err);
@@ -472,7 +472,7 @@ export default {
     getVideoData() {
       let vm = this;
       vm.$https({
-        url: "asset/getList",
+        url: "videoContent/getList",
         method: "get",
         authType: this.backToken
       })

src/page/content/learn/content/add.vue

@@ -53,7 +53,7 @@
             >
               <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
               <el-option
-                v-for="item in assetType"
+                v-for="item in videoContentCat"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -181,7 +181,7 @@ export default {
       classForm: {},
       type: this.$route.query.type,
       learningProjectIdList:'',
-      assetType: [],
+      videoContentCat: [],
       assetType2:[],
       checkedThing: false,
       checkedThing2:false,
@@ -384,7 +384,7 @@ export default {
       this.ruleForm.cover = url
     },
     getSelectDep(exhibitionBoardCatIdList) {
-      if (exhibitionBoardCatIdList.length === this.assetType.length) {
+      if (exhibitionBoardCatIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -433,7 +433,7 @@ export default {
       // debugger
       this.ruleForm.exhibitionBoardCatIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.ruleForm.exhibitionBoardCatIdList.push(item.id);
         });
       } else {
@@ -461,7 +461,7 @@ export default {
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })

src/page/content/video/classify/index.vue

@@ -258,7 +258,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/getPageList",
+          url: "videoContentCat/getPageList",
           method: "post",
           authType: this.backToken
         },
@@ -331,7 +331,7 @@ export default {
           _this
             .$https(
               {
-                url: "assetType/save",
+                url: "videoContentCat/save",
                 method: "post",
                 authType: this.backToken
               },
@@ -377,7 +377,7 @@ export default {
           _this
             .$https(
               {
-                url: "assetType/update",
+                url: "videoContentCat/update",
                 method: "put",
                 authType: this.backToken
               },
@@ -451,7 +451,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/get/" + id,
+          url: "videoContentCat/get/" + id,
           method: "get",
           authType: this.backToken
         }
@@ -484,7 +484,7 @@ export default {
           _this
             .$https({
               method: "delete",
-              url: "assetType/delete/" + row.id,
+              url: "videoContentCat/delete/" + row.id,
               authType: this.backToken
             })
             .then(

src/page/content/video/content/add.vue

@@ -34,7 +34,7 @@
             >
               <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
               <el-option
-                v-for="item in assetType"
+                v-for="item in videoContentCat"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -67,7 +67,7 @@
               @change="getAssetType"
             >
               <el-option
-                v-for="item in assetType"
+                v-for="item in videoContentCat"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -168,7 +168,7 @@ export default {
         thumbnail:"",
         videoUrlList:[]
       },
-      assetType: [
+      videoContentCat: [
         {
           value: "Beijing",
           label: "北京"
@@ -254,7 +254,7 @@ export default {
        let vm = this;
       vm.$https(
         {
-          url: "asset/get/" + id,
+          url: "videoContent/get/" + id,
           method: "get",
           authType: this.backToken
         }
@@ -287,7 +287,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "assetType/save",
+              url: "videoContentCat/save",
               method: "post",
               // headers: {
               //   'Content-Type': 'application/json'
@@ -332,7 +332,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "/asset/save",
+              url: "/videoContent/save",
               method: "post",
               authType: this.backToken
             },
@@ -359,7 +359,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "asset/update",
+              url: "videoContent/update",
               method: "put",
               authType: this.backToken
             },
@@ -390,7 +390,7 @@ export default {
         method: "get",
         authType: this.backToken
       },
-      {copyrightOwnerType:'ASSET'})
+      {copyrightOwnerType:'VIDEO_CONTENT'})
         .then(res => {
           let data = res.data.data;
           this.copyrightOwner = data;
@@ -403,20 +403,20 @@ export default {
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
         })
         .catch(function(err) {
           console.log(err);
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -426,7 +426,7 @@ export default {
       // debugger
       this.ruleForm.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.ruleForm.assetTypeIdList.push(item.id);
         });
       } else {

src/page/content/video/content/index.vue

@@ -296,7 +296,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "asset/getPageList",
+          url: "videoContent/getPageList",
           method: "post",
           authType: this.backToken
         },
@@ -441,7 +441,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "asset/get/" + id,
+          url: "videoContent/get/" + id,
           method: "get",
           authType: this.backToken
         }
@@ -467,7 +467,7 @@ export default {
           _this
             .$https({
               method: "delete",
-              url: "asset/delete/" + row.id,
+              url: "videoContent/delete/" + row.id,
               authType: this.backToken
             })
             .then(

src/page/content/video/copyright/add.vue

@@ -41,7 +41,7 @@
             >
               <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
               <el-option
-                v-for="item in assetType"
+                v-for="item in videoContentCat"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -122,9 +122,9 @@ export default {
       ruleForm: {
         assetTypeIdList: [],
         name: "",
-        ownerType: "ASSET"
+        ownerType: "VIDEO_CONTENT"
       },
-      assetType: [
+      videoContentCat: [
         {
           value: "Beijing",
           label: "北京"
@@ -197,7 +197,7 @@ export default {
       })
         .then(res => {
           let data = res.data.data;
-          // this.assetType = data
+          // this.videoContentCat = data
           this.ruleForm = data;
           this.value1 = [data.expireDateStart, data.expireDateEnd];
 
@@ -221,7 +221,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "assetType/save",
+              url: "videoContentCat/save",
               method: "post",
               // headers: {
               //   'Content-Type': 'application/json'
@@ -321,13 +321,13 @@ export default {
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })
@@ -336,7 +336,7 @@ export default {
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -346,7 +346,7 @@ export default {
       // debugger
       this.ruleForm.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.ruleForm.assetTypeIdList.push(item.id);
         });
       } else {

src/page/content/video/copyright/index.vue

@@ -127,7 +127,7 @@ export default {
       formLabelWidth: "100px",
       form: {
         nameOrCode: "",
-        ownerType:'ASSET'
+        ownerType:'VIDEO_CONTENT'
       },
       editform: {
         menuName: "",
@@ -233,7 +233,7 @@ export default {
     // 重置
     Reset(){
       // this.$refs["form"].resetFields();
-      this.form = { ownerType:'ASSET'}
+      this.form = { ownerType:'VIDEO_CONTENT'}
       this.Search()
     },
     Search() {
@@ -243,7 +243,7 @@ export default {
         _index: 1,
         _size: _this.page.pageSize,
         nameOrCode: _this.form.nameOrCode,
-        ownerType:'ASSET'
+        ownerType:'VIDEO_CONTENT'
       };
       this.getTableData(searchObj);
     },

src/page/content/video/remit/index.vue

@@ -162,7 +162,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/getPageList",
+          url: "videoContentCat/getPageList",
           method: "post",
           authType: this.backToken
         },