zc

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/listPage.vue

@@ -141,7 +141,6 @@
         showType:false,
         //状态
         statusOptions:[
-          {label:'请选择状态',value:''},
           {label:'未使用',value:'-1'},
           {label:'使用中',value:'1'},
           {label:'超时未归还',value:'2'},
@@ -150,7 +149,6 @@
         categoryOptions:[],
         //级别
         levelOptions:[
-          {label:'请选择级别',value:''},
           {label:'管控',value:'1'},
           {label:'非管控',value:'2'},
         ],

src/views/iotDevice/appManage/applyList/index.vue

@@ -504,10 +504,8 @@
       tableButton(type,row){
         let self = this;
         if(type == 1){
-          let regex = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+/g;
-          let info = row.info.replace(regex, '_');
           let format = row.url.split('.');
-          let name = row.name+'-'+info+'.'+format[format.length-1];
+          let name = row.name+'.'+format[format.length-1];
           this.downloadGet(row.url,name);
         }else if(type == 2){
           let obj = JSON.parse(JSON.stringify(row));

src/views/iotDevice/monitoringWarning/receiver/index.vue

@@ -96,7 +96,7 @@
                :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form :model="dialogForm" ref="dialogForm" :inline="true" :rules="dialogRules" class="addCheckPage-min" label-width="120px">
         <el-form-item label="类型：" prop="receiveType">
-          <el-select v-model="dialogForm.receiveType" placeholder="请选择接接收类型" style="width: 320px">
+          <el-select v-model="dialogForm.receiveType" placeholder="请选择接收人类型" style="width: 320px">
             <el-option
               v-for="item in optionTypeList"
               :key="item.value"
@@ -106,7 +106,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="标识：" prop="receiveCode">
-          <el-input v-model="dialogForm.receiveCode" placeholder="请输入收人标识" maxLength="50" style="width:320px;"/>
+          <el-input v-model="dialogForm.receiveCode" placeholder="请输入接收人标识" maxLength="50" style="width:320px;"/>
         </el-form-item>
         <el-form-item label="姓名：" prop="receiveName">
           <el-input v-model="dialogForm.receiveName" placeholder="请输入接收人姓名" maxLength="50" style="width:320px;"/>
@@ -270,9 +270,11 @@
         let self = this;
         if(type == 1){
           //新增
+          this.$set(this,'dialogTitle','新增');
           this.$set(this,'dialogType',true);
         }else if(type == 3){
           //编辑
+          this.$set(this,'dialogTitle','编辑');
           this.$set(this,'dialogForm',row);
           this.$set(this,'dialogType',true);
         }else if(type == 4){

src/views/safetyEducationExam/safeLearning/el_course/courseDetails.vue

@@ -90,7 +90,11 @@
       },
       //返回
       backPage(){
-        this.$parent.goPageEdit(4);
+        if(this.pageType != 1){
+          this.$set(this,'pageType',1);
+        }else{
+          this.$parent.goPageEdit(4);
+        }
       },
       /** 查询详情 */
       getInfo() {

src/views/safetyEducationExam/safeLearning/el_course/coursePreview.vue

@@ -14,14 +14,6 @@
         v-if="exerciseData.postfix == 'png' || exerciseData.postfix == 'jpeg' || exerciseData.postfix == 'gif'"
         :src="exerciseData.chapterData">
       <!--视频-->
-      <!--<video-player-->
-        <!--class="video-player vjs-custom-skin"-->
-        <!--v-if="exerciseData.postfix == 'mp4' || exerciseData.postfix == 'webm'"-->
-        <!--@pause="demo($event)"-->
-        <!--:playsinline="true"-->
-        <!--:options="playerOptions">-->
-      <!--</video-player>-->
-      <!--poster="@/assets/ZDimages/video_logo.jpg"-->
       <video class="video-player vjs-custom-skin"
              style="width:910px;height:512px;"
              autoplay="autoplay"
@@ -30,11 +22,19 @@
         <source :src="exerciseData.chapterData" type="video/mp4">
       </video>
       <!--word-->
-      <iframe
-        class="iframe"
-        v-if="exerciseData.postfix == 'pdf' || exerciseData.postfix == 'docx'"
-        :src="exerciseData.iframeSrc" scrolling="auto" frameborder="0">
-      </iframe>
+      <vue-office-docx
+        v-if="exerciseData.postfix == 'docx'"
+        :src="exerciseData.iframeSrc"
+        @rendered="renderedHandler"
+        @error="errorHandler"
+      />
+      <!--pdf-->
+      <vue-office-pdf
+        v-if="exerciseData.postfix == 'pdf'"
+        :src="exerciseData.iframeSrc"
+        @rendered="renderedHandler"
+        @error="errorHandler"
+      />
       <!--富文本-->
       <div v-if="exerciseData.type == 5" v-html="exerciseData.chapterData"></div>
     </div>
@@ -42,6 +42,11 @@
 </template>
 
 <script>
+  //引入VueOfficeDocx组件
+  import VueOfficeDocx from '@vue-office/docx'
+  import '@vue-office/docx/lib/index.css'
+  //引入VueOfficePdf组件
+  import VueOfficePdf from '@vue-office/pdf'
   import { videoPlayer } from 'vue-video-player'
   export default {
     name: 'coursePreview',
@@ -49,7 +54,9 @@
       exerciseData:{},
     },
     components:{
-      videoPlayer
+      videoPlayer,
+      VueOfficeDocx,
+      VueOfficePdf
     },
     data() {
       return {
@@ -88,7 +95,7 @@
     methods: {
       judgeFunction(){
         if(this.exerciseData.postfix == "mp4"){
-          // this.getVideo();
+          this.exerciseData.chapterData = window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+this.exerciseData.chapterData
           this.loading = true;
         }else if(this.exerciseData.postfix == "pdf" || this.exerciseData.postfix == "docx"){
           this.getWord();
@@ -101,20 +108,9 @@
         this.exerciseData.chapterData = unescape(this.exerciseData.chapterData)
         this.loading = true;
       },
-      //视频处理
-      getVideo(){
-        let list = [];
-        let obj = {
-          type:'video/'+this.exerciseData.postfix,
-          src:this.exerciseData.chapterData,
-        };
-        list.push(obj);
-        this.playerOptions.sources = list;
-        this.loading = true;
-      },
       //word处理
       async getWord(){
-        this.exerciseData.iframeSrc = this.urlJudge(this.exerciseData.chapterData)
+        this.exerciseData.iframeSrc = window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+this.exerciseData.chapterData
         this.loading = true;
       },
     }
@@ -126,7 +122,7 @@
     flex:1;
     display: flex;
     flex-direction: column;
-    overflow-y: scroll;
+    overflow: hidden;
     *{
       margin:0;
       padding:0;
@@ -159,7 +155,6 @@
     }
     .center-info-components-max-box{
       margin:20px;
-      overflow-y: scroll;
       flex:1;
       display: flex;
       flex-direction: column;

src/views/safetyEducationExam/safeLearning/el_course/edit.vue

@@ -152,7 +152,7 @@
             <!--图片-->
             <img
               style="display: block;margin:0 auto;max-width:900px;"
-              v-if="chapterData.postfix == 'png' || chapterData.postfix == 'jpeg' || chapterData.postfix == 'gif'"
+              v-if="chapterData.postfix == 'png' || chapterData.postfix == 'jpg'|| chapterData.postfix == 'jpeg' || chapterData.postfix == 'gif'"
               :src="chapterData.chapterData">
             <video class="video-player vjs-custom-skin"
                    style="width:810px;height:512px;"
@@ -936,7 +936,7 @@
               examElChapterEdit(obj).then(response => {
                 this.msgSuccess('修改成功')
                 this.getInfoDataTow()
-                this.stepsType++
+                // this.stepsType++
               })
             } else {
               let obj = {
@@ -948,7 +948,7 @@
               examElChapterEdit(obj).then(response => {
                 this.msgSuccess('修改成功')
                 this.getInfoDataTow()
-                this.stepsType++
+                // this.stepsType++
               })
             }
           }
@@ -988,7 +988,7 @@
           return
         }
         let obj = {
-          type: 1,
+          type: item.type,
           courseId: this.infoId.id,
           parentId: this.chapterData.id,
           resourcesId: item.id,

src/views/safetyEducationExam/safeLearning/safeLearning/learning.vue

@@ -49,7 +49,7 @@
           @error="errorHandler"
         />
         <!--富文本-->
-        <div v-if="learningData.type == 5" v-html="learningData.chapterData" style="width:896px;margin:0 auto;"></div>
+        <div v-if="learningData.type == 5" v-html="learningData.chapterData" style="width:896px;margin:0 auto;padding:40px 0;"></div>
       </div>
     </div>
     <div class="shade-max-box" v-if="shadeType">

src/views/safetyEducationExam/trainingCourse/index.vue

@@ -224,7 +224,7 @@
           }).then(function() {
             let ids=[row.id];
             examSecuritycourseDel({ids:ids}).then(response => {
-              self.msgSuccess(response.msg)
+              self.msgSuccess(response.message)
               self.getList();
             })
           }).then(() => {