测试迭代

src/config/httpServer.js

@@ -96,12 +96,16 @@ const httpServer = (opts, data, file, timeout) => {
       text: 'Loading',
       spinner: 'el-icon-loading'
     })
-    let markIndex = setTimeout(function () {
-      loadingInstance.close();
-    }, 10000)
+    // let markIndex = setTimeout(function () {
+    //   loadingInstance.close();
+    // }, 10000)
     axios(httpDefaultOpts).then((res) => {
-      loadingInstance.close();
-      clearTimeout(markIndex)
+      console.log(res)
+      if(res.data){
+        loadingInstance.close();
+        // clearTimeout(markIndex)
+      }
+     
       if (res.data.resultCode == '1109' && localStorage.getItem('backToken')) {
         //清除用户信息
         errorState(res.status, res.data)

src/page/check/learn/index.vue

@@ -64,16 +64,23 @@
               </template>
             </el-table-column>
             <el-table-column label="操作" header-align="center" align="center">
-              <template slot-scope="scope" width="220">
-                 <div class="table-btn-group">
+            <template slot-scope="scope" width="220">
+              <div class="table-btn-group">
                 <el-tooltip content="详情" placement="top">
-                  <el-button circle @click="openDetails(scope.row)">
+                  <el-button
+                    :disabled="
+                scope.row.operation === 'REMOVE' &&
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                    circle
+                    @click="openDetails(scope.row)"
+                  >
                     <i class="icon-table icon-detail"></i>
                   </el-button>
                 </el-tooltip>
               </div>
-              </template>
-            </el-table-column>
+            </template>
+          </el-table-column>
              <el-table-column label="审核"  width="220" header-align="center" align="center">
               <template slot-scope="scope">
                  <div class="table-btn-group">

src/page/check/video/index.vue

@@ -61,11 +61,18 @@
               <span v-else-if="scope.row.status === 'APPROVED_FINAL'">通过</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" header-align="center" align="center">
+            <el-table-column label="操作" header-align="center" align="center">
             <template slot-scope="scope" width="220">
               <div class="table-btn-group">
                 <el-tooltip content="详情" placement="top">
-                  <el-button circle @click="openDetails(scope.row)">
+                  <el-button
+                    :disabled="
+                scope.row.operation === 'REMOVE' &&
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                    circle
+                    @click="openDetails(scope.row)"
+                  >
                     <i class="icon-table icon-detail"></i>
                   </el-button>
                 </el-tooltip>

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

@@ -42,7 +42,7 @@
             <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="备注" class="w100">
+        <el-form-item label="备注" class="w100" prop="remarks">
           <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
         </el-form-item>
       </el-form>
@@ -93,7 +93,10 @@ export default {
         ],
         value1:[
           { required: true, message: "请填写版权方有效期", trigger: "change" }
-        ]
+        ],
+        remarks: [
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ],
       }
     };
   },

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

