Merge branch 'master' into dev_fbl

src/components/end/login.vue

@@ -95,6 +95,7 @@ export default {
                     type: "success",
                     message: resData.message,
                   });
+                  localStorage.setItem("userType",resData.user.type)
                   localStorage.setItem("user", resData.user.userName);
                   localStorage.setItem("userId",resData.user.id)
                   localStorage.setItem("backToken", resData.token);

src/page/check/display/index.vue

@@ -91,8 +91,8 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="审核" header-align="center" align="center">
-            <template slot-scope="scope" width="220">
+          <el-table-column label="审核" width="220" header-align="center" align="center">
+            <template slot-scope="scope" >
               <!-- <div class="table-btn-group">
                
                 <el-tooltip content="通过" placement="top">

src/page/check/learn/index.vue

@@ -71,8 +71,8 @@
               </div>
               </template>
             </el-table-column>
-             <el-table-column label="审核" header-align="center" align="center">
-              <template slot-scope="scope" width="220">
+             <el-table-column label="审核"  width="220" header-align="center" align="center">
+              <template slot-scope="scope">
                  <div class="table-btn-group">
                 <el-button
                   round

src/page/check/video/index.vue

@@ -69,8 +69,8 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="审核" header-align="center" align="center">
-            <template slot-scope="scope" width="220">
+          <el-table-column label="审核"  width="220" header-align="center" align="center">
+            <template slot-scope="scope">
               <div class="table-btn-group">
                 <el-button
                   round

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

