测试迭代

src/page/STB/base/components/addDialog.vue

@@ -30,7 +30,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="机构地理位置：" prop="areaName" required>
+        <el-form-item label="机构地理位置：" prop="areaName">
           <el-input
             v-model="formItem.areaName"
             disabled
@@ -78,6 +78,9 @@ export default {
         permanent: [
           { required: true, message: "请选择账号有效期", trigger: "change" },
         ],
+        areaName:[
+          { required: true, message: "请选择机构地理位置", trigger: "change" },
+        ]
       },
     };
   },

src/page/check/learn/index.vue

@@ -27,7 +27,7 @@
       </el-form>
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
-        <span class="page-tips">可查看视频待审核的所有内容，可根据审核类别进行筛选</span>
+        <span class="page-tips">可查看学习内容待审核的所有内容，可根据审核类别进行筛选</span>
       </div>
     </div>
     <div class="table-content">

src/page/check/video/index.vue

@@ -27,7 +27,7 @@
       </el-form>
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
-        <span class="page-tips">可查看学习内容待审核的所有内容，可根据审核类别进行筛选</span>
+        <span class="page-tips">可查看视频待审核的所有内容，可根据审核类别进行筛选</span>
       </div>
     </div>
     <div class="table-content">
@@ -555,10 +555,10 @@ export default {
         url: `/aa/group1/M00/00/54/wKhuVWCBObuAUSIQA6Mwb1hO1jk035.mp4`,
         responseType: "blob",
     }).then(res => {
-      debugger;
+      // debugger;
        var blob = res.data;
             console.log(window.URL.createObjectURL(blob), '加密的视频地址')
-            _this.videoSrc = window.URL.createObjectURL(blob)
+            // _this.videoSrc = window.URL.createObjectURL(blob)
             // video.onload = function(e) {
             //     window.URL.revokeObjectURL(video.src);
             // };

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

@@ -30,7 +30,7 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item class="selectH100" label="请选择预设视频分类" prop="videoContentCatIdList">
+        <el-form-item  label="请选择预设视频分类" prop="videoContentCatIdList">
           <el-select
             placeholder="请选择预设视频分类"
             @focus="getAssetTypeData"

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

@@ -298,10 +298,7 @@ export default {
             _this.$qs.stringify({isPublish:isPublish}))
             .then(
               res => {
-                // _this.msgInfo = {
-                //   type: "wait",
-                //   des: `申请已提交，待审核…`,
-                // };
+               
                  if(res.data.resultCode === "200"){
                    
                    if(_isPublish){

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

@@ -317,6 +317,7 @@ export default {
     // 上下架
     handlePublish(row, isPublish) {
       let _this = this;
+      let _isPublish = isPublish
       _this
         .$https(
           {
@@ -328,13 +329,20 @@ export default {
         )
         .then(
           (res) => {
-            // this.$message({ type: "success", message: "删除成功!" });
-            // alert("已提交审核！")
-            this.msgInfo = {
-              type: "wait",
-              des: `申请已提交，待审核…`,
-            };
-            _this.Search();
+    
+             if(res.data.resultCode === "200"){
+               
+                   
+                   if(_isPublish === 'True'){
+                     this.$message({ type: "success", message: "启用申请已提交,待审核！" });
+                    
+                   }else{
+                     this.$message({ type: "success", message: "禁用申请已提交,待审核！" });
+                   }
+                    _this.onSearch();
+              }else{
+                this.$message({ type: "error", message: res.data.message });
+              }
           },
           (error) => {
             this.$message({

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

@@ -125,13 +125,13 @@
             v-show="type === 'add'"
             class="btn_form_search"
             @click="submitForm('ruleForm')"
-          >确定</el-button>
+          >提交审核</el-button>
           <el-button
             type="primary"
             v-show="type === 'Update'"
             class="btn_form_search"
             @click="updateForm('ruleForm')"
-          >确定</el-button>
+          >提交审核</el-button>
           <el-button @click="resetForm('ruleForm')">取消</el-button>
         </div>
       </div>

src/style/global.less

@@ -196,9 +196,15 @@
     color: @party-btn-color;
   }
 }
+  
+ // 多选选择下拉选中放左侧
+ .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
+  right: 263px!important;
+}
 
 // 系统form 表单样式
 .party-form {
+ 
   .el-input__icon {
     width: 40px;
     font-size: 20px;
@@ -219,6 +225,7 @@
       border: 1px solid @party-border-color;
     }
   }
+  
 
   .el-textarea .el-textarea__inner {
     background-color: @party-bg-gray;
@@ -265,6 +272,7 @@
     }
 
   }
+  
 
   .el-checkbox-group {
     .el-checkbox {