@@ -29,6 +29,7 @@ export default {
   },
   data() {
     return {
+      fullscreenLoading: false,
       loading:false,
       filedata:[],
       fileArr: [],
@@ -37,8 +38,24 @@ export default {
     };
   },
   methods: {
+     openFullScreen2() {
+        const loading = this.$loading({
+          lock: true,
+          text: '上传中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        
+      },
     submitUpload() {  // 导入
-    this.loading = true
+    // this.openFullScreen2()
+     const loading = this.$loading({
+          lock: true,
+          text: '上传中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+    // this.loading = true
         let tempData =  this.filedata
         this.filedata = new FormData()  //  用FormData存放上传文件
         this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
@@ -56,9 +73,10 @@ export default {
         .then(res => {
           let resData = res.data;
           console.log(res)
-          this.loading = false
+          
+          // this.loading = false
           if (resData.resultCode == "200") {
-         
+            loading.close();
              _this.$message.success('上传成功！')
             const data = resData.data.fileList;
             let newArray = data.map((item) => item.id);

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

@@ -112,7 +112,7 @@
           <el-form-item label="展板分类名称" prop="name">
             <el-input v-model="classForm.name"></el-input>
           </el-form-item>
-          <el-form-item label="备注">
+          <el-form-item label="备注" prop="remarks">
             <el-input type="textarea" v-model="classForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -149,6 +149,9 @@ export default {
           { required: true, message: "请输入展板分类名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        remarks: [
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ],
       },
       value: "",
       name: "",

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

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

@@ -52,7 +52,7 @@
             <span style="color:red">若没有相应的展板分类，请点击</span>
             <el-button type="text" @click="addBoardClass">新建展板分类</el-button>
           </el-form-item>
-          <el-form-item label="备注" class="w100">
+          <el-form-item label="备注" class="w100" prop="remarks">
             <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -74,10 +74,10 @@
               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="备注">
+              <el-form-item label="备注" prop="remarks">
                 <el-input type="textarea" v-model="classForm.remarks"></el-input>
               </el-form-item>
             </el-form>
@@ -151,6 +151,9 @@ export default {
           { required: true, message: "请输入展板分类名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+         remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ]
       },
       rules: {
         name: [
@@ -162,6 +165,9 @@ export default {
         ],
         value1:[
           { required: true, message: "请填写版权方有效期", trigger: "change" }
+        ],
+         remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
         ]
       }
     };

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

 <template>
-  <div class="listPage H100">
+  <div class="listPage H100 learn-box">
     <div class="search-container">
       <el-form :inline="true" :model="form" onsubmit="return false;">
         <el-form-item>
@@ -585,9 +585,11 @@ export default {
 // @import "../../style/list";
 @import "../../../../style/table.less";
 @import "../../../../style/pagination.less";
-@media screen and (max-width: 1024px) {
+.learn-box {
+  @media screen and (max-width: 1024px) {
     .page-tip {
       display: none !important;
     }
 }
+}
 </style>

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

@@ -109,7 +109,7 @@
           <el-form-item label="学习项目名称" prop="name">
             <el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
           </el-form-item>
-          <el-form-item label="备注">
+          <el-form-item label="备注" prop="remarks">
             <el-input type="textarea" v-model="classForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -158,12 +158,19 @@ export default {
           { required: true, message: "请输入学习项目名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ]
       },
       rules: {
         name: [
           { required: true, message: "请输入学习项目名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        // remarks:[
+        //   { required: true, message: "请输入学习项目名称", trigger: "blur" },
+        //   { min: 1, max: 2, message: "请输入1到20个字" },
+        // ]
       },
       value: "",
       name: "",

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

@@ -203,20 +203,11 @@ export default {
       typeList: [],
       rules: {
         name: [
-          { required: true, message: "请输入分类名称", trigger: "change" },
-          // { pattern: /^(\d{1,5})?$/, message: "排序值为低于5位数的纯数字" }
+         { required: true, message: "请输入分类名称", trigger: "change" },
+         { min: 1, max: 20, message: "请输入1到20个字" },
         ],
-        menuName: [
-          { required: true, message: "请输入菜单名称", trigger: "change" },
-          { max: 20, message: "不能超过20个字符", trigger: "change" },
-          { validator: checkIsNull, trigger: "blur" }
-        ],
-        menuUrl: [
-          { required: true, message: "请输入菜单地址", trigger: "change" },
-          { validator: checkIsNull, trigger: "blur" }
-        ],
-        parentId: [
-          { required: true, message: "请输入父级菜单", trigger: "change" }
+        remarks: [
+          { min: 1, max: 100, message: "请输入1到100个字" },
         ]
       },
       value: "",

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

@@ -97,7 +97,7 @@
               <el-form-item label="视频分类名称" prop="name">
                 <el-input v-model="classForm.name"></el-input>
               </el-form-item>
-              <el-form-item label="备注" class="w100">
+              <el-form-item label="备注" class="w100" prop="remarks">
                 <el-input type="textarea" v-model="classForm.remarks"></el-input>
               </el-form-item>
             </el-form>
@@ -174,9 +174,12 @@ export default {
       },
       rule:{
         name: [
-          { required: true, message: "请输入视频分类名称", trigger: "blur" },
+          // { required: true, message: "请输入视频分类名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        remarks: [
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ],
       },
       rules: {
         name: [

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

@@ -9,7 +9,7 @@
            </div>
         <el-form
           :model="ruleForm"
-          :rules="rules"
+          :rules="rule"
           ref="ruleForm"
           label-width="140px"
           class="demo-form-inline party-form"
@@ -51,7 +51,7 @@
             <span style="color:red">若没有相应的视频分类，请点击</span>
             <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
           </el-form-item>
-          <el-form-item label="备注" class="w100">
+          <el-form-item label="备注" class="w100" prop="remarks">
             <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -76,7 +76,7 @@
               <el-form-item label="视频分类名称" prop="name">
                 <el-input v-model="classForm.name"></el-input>
               </el-form-item>
-              <el-form-item label="备注">
+              <el-form-item label="备注" prop="remarks">
                 <el-input type="textarea" v-model="classForm.remarks"></el-input>
               </el-form-item>
             </el-form>
@@ -144,6 +144,15 @@ export default {
         width: "100%",
         paddingRight: "10px"
       },
+      rule:{
+        name: [
+          { required: true, message: "请输入版权方名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
+        ],
+        remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ]
+      },
       rules: {
         name: [
           { required: true, message: "请输入版权方名称", trigger: "blur" },
@@ -154,6 +163,9 @@ export default {
         ],
         value1:[
           { required: true, message: "请填写版权方有效期", trigger: "change" }
+        ],
+        remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
         ]
       }
     };

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

@@ -54,7 +54,8 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="multipleRemit()">汇出</el-button>
+        <el-button type="primary" @click="multipleRemitGet()">汇出</el-button>
+        <!-- <el-button type="primary" @click="multipleRemit()">汇出</el-button> -->
       </div>
       <div class="party-table">
         <el-table
@@ -90,6 +91,7 @@
   </div>
 </template>
 <script>
+import axios from 'axios'
 export default {
   data() {
     var checkIsNull = (rule, value, callback) => {
@@ -102,6 +104,7 @@ export default {
       }
     };
     return {
+      fullscreenLoading: false,
       copyrightOwner:[],
       videoContentCat:[],
       type: true,
@@ -343,6 +346,142 @@ export default {
           message: "请至少选择一个选项！"
         });
       }
+    },
+    openFullScreen2() {
+        const loading = this.$loading({
+          lock: true,
+          text: '下载中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        // setTimeout(() => {
+        //   loading.close();
+        // }, 2000);
+      },
+    // get测试
+       multipleRemitGet() {
+        //  this.openFullScreen2()
+         const loading = this.$loading({
+          lock: true,
+          text: '下载中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        
+          let _this = this;
+        let str = _this.getMultipleSelect();
+         axios({
+        method: "get",
+        url: 'http://111.203.232.175:8088/mall/asset/download',
+        params: {
+          // idList: "1382697227765313538"
+          idList:str
+        },
+        headers: {
+            "Authorization":  localStorage.getItem("backToken") || "",
+        },
+        responseType: "blob",
+    }).then(res => {
+        loading.close();
+        let blobUrl = window.URL.createObjectURL(res.data);
+        const aElement = document.createElement("a");
+        aElement.href = blobUrl; 
+        aElement.download = 'aaaa.zip';
+        aElement.click();
+        window.URL.revokeObjectURL(blobUrl);
+    })
+      // let _this = this;
+      // let str = _this.getMultipleSelect();
+
+      //   console.log(str);
+      //   _this.$https({
+      //       url: "asset/download",
+      //       method: "get",
+      //       authType: this.backToken,
+      //   //      dataType: 'json',
+      //   // responseType: 'arraybuffer' // 该条件是重点
+      //       responseType: 'blob'
+      //     },
+      //     {idList:'1382697227765313538'}
+      
+      //     )
+      //     .then(
+      //       res => {
+      //         let blobUrl = window.URL.createObjectURL(res.data);
+      //   const aElement = document.createElement("a");
+      //   aElement.href = blobUrl; 
+      //   aElement.download = 'aaaa.zip';
+      //   aElement.click();
+      //   window.URL.revokeObjectURL(blobUrl);
+
+
+        // const content = res
+        // const blob = new Blob([content])
+        // const fileName = 'electron-mat.zip'
+        // if ('download' in document.createElement('a')) { // 非IE下载
+        //   const elink = document.createElement('a')
+        //   elink.download = fileName
+        //   elink.style.display = 'none'
+        //   elink.href = URL.createObjectURL(blob)
+        //   document.body.appendChild(elink)
+        //   elink.click()
+        //   URL.revokeObjectURL(elink.href) // 释放URL 对象
+        //   document.body.removeChild(elink)
+        // } else { // IE10+下载
+        //   // navigator.msSaveBlob(blob, fileName)
+        // }
+
+        //   const blob = new Blob([res.data], { type: 'application/zip' })
+        // const url = window.URL.createObjectURL(blob)
+        // window.location.href = url
+
+
+
+        // if(typeof(res.data) == 'string'){
+        //     var blob = new Blob([res.data], { type: 'application/zip' })
+        //     if (window.navigator.msSaveOrOpenBlob) {//msSaveOrOpenBlob方法返回bool值
+        //       navigator.msSaveBlob(blob, 'fileName');//本地保存
+        //     } else {
+        //       var link = document.createElement('a');//a标签下载
+        //       link.href = window.URL.createObjectURL(blob);
+        //       link.download = 'fileName';
+        //       link.click();
+        //       window.URL.revokeObjectURL(link.href);
+        //     }
+        //   }else{
+        //   }
+
+      //   console.log(res)
+      //   const blob = new Blob([res.data], { type: 'application/zip' })
+      // const url = window.URL.createObjectURL(blob)
+      // const link = document.createElement('a') // 创建a标签
+      // link.href = url
+      // // link.download = data.fileName // 设置下载的文件名
+      // document.body.appendChild(link)
+      // link.click() //执行下载
+      // document.body.removeChild(link) //释放标签
+
+          // const downloadElement = document.createElement('a')
+          // const contentDisposition = res.headers['content-disposition']
+          // const patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+          // const result = patt.exec(contentDisposition)
+          // const filename = decodeURI(result[1])
+          // const href = window.URL.createObjectURL(blob) // 创建下载的链接
+          // downloadElement.href = href
+          // downloadElement.download = filename // 下载后文件名
+          // document.body.appendChild(downloadElement)
+          // downloadElement.click() // 点击下载
+          // document.body.removeChild(downloadElement) // 下载完成移除元素
+          // window.URL.revokeObjectURL(href) // 释放blob对象 
+          //   },
+          //   error => {}
+          // );
+      // } else {
+      //   this.$message({
+      //     type: "info",
+      //     message: "请至少选择一个选项！"
+      //   });
+      // }
 
       //   if (str) {
       //     this.$confirm("此操作将删除选中菜单, 是否继续?", "提示", {