@@ -114,9 +114,9 @@ export default {
             this.$qs.stringify(this.ruleForm)
           )
             .then(res => {
-              if(res.resultCode === "200"){
-                this.$message({ type: "success", message: "新增成功!" });
-                history.go(-1);
+              if(res.data.resultCode === "200"){
+                this.$message({ type: "success", message: "新建视频版权方成功!" });
+                this.dialogVisible = false
               }else{
                 this.$message({ type: "error", message: res.message });
               }
@@ -148,12 +148,13 @@ export default {
             _this.$qs.stringify(this.ruleForm)
           )
             .then(res => {
-              if(res.data.resultCode === "200"){
-                _this.$message({ type: "success", message: "新增成功!" });
-                _this.dialogVisible =false
-              }else{
-                _this.$message({ type: "error", message: res.data.message });
-              }
+              console.log(res)
+              // if(res.data.resultCode === "200"){
+              //   _this.$message({ type: "success", message: "新增成功!" });
+              //   _this.dialogVisible =false
+              // }else{
+              //   _this.$message({ type: "error", message: res.data.message });
+              // }
               
               
             })

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

@@ -79,7 +79,7 @@ export default {
          this.filedata.append('file', file.file)
     },
     beforeAvatarUpload(file) {
-      const isLt5M = file.size / 1024 < 1;
+      const isLt5M = file.size / 1024 / 1024 / 1024 < 1;
       if (!isLt5M) {
         this.$message.error("上传文件大小不能超过 1GB!");
       }

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

@@ -79,7 +79,7 @@ export default {
       this.filedata.append("file", file.file);
     },
     beforeAvatarUpload(file) {
-      const isLt10G = file.size / 1024 < 10;
+      const isLt10G = file.size / 1024 / 1024 / 1024 < 10;
       if (!isLt10G) {
         this.$message.error("上传文件大小不能超过 10GB!");
       }

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

@@ -52,7 +52,6 @@ export default {
           console.log(res)
 
           if (resData.resultCode == "200") {
-            // alert("上传成功");
             console.log(resData.data.fileList)
             const data = resData.data.fileList
             console.log(data)
@@ -76,7 +75,7 @@ export default {
          this.filedata.append('file', file.file)
     },
     beforeAvatarUpload(file) {
-      const isLt10G = file.size / 1024 < 10;
+      const isLt10G = file.size / 1024 / 1024 / 1024 < 10;
       if (!isLt10G) {
         this.$message.error("上传文件大小不能超过 10GB!");
       }
@@ -109,9 +108,7 @@ export default {
         )
         .then(res => {
           let resData = res.data;
-
           if (resData.resultCode == 200) {
-            alert("上传成功");
             //   _this.getOrgTree();
           } else {
             _this.$message.error(resData.msg || resData.message);

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

 <template>
-  <div class="info info-add">
-    <!-- <div class="info-header">新建展板</div> -->
+  <div class="info">
+    <div class="info-header">{{ type === 'Update'?'修改':'新建'}}展板</div>
     <div class="info-container">
       <div class="info-wrapper">
         <div class="pageTips">

src/page/content/display/content/index.vue

@@ -90,28 +90,30 @@
             </template>
           </el-table-column>
           <el-table-column label="操作" width="280" header-align="center" align="center">
+            <!-- 只有下架可编辑、删除,只有通过可上架、下架 -->
             <template slot-scope="scope" >
                <div class="table-btn-group">
                 <el-tooltip content="修改" placement="top">
-                  <el-button circle @click="openEdit(scope.row)">
+                  <el-button circle :disabled="scope.row.published" @click="openEdit(scope.row)">
                     <i class="icon-table icon-edit"></i>
                   </el-button>
                 </el-tooltip>
+                <el-tooltip content="删除"  placement="top">
+                  <el-button circle :disabled="scope.row.published" @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip>
                 <el-tooltip content="上架" placement="top">
-                  <el-button circle :disabled="!!scope.row.published" @click="handlePublish(scope.row,true)">
+                  <el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'"  v-show="!scope.row.published" @click="handlePublish(scope.row,true)">
                     <i class="icon-table icon-enable"></i>
                   </el-button>
                 </el-tooltip>
                  <el-tooltip content="下架" placement="top">
-                  <el-button circle :disabled="!scope.row.published" @click="handlePublish(scope.row,false)">
+                  <el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'" v-show="scope.row.published" @click="handlePublish(scope.row,false)">
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
-                <el-tooltip content="删除" placement="top">
-                  <el-button circle @click="handleDelete(scope.row)">
-                    <i class="icon-table icon-del"></i>
-                  </el-button>
-                </el-tooltip>
+                
                 <el-tooltip content="详情" placement="top">
                   <el-button circle @click="displayInfo(scope.row)">
                     <i class="icon-table icon-detail"></i>
@@ -284,6 +286,7 @@ export default {
     },
     // 上下架
     handlePublish(row ,isPublish) {
+      let _isPublish = isPublish
       let _this = this;
       _this
             .$https({
@@ -294,10 +297,23 @@ export default {
             _this.$qs.stringify({isPublish:isPublish}))
             .then(
               res => {
-                _this.msgInfo = {
-                  type: "wait",
-                  des: `申请已提交，待审核…`,
-                };
+                // _this.msgInfo = {
+                //   type: "wait",
+                //   des: `申请已提交，待审核…`,
+                // };
+                 if(res.data.resultCode === "200"){
+                   if(_isPublish){
+                     this.$message({ type: "success", message: "上架申请已提交,待审核！" });
+                   }else{
+                     this.$message({ type: "success", message: "下架申请已提交,待审核！" });
+                   }
+                   
+                
+                _this.Search();
+              }else{
+                this.$message({ type: "error", message: res.data.message });
+              }
+
                 _this.onSearch();
               },
               error => {

src/page/content/learn/content/index.vue

@@ -5,7 +5,7 @@
         <el-form-item>
           <el-input
             placeholder="请输入学习内容名称"
-            v-model="form.name"
+            v-model="form.nameOrCode"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
@@ -57,7 +57,30 @@
             show-overflow-tooltip
             label="学习内容名称"
             prop="name"
-          ></el-table-column>
+          >
+          <template slot-scope="scope">
+          
+              <div class="table-btn-group">
+                
+                 <el-tooltip content="上移" placement="top">
+                  <el-button circle :disabled="scope.$index == 0"
+                      @click="moveUpward(scope.row, scope.$index)" >
+                    <i class="icon-table-up icon-up"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="下移" placement="top">
+                  <el-button circle
+                     :disabled="(scope.$index + 1) == tableData.length"
+                      @click="moveDown(scope.row, scope.$index)">
+                    <i class="icon-table-up icon-down"></i>
+                  </el-button>
+                </el-tooltip>
+                <span>&nbsp;&nbsp;</span>
+                <span>{{scope.row.name}}</span>
+                  </div>
+                </template>
+
+          </el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
           <el-table-column label="创建者" prop=""></el-table-column>
           <el-table-column
@@ -79,8 +102,9 @@
           </el-table-column>
           <el-table-column label="使用状态" prop="published">
             <template slot-scope="scope">
-              <span v-if="scope.row.published">禁用</span>
-              <span v-else>启用</span>
+              <!-- {{scope.row.published}} -->
+              <span v-if="scope.row.published">启用</span>
+              <span v-else>禁用</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -91,6 +115,19 @@
           >
             <template slot-scope="scope">
               <div class="table-btn-group">
+                 <!-- <el-tooltip content="上移" placement="top">
+                  <el-button circle :disabled="scope.$index == 0"
+                      @click="moveUpward(scope.row, scope.$index)" >
+                    <i class="icon-table-up icon-up"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="下移" placement="top">
+                  <el-button circle
+                     :disabled="(scope.$index + 1) == tableData.length"
+                      @click="moveDown(scope.row, scope.$index)">
+                    <i class="icon-table-up icon-down"></i>
+                  </el-button>
+                </el-tooltip> -->
                 <el-tooltip content="修改" placement="top">
                   <el-button circle @click="openEdit(scope.row)">
                     <i class="icon-table icon-edit"></i>
@@ -102,16 +139,17 @@
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="启用" placement="top">
-                  <el-button circle @click="handlePublish(scope.row, 'True')">
+                  <el-button circle v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
                     <i class="icon-table icon-enable"></i>
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="禁用" placement="top">
-                  <el-button circle @click="handlePublish(scope.row, 'False')">
+                  <el-button circle  v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
-                 <el-button
+                
+                 <!-- <el-button
                       type="text"
                       style="padding:0"
                       :disabled="scope.$index == 0"
@@ -122,12 +160,7 @@
                       style="padding:0"
                       :disabled="(scope.$index + 1) == tableData.length"
                       @click="moveDown(scope.row, scope.$index)"
-                    >下移</el-button>
-                 <!-- <el-tooltip content="删除" placement="top">
-                  <el-button circle @click="handleDelete(scope.row)">
-                    <i class="icon-table icon-del"></i>
-                  </el-button>
-                </el-tooltip> -->
+                    >下移</el-button> -->
               </div>
             </template>
           </el-table-column>
@@ -369,7 +402,7 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name,
+        nameOrCode: _this.form.nameOrCode,
         startDate: this.value1 ? this.value1[0] : "",
         endDate: this.value1 ? this.value1[1] : "",
       };

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

 <template>
   <div class="info">
-    <div class="info-header">新建视频</div>
+    <div class="info-header">{{ type === 'Update'?'修改':'新建'}}视频</div>
     <div class="info-container">
       <div class="info-wrapper">
         <div class="pageTips">
@@ -199,7 +199,7 @@ export default {
       },
       rules: {
         name: [
-          { required: true, message: "请输入版权方名称", trigger: "blur" }
+          { required: true, message: "请输入视频名称", trigger: "blur" }
           // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
         ],
         videoContentCopyrightOwnerId:[
@@ -277,7 +277,7 @@ export default {
     addVideoClass() {
       this.dialogVisible = true;
     },
-    // 弹窗保存
+    // 新建视频分类弹窗保存
     save(formName) {
       this.$refs[formName].validate(valid => {
         this.ruleForm.expireDateEnd = this.value1[1];
@@ -289,10 +289,14 @@ export default {
               method: "post",
               authType: this.backToken
             },
-            this.classForm
+            this.$qs.stringify(this.classForm)
           ).then(res => {
+              if(res.data.resultCode === "200"){
                 this.$message({ type: "success", message: "新增分类成功!" });
               this.dialogVisible = false;
+              }else{
+                this.$message({ type: "error", message: res.data.message });
+              }
           }).catch(function(err) {
               this.$message({
                 type: "fail",

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

@@ -75,8 +75,8 @@
                 <span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
               </template>
             </el-table-column>
-          <el-table-column label="操作" header-align="center" align="center">
-            <template slot-scope="scope" width="220">
+          <el-table-column label="操作" header-align="center" width="220" align="center">
+            <template slot-scope="scope" >
               <div class="table-btn-group">
                 <el-tooltip content="修改" placement="top">
                   <el-button circle @click="openEdit(scope.row)">

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

@@ -258,7 +258,7 @@ export default {
           )
             .then(res => {
               if(res.data.resultCode === "200"){
-                this.$message({ type: "success", message: "新增视频版权方申请已提交,待审核！" });
+                this.$message({ type: "success", message: "新增视频版权成功！" });
                 history.go(-1);
               }else{
                 this.$message({ type: "error", message: res.data.message });
@@ -294,7 +294,7 @@ export default {
           )
             .then(res => {
                if(res.data.resultCode === "200"){
-                this.$message({ type: "success", message: "修改视频版权方申请已提交,待审核！" });
+                this.$message({ type: "success", message: "修改视频版权方成功！" });
                 history.go(-1);
               }else{
                 this.$message({ type: "error", message: res.data.message });

src/style/global.less

@@ -550,6 +550,18 @@
 .icon-disable {
   background-image: url("~@/assets/icons/disable.png");
 }
+.icon-up{
+  background-image: url("~@/assets/icons/up.png");
+}
+.icon-down{
+  background-image: url("~@/assets/icons/down.png");
+}
+.icon-video{
+  background-image: url("~@/assets/icons/video.png");
+}
+.icon-board{
+  background-image: url("~@/assets/icons/board.png");
+}
 
 .icon-del {
   background-image: url("~@/assets/icons/del.png");

src/style/table.less

@@ -40,6 +40,14 @@
     background-repeat: no-repeat;
     background-position: center;
 }
+.icon-table-up{
+    display: inline-block;
+    width: 12px;
+    height: 24px;
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center;
+}
 
 
 .passed,