新建展板

src/page/check/display/index.vue

@@ -169,7 +169,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="宣传图" :label-width="formLabelWidth">
-            <img v-viewer class="imgSize" :src="editForm.cover" alt />
+            <img class="imgSize" :src="editForm.cover" alt />
           </el-form-item>
           <el-form-item label="二维码" :label-width="formLabelWidth">
             <img class="imgSize" :src="editForm.qrcodeUrl" alt />
@@ -198,11 +198,13 @@
               <div class="audio-item ckzl" v-for="(item, index) in editForm.datumList" :key="index">
                 <div>
                 <iframe class="imgSize" v-if="item.fileExtName === 'pdf'" :src="item.fileUrl" controls controlsList='nodownload' oncontextmenu="return false"/>
-                <img :src="item.fileUrl" v-else-if="item.fileExtName === 'jpg' || item.fileExtName === 'png' || item.fileExtName === 'docx'" class="imgSize"/>
+                <img :src="item.fileUrl" v-else-if="item.fileExtName === 'jpg' || item.fileExtName === 'png'" class="imgSize"/>
+                <img v-else-if="item.fileExtName === 'docx'" src="data:image/png;base64,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"/>
                 <video :src="item.fileUrl" v-else="item.fileExtName === 'mp4'" class="imgSize" controls />
                 </div>
                 <div>
-                <span>{{ item.fileName }}</span>
+                <a v-if="item.fileExtName === 'docx'" :href="item.fileUrl">{{item.fileName}}</a>
+                <span v-else>{{ item.fileName }}</span>
                 </div>
               </div>
             </div>

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

@@ -60,10 +60,10 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="展板图片" class="w50" prop="cover" required>
+              <el-form-item label="展板图片" class="w50" prop="cover">
                 <upload-img :fileList="ruleForm.imageList" @imgUrl="imgUrl" ></upload-img>
               </el-form-item>
-              <el-form-item label="展板二维码" class prop="qrcodeUrl" required>
+              <el-form-item label="展板二维码" class prop="qrcodeUrl">
                 <upload-qrcode :fileList="ruleForm.qrcodeList" @qrcodeUrl="qrcodeUrl" ></upload-qrcode>
               </el-form-item>
               <el-form-item label="展板简介" style="width:100%" prop="remarks">
@@ -200,14 +200,14 @@ export default {
       },
       rules: {
         name: [
-          { required: true, message: "请输入版权方名称", trigger: "blur" },
+          { required: true, message: "请输入展板名称", trigger: "blur" },
           { min: 1, max: 30, message: "请输入1到30个字" },
         ],
         boardCopyrightOwnerId: [
-          { required: true, message: "请选择展板版权方", trigger: "change" }
+          {  message: "请选择展板版权方", trigger: "change" }
         ],
         exhibitionBoardCatId: [
-          { required: true, message: "请选择展板分类", trigger: "change" }
+          { message: "请选择展板分类", trigger: "change" }
         ],
         // videoContentCopyrightOwnerId: [
         //   { required: true, message: "请选择视频版权方", trigger: "change" }
@@ -218,14 +218,14 @@ export default {
         // videoContentId: [
         //   { required: true, message: "请选择视频", trigger: "change" }
         // ],
-        audioIdList:[
-          { required: true, message: "请上传音频", trigger: "blur" }
-        ],
-        datumIdList:[
-           { required: true, message: "请上传参考资料", trigger: "blur" }
-        ],
+        // audioIdList:[
+        //   { message: "请上传音频", trigger: "blur" }
+        // ],
+        // datumIdList:[
+        //    { message: "请上传参考资料", trigger: "blur" }
+        // ],
         remarks: [
-          { min: 1, max: 2000, message: "最多只能输入2000个字"},
+          { min: 0, max: 2000, message: "最多只能输入2000个字"},
         ],
 
       },
@@ -320,6 +320,9 @@ export default {
               this.$message({type: "error", message: '请选择视频！' })
             }else{
         if (valid) {
+          if(this.ruleForm.name === ''){
+            this.$message({type: "error", message: '请填写展板名称！' })
+          }else{
           this.$https(
             {
               url: "exhibitionBoard/save",
@@ -338,13 +341,16 @@ export default {
           }).catch(function(err) {
               console.log(err);
           });
-        }}
+        }}}
       });
     },
     // 修改
     updateForm(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
+          if(this.ruleForm.name === ''){
+            this.$message({type: "error", message: '请填写展板名称！' })
+          }else{
           const params = JSON.parse(JSON.stringify(this.ruleForm))
           delete params.datumList
           delete params.audioList
@@ -368,7 +374,7 @@ export default {
           }).catch(function(err) {
               console.log(err);
           });
-        }
+        }}
       });
     },
     // 获取视频版权方
@@ -418,7 +424,7 @@ export default {
           console.log(err);
       });
       }else{
-        this.$message.warning("请先选择展板版权方！")
+        // this.$message.warning("请先选择展板版权方！")
       }
         
        
@@ -437,8 +443,7 @@ export default {
           console.log(err);
       });
       }else{
-        this.$message.warning("请先选择视频版权方！")
-        
+        // this.$message.warning("请先选择视频版权方！")
       }
       
     },
@@ -465,7 +470,7 @@ export default {
             console.log(err);
         });
       }else{
-        this.$message.warning("请先选择视频版权方和视频分类！")
+        // this.$message.warning("请先选择视频版权方和视频分类！")
         this.videoContentId = []
       }
       

src/page/content/display/content/details.vue

@@ -51,7 +51,7 @@
                 contentData.createTime
               }}</el-form-item>
               <el-form-item label="展板分类" class="w50">{{
-                contentData.createTime
+                contentData.exhibitionBoardCatName
               }}</el-form-item>
               <el-form-item label="上架情况">{{
                 contentData.published ? "已上架" : "未上架"

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

@@ -424,6 +424,8 @@ export default {
     },
     getSelect() {
       this.getAssetTypeData2()
+      this.ruleForm.copyrightOwnerIdList = []
+      this.ruleForm.exhibitionBoardCatIdList = []
     },
     // 获取版权方列表
     getAssetTypeData2() {