zc

public/UEditor/ueditor.config.js

@@ -34,17 +34,25 @@
 
         //工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
         , toolbars: [[
-            /*'fullscreen', 'source', '|',*/ 'undo', 'redo', '|',
+        'undo', 'redo', '|','bold', 'italic', 'underline', 'fontborder', 'strikethrough', '|',
+        'rowspacingtop', 'rowspacingbottom', 'lineheight', '|',
+        'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|',
+        'forecolor', 'backcolor', '|',
+        'insertimage','insertvideo','|',
+        'horizontal', 'date', 'time',
+        /*
+            'fullscreen', 'source', '|', 'undo', 'redo', '|',
             'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|',
             'rowspacingtop', 'rowspacingbottom', 'lineheight', '|',
             'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|',
             'directionalityltr', 'directionalityrtl', 'indent', '|',
-            'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|',
+            'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase','|',
             'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
-            /*'simpleupload',*/ 'insertimage',/* 'emotion', 'scrawl',*/ 'insertvideo', /*'music', 'attachment','map', 'gmap', 'insertframe', 'insertcode', 'webapp',*/ 'pagebreak', 'template', /*'background',*/ '|',
-            'horizontal', 'date', 'time', 'spechars', /*'snapscreen', 'wordimage',*/ '|',
+            'simpleupload','insertimage','insertvideo','|','emotion', 'scrawl', 'music', 'attachment','map', 'gmap', 'insertframe', 'insertcode', 'webapp', 'pagebreak', 'template', 'background','|',
+            'horizontal', 'date', 'time', 'spechars', 'snapscreen', 'wordimage', '|',
             'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',
-            /*'print', 'preview',*/ 'searchreplace', /*'drafts', 'help'*/
+            'print', 'preview', 'searchreplace', 'drafts', 'help'
+        */
         ]]
         //当鼠标放在工具栏上时显示的tooltip提示,留空支持自动多语言配置，否则以配置值为准
         //,labelMap:{

src/assets/styles/index.scss

@@ -11,6 +11,12 @@
     font-weight:500;
   }
 }
