‘测试迭代

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

@@ -85,8 +85,8 @@ export default {
       },
       rules: {
         name: [
-          { required: true, message: "请输入版权方名称", trigger: "blur" }
-          // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
+          { required: true, message: "请输入版权方名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         videoContentCatIdList:[
           {required: true, message: "请选择视频分类", trigger: "change" }

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

@@ -2,6 +2,7 @@
 <div>
   <el-upload
     ref="upload"
+    accept=".mp3,.aac,.wma,.rm,.flac,.ogg,"
     :multiple="true"
     :http-request="uploadFile"
     :file-list="fileList"
@@ -83,6 +84,17 @@ export default {
         this.$message.error("上传文件大小不能超过 1GB!");
       }
       return isLt5M;
+
+      //  var testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      //    const extension = (testmsg === 'mp3')||(testmsg === 'aac')||(testmsg === 'wma')||(testmsg === 'rm')||(testmsg === 'flac')||(testmsg === 'ogg')
+      //    if(!extension){
+      //      this.$message({
+      //        message:"上传文件只能是mp3，aac,wma,rm,flac,ogg,格式！",
+      //        type:'error'
+      //      })
+      //    }
+      //    return extension;
+
     }
   }
 };

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

@@ -2,6 +2,7 @@
   <div>
     <el-upload
       ref="upload"
+      accept=".mp4,.flv,.mpeg,.mpg,.word,.pdf,.ppt,.jpg,.jpeg,.png.JPG,.JPEG,.PNG"
       :multiple="true"
       :http-request="uploadFile"
       :file-list="fileList"

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

@@ -3,6 +3,7 @@
 
   <el-upload
     ref="upload"
+    accept=".mp4,.flv,.mpeg,.mpg"
     :multiple="true"
     :http-request="uploadFile"
     :file-list="fileList"

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