+.v-modal{
+  z-index:107 !important;
+}
+.el_resources_dialog{
+  z-index:108 !important;
+}
 /*火狐浏览器*/
 @-moz-document url-prefix() {
   * {

src/components/UEditor/index.vue

@@ -14,6 +14,8 @@
     },
     props: {
       content:{},
+      height:null,
+      width:null,
     },
     data() {
       return {
@@ -22,12 +24,10 @@
           // 编辑器不自动被内容撑高
           autoHeightEnabled: false,
           // 初始容器高度
-          initialFrameHeight: 430,
+          initialFrameHeight: this.height?this.height:430,
           // 初始容器宽度
-          initialFrameWidth: 1100,
+          initialFrameWidth: this.width?this.width:1100,
           // 上传文件接口（这个地址是我为了方便各位体验文件上传功能搭建的临时接口，请勿在生产环境使用！！！）
-          // serverUrl: '//ueditor.szcloudplus.com/cos',
-          // serverUrl: '//192.168.1.8:9300/exec',
           serverUrl: '//'+this.judgmentNetworkReturnAddress()+'/system/editor/exec',
           // UEditor 资源文件的存放路径，如果你使用的是 vue-cli 生成的项目，通常不需要设置该选项，vue-ueditor-wrap 会自动处理常见的情况，如果需要特殊配置，参考下方的常见问题2
           UEDITOR_HOME_URL: './UEditor/'

src/views/hierarchicalControl/conditionsSettings/index.vue

@@ -48,7 +48,6 @@
           <p class="page-add-common-style-button"
              style="float: right;"
              @click="tableButton(1)"
-             v-hasPermiRouter="['demo:demo:add']"
           >新增</p>
         </el-form>
       </div>

src/views/safetyCheck/checkItemLibrary/index.vue

@@ -45,7 +45,7 @@
           <template slot-scope="scope">
             <div class="table-button-box">
               <p class="table-button-null"></p>
-              <p class="table-button-p" v-if="scope.row.level != 4"v-hasPermiRouter="['check:option:add']"
+              <p class="table-button-p" v-if="scope.row.level != 4" v-hasPermiRouter="['check:option:add']"
                  @click="addDialogOpen(2,scope.row)">新增</p>
               <p class="table-button-p" @click="addDialogOpen(3,scope.row)" v-hasPermiRouter="['check:option:edit']">编辑</p>
               <p class="table-button-p" @click="delItem(scope.row)" v-hasPermiRouter="['check:option:del']">删除</p>

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -95,7 +95,7 @@
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-hasPermiRouter="['safety:checkManage:detail']"
                    v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-hasPermiRouter="[,'safety:checkManage:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['safety:checkManage:edit']"
                    v-show="scope.row.manageStatus==1 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-hasPermiRouter="['safety:checkManage:edit']"
                    v-show="scope.row.manageStatus==0 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">开始检查</p>

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

@@ -9,7 +9,7 @@
       <div class="learn-list scrollbar-box">
         <div class="course-info">
           <div class="name-max-box">
-            <p>{{infoData.title}}{{infoData.cateTitle}}</p>
+            <p>{{infoData.title}} - {{infoData.cateTitle}}</p>
             <!--<p>已学习时长：{{infoData.learnDurationStr}}</p>-->
           </div>
           <div class="time-box">

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

@@ -10,7 +10,7 @@
       <div class="learn-list scrollbar-box">
         <div class="course-info">
           <div class="name-max-box">
-            <p>{{infoData.title}}{{infoData.cateTitle}}</p>
+            <p>{{infoData.title}} - {{infoData.cateTitle}}</p>
             <!--<p>已学习时长：{{infoData.learnDurationStr}}</p>-->
           </div>
           <div class="time-box">

src/views/safetyEducationExam/safeLearning/el_resources/index.vue

@@ -225,7 +225,7 @@
             </div>
             <div class="up-data-box-text">
               <p>支持上传视频、图片、文件类型的课件</p>
-              <p>图片请上传 png / jpeg / gif 格式</p>
+              <p>图片请上传 png / jpeg / jpg / gif 格式</p>
               <p>视频请上传 mp4 / WebM格式 </p>
               <p>文件请上传 pdf / docx 格式</p>
             </div>
@@ -238,7 +238,7 @@
         <el-form ref="richTextForm" :model="richTextForm" v-loading="loading" :rules="richTextRules" label-width="100px" style="flex-direction: column;display: flex;">
           <el-form-item label="分类">
             <el-input
-              style="width: 100%;"
+              style="width: 940px"
               v-model="typeTitle"
               maxLength="25"
               placeholder=""
@@ -249,15 +249,16 @@
           </el-form-item>
           <el-form-item label="课件名称" prop="title">
             <el-input
-              style="width: 100%;"
+              style="width: 940px"
               v-model="richTextForm.title"
               maxLength="20"
               placeholder="请输入课件名称"
               clearable
             />
           </el-form-item>
-          <el-form-item label="课件内容" prop="content" style="width:1000px;height:500px;overflow-y: scroll" class="scrollbar-box">
-            <editor v-model="richTextForm.content" :min-height="192"/>
+          <el-form-item label="课件内容" prop="content" style="height:500px;overflow-y: scroll" class="scrollbar-box">
+            <UEditor ref="UEditor" :content="richTextForm.content" :height="400" :width="940" />
+            <!--<editor v-model="richTextForm.content" :min-height="192"/>-->
           </el-form-item>
         </el-form>
         <!--公共操作按钮-->
@@ -274,7 +275,7 @@
         <el-form ref="richTextForm" :model="richTextForm" v-loading="loading" :rules="richTextRules" label-width="80px">
           <el-form-item label="分类" prop="title">
             <el-input
-              style="width: 100%;"
+              style="width: 940px"
               v-model="typeTitle"
               maxLength="25"
               placeholder=""
@@ -285,14 +286,16 @@
           </el-form-item>
           <el-form-item label="课件名称" prop="title">
             <el-input
+              style="width: 940px"
               v-model="richTextForm.title"
               maxLength="20"
               placeholder="请输入课件名称"
               clearable
             />
           </el-form-item>
-          <el-form-item label="课件内容" prop="content" style="width:1000px;height:500px;overflow-y: scroll" class="scrollbar-box">
-            <editor v-model="richTextForm.content" :min-height="192"/>
+          <el-form-item label="课件内容" prop="content" style="height:500px;overflow-y: scroll" class="scrollbar-box">
+            <UEditor ref="UEditor" :content="richTextForm.content" :height="400" :width="940" />
+            <!--<editor v-model="richTextForm.content" :min-height="192"/>-->
           </el-form-item>
         </el-form>
         <!--公共操作按钮-->
@@ -504,6 +507,7 @@ export default {
     },
     //富文本课件提交按钮
     richTextClick(){
+      this.$set(this.richTextForm,'content',this.$refs.UEditor.text);
       this.$refs["richTextForm"].validate(valid => {
         if (valid) {
           if(this.richTextAddType){

src/views/safetyEducationExam/safeLearning/safeLearning/learningRecord.vue

@@ -9,7 +9,7 @@
       <div class="learn-list scrollbar-box">
         <div class="course-info">
           <div class="name-max-box">
-            <p>{{infoData.title}}{{infoData.cateTitle}}</p>
+            <p>{{infoData.title}} - {{infoData.cateTitle}}</p>
             <p>已学习时长：{{infoData.learnDurationStr}}</p>
           </div>
           <div class="time-box">

src/views/safetyEducationExam/safeLearning/safeLearning/startLearning.vue

@@ -8,7 +8,7 @@
       <div class="learn-list scrollbar-box">
         <div class="course-info">
           <div class="name-max-box">
-            <p>{{infoData.title}}{{infoData.cateTitle}}</p>
+            <p>{{infoData.title}} - {{infoData.cateTitle}}</p>
             <p>已学习时长：{{infoData.learnDurationStr?infoData.learnDurationStr:0}}</p>
           </div>
           <div class="time-box">

src/views/safetyEducationExam/safeLearning/safe_book/index.vue

@@ -5,7 +5,7 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
           <el-form-item label="" prop="type">
-            <el-select v-model="queryParams.type" placeholder="请选择制度分类" clearable size="small">
+            <el-select v-model="queryParams.type" placeholder="请选择制度分类" clearable @clear="clearType" size="small">
               <el-option
                 v-for="item in safeType"
                 :key="item.value"
@@ -244,6 +244,9 @@ export default {
     });
   },
   methods: {
+    clearType(){
+      this.$set(this.queryParams,'type',null);
+    },
     dialogQrCodeOn(url){
       this.dialogQrCodeUrl = url;
       this.dialogQrCodeType = true;

src/views/secureAccess/handle/addPage.vue

@@ -268,8 +268,8 @@
             { required: true, message: '请先行绑定学号', validator: this.spaceJudgment, trigger: 'blur' }
           ],
           cardNumSimple: [
-            { required: true, message: '请先行绑定物理卡号', trigger: 'change' },
-            { required: true, message: '请先行绑定物理卡号', validator: this.spaceJudgment, trigger: 'blur' }
+            { required: true, message: '请联系导师绑定物理卡号', trigger: 'change' },
+            { required: true, message: '请联系导师绑定物理卡号', validator: this.spaceJudgment, trigger: 'blur' }
           ],
           tutorUserId: [
             { required: true, message: '请先行绑定导师', trigger: 'change' },