@@ -44,7 +44,7 @@ export default {
       };
     },
     uploadDisabled:function() {
-        return this.fileList.length>0
+        return (this.fileList.length>0)||this.imageUrl
     },
   },
   methods: {

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

@@ -48,7 +48,7 @@ export default {
     return {'Authorization':localStorage.getItem('backToken')}
     },
      uploadDisabled:function() {
-        return this.fileList.length>0
+        return (this.fileList.length>0)||this.imageUrl
     },
   },
   methods: {

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

@@ -147,6 +147,7 @@ export default {
       rule: {
         name: [
           { required: true, message: "请输入展板分类名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
       },
       value: "",

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

@@ -120,11 +120,11 @@
                 </el-select>
               </el-form-item>
               <el-form-item></el-form-item>
-              <el-form-item label="导览音频"  prop="audioIdList" >
+              <el-form-item label="导览音频"  prop="audioIdList" required>
                 <div style="color:red;">（可上传汉语、蒙语、藏语、维吾尔语、英语五种语言音频资料，命名方式为展板名称+语言）</div>
                 <upload-audio :fileList="ruleForm.audioList" @audioList="audioList"></upload-audio>
               </el-form-item>
-              <el-form-item label="参考资料" prop="datumIdList" >
+              <el-form-item label="参考资料" prop="datumIdList" required>
                 <div style="color:red;">
                   （可支持word、PDF、ppt、视频类型文件及图片上传）
                 </div>
@@ -189,7 +189,8 @@ export default {
       },
       rules: {
         name: [
-          { required: true, message: "请输入版权方名称", trigger: "blur" }
+          { required: true, message: "请输入版权方名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         boardCopyrightOwnerId: [
           { required: true, message: "请选择展板版权方", trigger: "change" }

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

@@ -109,7 +109,7 @@
                   </el-button>
                 </el-tooltip>
                  <el-tooltip content="下架" placement="top">
-                  <el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" @click="handlePublish(scope.row,false)">
+                  <el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')"  v-show="scope.row.published" @click="handlePublish(scope.row,false)">
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>

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

@@ -12,9 +12,11 @@
           :rules="rules"
           ref="ruleForm"
           label-width="140px"
-          class="party-form form-inline"
+          class="demo-form-inline party-form"
+          :inline="true"
+          label-position="top"
         >
-          <el-form-item label="版权方名称" prop="name">
+          <el-form-item label="版权方名称" prop="name" class="w50">
             <el-input v-model="ruleForm.name"></el-input>
           </el-form-item>
           <el-form-item label="版权方有效期" prop="value1">
@@ -28,7 +30,7 @@
             ></el-date-picker>
           </el-form-item>
          
-          <el-form-item class="selectH100" label="请选择视频分类" prop="boardCatIdList">
+          <el-form-item class="w50" label="请选择展板分类" prop="boardCatIdList">
             <el-select
               placeholder="请选择预设展板分类"
               @focus="getAssetTypeData"
@@ -45,18 +47,19 @@
               ></el-option>
             </el-select>
           </el-form-item>
-           <el-form-item class="addTip">
-            <span>若没有相应的视频分类，请点击</span>
+           <el-form-item >
+             <br>
+            <span style="color:red">若没有相应的展板分类，请点击</span>
             <el-button type="text" @click="addBoardClass">新建展板分类</el-button>
           </el-form-item>
-          <el-form-item label="备注">
+          <el-form-item label="备注" class="w100">
             <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
           </el-form-item>
         </el-form>
         <!--新增弹框-->
         <el-dialog
           custom-class="party-dialog"
-          title="新建视频分类"
+          title="新建展板分类"
           width="468px"
           :visible.sync="dialogVisible"
           :before-close="close"
@@ -67,11 +70,11 @@
               ref="classForm"
               label-width="80px"
               label-position="top"
-              :rules="rules"
+              :rules="rule"
               id="ruleo"
               class="party-form"
             >
-              <el-form-item label="视频分类名称" prop="name">
+              <el-form-item label="视展板分类名称" prop="name">
                 <el-input v-model="classForm.name"></el-input>
               </el-form-item>
               <el-form-item label="备注">
@@ -142,10 +145,16 @@ export default {
         width: "100%",
         paddingRight: "10px"
       },
+      rule:{
+        name: [
+          { required: true, message: "请输入展板分类名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
+        ],
+      },
       rules: {
         name: [
-          { required: true, message: "请输入版权方名称", trigger: "blur" }
-          // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
+          { required: true, message: "请输入版权方名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         boardCatIdList:[
           {required: true, message: "请选择展板分类", trigger: "change" }

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

@@ -170,6 +170,7 @@ export default {
       rule: {
         name: [
           { required: true, message: "请输入展板分类名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         valueDate: [
           { required: true, message: "请选择版权方有效期", trigger: "change" },

src/page/content/style/add.less

@@ -16,8 +16,8 @@
           border-radius:10px;
       }
       .addTip {
-          height:10px;
-          line-height: 10px;
+          // height:10px;
+          // line-height: 10px;
           // background: pink;
         color: red;
         //   position:absolute;

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

@@ -12,16 +12,14 @@
           :rules="rules"
           ref="ruleForm"
           label-width="140px"
-          class="party-form form-inline"
+           class="demo-form-inline party-form"
+          :inline="true"
+          label-position="top"
         >
-          <el-form-item label="视频名称" prop="name">
+          <el-form-item label="视频名称" prop="name" class="w100">
             <el-input v-model="ruleForm.name"></el-input>
           </el-form-item>
-           <el-form-item class="addTip">
-             <add-copyright ref="addCopyright"></add-copyright>
-            <span>若没有相应的视频版权方，请点击</span>
-            <el-button type="text" @click="addVideoCopyright">新建视频版权方</el-button>
-          </el-form-item>
+           
             <el-form-item label="请选择视频版权方" prop="videoContentCopyrightOwnerId">
             <el-select
               placeholder="请选择视频版权方"
@@ -36,9 +34,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
-           <el-form-item class="addTip">
-            <span>若没有相应的视频分类，请点击</span>
-            <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
+          <!-- <el-form-item class="addTip">
+             <add-copyright ref="addCopyright"></add-copyright>
+            <span>若没有相应的视频版权方，请点击</span>
+            <el-button type="text" @click="addVideoCopyright">新建视频版权方</el-button>
+          </el-form-item> -->
+           <el-form-item >
+             <br>
+            <span style="color:red">若没有相应的视频版权方，请点击</span>
+            <el-button type="text" @click="addVideoCopyright">新建视频版权方</el-button>
           </el-form-item>
            <el-form-item label="请选择视频分类" >
             <el-select
@@ -54,6 +58,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
+           <el-form-item >
+             <br>
+            <span style="color:red">若没有相应的视频分类，请点击</span>
+            <el-button type="text" @click="addVideoClass">新建视频版权方</el-button>
+          </el-form-item>
+          <!-- <el-form-item class="addTip">
+            <span>若没有相应的视频分类，请点击</span>
+            <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
+          </el-form-item> -->
           <el-form-item label="视频缩略图" required>
             <upload-img :fileList="ruleForm.imageList" @imgUrl="imgUrl"></upload-img>
           </el-form-item>
@@ -160,13 +173,14 @@ export default {
       },
       rule:{
         name: [
-          { required: true, message: "请输入视频分类名称", trigger: "blur" }
+          { required: true, message: "请输入视频分类名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
       },
       rules: {
         name: [
-          { required: true, message: "请输入视频名称", trigger: "blur" }
-          // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
+          { required: true, message: "请输入视频名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         videoContentCopyrightOwnerId:[
           { required: true, message: "请选择视频版权方", trigger: "change" }

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

@@ -12,9 +12,11 @@
           :rules="rules"
           ref="ruleForm"
           label-width="140px"
-          class="party-form form-inline"
+          class="demo-form-inline party-form"
+          :inline="true"
+          label-position="top"
         >
-          <el-form-item label="版权方名称" prop="name">
+          <el-form-item label="版权方名称" prop="name" class="w50">
             <el-input v-model="ruleForm.name"></el-input>
           </el-form-item>
           <el-form-item label="版权方有效期" prop="value1">
@@ -27,11 +29,7 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item class="addTip">
-            <span>若没有相应的视频分类，请点击</span>
-            <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
-          </el-form-item>
-          <el-form-item class="selectH100" label="请选择视频分类" prop="videoContentCatIdList">
+          <el-form-item class="w50" label="请选择视频分类" prop="videoContentCatIdList">
             <el-select
               placeholder="请选择预设视频分类"
               @focus="getAssetTypeData"
@@ -48,7 +46,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="备注">
+           <el-form-item >
+             <br>
+            <span style="color:red">若没有相应的视频分类，请点击</span>
+            <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
+          </el-form-item>
+          <el-form-item label="备注" class="w100">
             <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -143,8 +146,8 @@ export default {
       },
       rules: {
         name: [
-          { required: true, message: "请输入版权方名称", trigger: "blur" }
-          // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
+          { required: true, message: "请输入版权方名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         videoContentCatIdList:[
           {required: true, message: "请选择视频分类", trigger: "change" }

src/page/system/orgDialog/add.vue

@@ -83,6 +83,7 @@ export default {
       rules: {
         name: [
           { required: true, message: "请输入机构名称", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         areaId: [
           { required: true, message: "请选择地理位置", trigger: "change" },

src/page/system/orgDialog/edit.vue

@@ -84,6 +84,7 @@ export default {
       rules: {
         name: [
           { required: true, message: "请输入机构名称", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         areaId: [
           { required: true, message: "请选择地理位置", trigger: "change" },

src/style/global.less

@@ -376,6 +376,7 @@
   height: 100%;
   width: 100%;
   overflow: hidden;
+  background:#ffffff;
 
   .info-header {
     font-size: 20px;
@@ -391,7 +392,7 @@
   .info-wrapper {
     width: 640px;
     margin: 0 auto;
-    background: #fff;
+    // background: #fff;
 
     .pageTips {
       height: 72px;