Merge remote-tracking branch 'origin/master'

danger-manage-web/src/utils/request.js

@@ -55,7 +55,8 @@ service.interceptors.response.use(res => {
     const msg = errorCode[code] || res.data.msg || errorCode['default']
     if (code === 401) {
       MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-          confirmButtonText: '重新登录',
+        // 重新登录
+          confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }

danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/Dia.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 10:38:49
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-12-26 09:54:47
+ * @LastEditTime: 2023-01-04 17:50:46
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/addLesson.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->

danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/Lesson.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 10:59:44
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-09-28 17:52:32
+ * @LastEditTime: 2023-01-04 17:47:53
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/Lession.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -65,6 +65,7 @@
             @resFun="getFileInfoFile"
             @remove="listRemoveFile"
             :fileArr="fileListFile"
+            :fileType="fileType"
           />
           <el-input v-show="false" disabled v-model="form.enclosure"></el-input>
         </el-form-item>
@@ -104,6 +105,7 @@ export default {
         video: "",
         enclosure: "",
       },
+      fileType: ["doc", "docx", "xls", "xlsx", "ppt", "txt", "pdf"],
       fileListVideo: [],
       fileListFile: [],
       readOnly: false,

danger-manage-web/src/views/educationPlanExam/myLessons/CheckLesson/index.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-20 20:14:18
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-09-28 16:59:32
+ * @LastEditTime: 2023-01-05 09:38:13
  * @FilePath: /danger-manage-web/src/views/myLessons/CheckLesson.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -38,10 +38,10 @@
         </div>
       </div>
 
-      <div class="bt flex fz14 video">
+      <div class="bt flex fz14 video" >
         <div class="a">视频文件</div>
         <div class="b">
-          <div class="video">
+          <div class="video" v-if="lessonData.video">
             <video-player
               class="video-player vjs-custom-skin"
               ref="videoPlayer"
@@ -49,6 +49,7 @@
               :options="playerOptions"
             ></video-player>
           </div>
+          <div v-else>未上传视频</div>
         </div>
       </div>
 
@@ -60,6 +61,9 @@
             <el-button style="padding: 0; margin-left: 20px" type="text">
               <a :href="lessonData.enclosure">下载</a>
             </el-button>
+            <el-button style="padding: 0; margin-left: 20px" type="text">
+              <a @click="openXslx(lessonData.enclosure)">预览</a>
+            </el-button>
           </div>
         </div>
       </div>
@@ -99,6 +103,9 @@
       :visible.sync="answerOpen"
       @jj="jj"
     />
+    <el-dialog :visible.sync="iframeVisible" width="80%">
+      <iframe style="width: 100%; height: 600px" :src="ky"></iframe>
+    </el-dialog>
   </div>
 </template>
 
@@ -117,6 +124,7 @@ export default {
       playerOptions: {
         aspectRatio: "16:9",
       },
+
       // 课程类型
       courseOptions: [],
       lessonData: {},
@@ -128,6 +136,8 @@ export default {
       fenshu: 0,
       answerOpen: false,
       lessonTypeName: "",
+      iframeVisible: false,
+      ky: "https://view.xdocin.com/222-223-203-154-8082_o52uv3.htm",
     };
   },
   created() {
@@ -238,6 +248,12 @@ export default {
       };
       xhr.send();
     },
+    openXslx(url, name) {
+      // window.open(`https://view.xdocin.com/view?src=${url}`);
+      console.log(url)
+      this.ky=`https://view.xdocin.com/view?src=${url}`;
+      this.iframeVisible=true;
+    },
   },
 };
 </script>

danger-manage-web/src/views/system/book/index.vue

@@ -142,6 +142,7 @@
     <!-- 添加或修改隐患台账对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-divider content-position="left"><i class="el-icon-info"></i><span class="boxx">隐患信息</span></el-divider>
         <el-form-item label="隐患名称" prop="troubleName">
           <el-input v-model="form.troubleName" placeholder="请输入隐患名称" />
         </el-form-item>
@@ -263,6 +264,9 @@
         <!--<el-form-item label="投入物资" prop="investmentMaterial" v-if="zhong==1">-->
         <!--<el-input v-model="form.investmentMaterial" placeholder="请输入投入物资" />-->
         <!--</el-form-item>-->
+        <el-divider content-position="left" v-if="zhong==2||fast"><i class="el-icon-info"></i><span class="boxx">整改信息</span></el-divider>
+        <el-row :gutter="24" class="mb8">
+          <el-col :span="12">
             <el-form-item label="整改人" prop="rectification" v-if="zhong==2||fast">
               <el-select v-model="form.rectification" filterable placeholder="请选择">
                 <el-option
@@ -273,6 +277,19 @@
                 </el-option>
               </el-select>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="整改时间" prop="rectificationTime" v-if ="zhong==2||fast">
+              <el-date-picker clearable size="small"
+                              v-model="form.rectificationTime"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="选择整改时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="整改图片" v-if="!readOnly &&( zhong==2 || fast)" prop="rectificationPictrue" >
           <MyFileUpload
             listType="picture-card"
@@ -283,22 +300,16 @@
           <el-input v-show="false" disabled v-model="form.rectificationPictrue"></el-input>
         </el-form-item>
 
-        <el-form-item label="整改时间" prop="rectificationTime" v-if ="zhong==2||fast">
-          <el-date-picker clearable size="small"
-                          v-model="form.rectificationTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择复查时间">
-          </el-date-picker>
-        </el-form-item>
+
         <el-form-item label="整改描述" prop="rectificationText" v-if="zhong==2||fast">
           <el-input v-model="form.rectificationText" placeholder="请输入整改描述" />
         </el-form-item>
-
+        <!--
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
-
+        -->
+        <el-divider content-position="left" v-if="!readOnly &&  fast"><i class="el-icon-info"></i><span class="boxx">复查信息</span></el-divider>
         <el-form-item label="复查图片" v-if="!readOnly &&  fast" prop="picture">
           <MyFileUpload
             listType="picture-card"
@@ -308,7 +319,8 @@
           />
           <el-input v-show="false" disabled v-model="form.inspectPictrue"></el-input>
         </el-form-item>
-
+        <el-row :gutter="24" class="mb8">
+          <el-col :span="12">
             <el-form-item label="复查时间" prop="inspectTime" v-if ="fast">
               <el-date-picker clearable size="small"
                               v-model="form.inspectTime"
@@ -317,9 +329,8 @@
                               placeholder="选择复查时间">
               </el-date-picker>
             </el-form-item>
-        <el-form-item label="复查描述" prop="inspectResult" v-if ="fast">
-          <el-input type="textarea" v-model="form.inspectResult" placeholder="请输入复查结果描述" />
-        </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="复查人" prop="personLiable" v-if ="fast">
               <el-select v-model="form.personLiable" filterable placeholder="请选择">
                 <el-option
@@ -330,6 +341,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="复查描述" prop="inspectResult" v-if ="fast">
+          <el-input type="textarea" v-model="form.inspectResult" placeholder="请输入复查结果描述" />
+        </el-form-item>
+
 
 
       </el-form>
@@ -341,7 +359,8 @@
     <!--详情-->
     <el-dialog :title="title" :visible.sync="open2" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="隐患名称" >
+      <el-divider content-position="left"><i class="el-icon-info"></i><span class="boxx">隐患信息</span></el-divider>
+        <el-form-item label="隐患名称">
           <el-input v-model="form.troubleName" placeholder="请输入隐患名称" disabled/>
 
         </el-form-item>
@@ -447,12 +466,15 @@
           <el-input type="textarea" v-model="form.proposal" placeholder="请输入整改建议" disabled/>
         </el-form-item>
 
+      <el-divider content-position="left"><i class="el-icon-info"></i><span class="boxx">整改信息</span></el-divider>
         <el-form-item label="投入费用" prop="investmentCost" v-if="zhong==1">
           <el-input v-model="form.investmentCost" placeholder="请输入投入费用" disabled/>
         </el-form-item>
         <el-form-item label="投入物资" prop="investmentMaterial" v-if="zhong==1">
           <el-input v-model="form.investmentMaterial" placeholder="请输入投入物资" disabled/>
         </el-form-item>
+        <el-row :gutter="24" class="mb8">
+          <el-col :span="12">
           <el-form-item label="整改人" prop="rectification" >
             <el-select v-model="form.rectification" filterable placeholder="请选择" disabled>
               <el-option
@@ -463,39 +485,37 @@
               </el-option>
             </el-select>
           </el-form-item>
-
-        <el-form-item label="整改图片"  prop="picture">
-          <img :src="form.rectificationPictrue" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(form)"/>
-          <el-image :zIndex="9999" :ref="'a'+form.id" :src="form.rectificationPictrue" v-show="false" :preview-src-list="[form.rectificationPictrue]" v-if="form.rectificationPictrue != '' && form.rectificationPictrue != null"></el-image>
-        </el-form-item>
+          </el-col>
+          <el-col :span="12">
           <el-form-item label="整改时间" prop="rectificationTime" >
             <el-date-picker clearable size="small"
                             v-model="form.rectificationTime"
                             type="datetime"
                             value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择复查时间" disabled>
+                            placeholder="选择整改时间" disabled>
             </el-date-picker>
           </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="整改图片"  prop="picture">
+          <img :src="form.rectificationPictrue" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(form)"/>
+          <el-image :zIndex="9999" :ref="'a'+form.id" :src="form.rectificationPictrue" v-show="false" :preview-src-list="[form.rectificationPictrue]" v-if="form.rectificationPictrue != '' && form.rectificationPictrue != null"></el-image>
+        </el-form-item>
         <el-form-item label="整改描述" prop="rectificationText" >
           <el-input v-model="form.rectificationText" placeholder="请输入整改描述" disabled/>
         </el-form-item>
-
-
+        <!--
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" disabled/>
+        </el-form-item>
+        -->
+      <el-divider content-position="left"><i class="el-icon-info"></i><span class="boxx">复查信息</span></el-divider>
         <el-form-item label="复查图片" prop="picture">
           <img :src="form.inspectPictrue" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(form)"/>
           <el-image :zIndex="9999" :ref="'a'+form.id" :src="form.inspectPictrue" v-show="false" :preview-src-list="[form.inspectPictrue]" v-if="form.picture != '' && form.inspectPictrue != null"></el-image>
         </el-form-item>
-        <el-form-item label="复查时间" prop="inspectTime" >
-          <el-date-picker clearable size="small"
-                          v-model="form.inspectTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择复查时间" disabled>
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="复查描述" prop="inspectResult">
-          <el-input type="textarea" v-model="form.inspectResult" placeholder="请输入复查结果描述" disabled/>
-        </el-form-item>
+        <el-row :gutter="24" class="mb8">
+          <el-col :span="12">
                 <el-form-item label="复查人"  >
                   <el-select v-model="form.personLiable" filterable placeholder="请选择" disabled>
                     <el-option
@@ -506,15 +526,30 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" disabled/>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="复查时间" prop="inspectTime" >
+            <el-date-picker clearable size="small"
+                            v-model="form.inspectTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择复查时间" disabled>
+            </el-date-picker>
           </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="复查描述" prop="inspectResult" style="padding-bottom: 16px;">
+          <el-input type="textarea" v-model="form.inspectResult" placeholder="请输入复查结果描述" disabled/>
+        </el-form-item>
+
+
 
       </el-form>
     </el-dialog>
     <!--整改复查-->
     <el-dialog :title="title" :visible.sync="open3" width="900px" append-to-body>
       <el-form ref="form" :model="form" label-width="80px">
+      <el-divider content-position="left"><i class="el-icon-info"></i><span class="boxx">隐患信息</span></el-divider>
         <el-form-item label="隐患名称" prop="troubleName">
           <el-input v-model="form.troubleName" placeholder="请输入隐患名称" disabled/>
         </el-form-item>
@@ -625,15 +660,20 @@
         <el-form-item label="整改建议" prop="proposal">
           <el-input type="textarea" v-model="form.proposal" placeholder="请输入整改建议" disabled/>
         </el-form-item>
+        <!--
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" disabled/>
         </el-form-item>
-        <!--<el-form-item label="投入费用" prop="investmentCost" v-if="zhong==1">-->
+        -->
+        <!--<el-form-item label="投入费用" prop="investmentCost" v-if="zhong==1">
         <!--<el-input v-model="form.investmentCost" placeholder="请输入投入费用" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="投入物资" prop="investmentMaterial" v-if="zhong==1">-->
         <!--<el-input v-model="form.investmentMaterial" placeholder="请输入投入物资" />-->
         <!--</el-form-item>-->
+        <el-divider content-position="left" ><i class="el-icon-info"></i><span class="boxx">整改信息</span></el-divider>
+                <el-row :gutter="24" class="mb8">
+                  <el-col :span="12">
                     <el-form-item label="整改人" prop="rectification"  >
                       <el-select v-model="form.rectification" filterable placeholder="请选择" :disabled="disabled">
                         <el-option
@@ -644,6 +684,19 @@
                         </el-option>
                       </el-select>
                     </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="整改时间" prop="rectificationTime" >
+                      <el-date-picker clearable size="small"
+                                      :disabled="disabled"
+                                      v-model="form.rectificationTime"
+                                      type="datetime"
+                                      value-format="yyyy-MM-dd HH:mm:ss"
+                                      placeholder="选择整改时间">
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                  </el-row>
         <el-form-item label="整改图片" v-if="!disabled" prop="rectificationPictrue" >
           <MyFileUpload
             listType="picture-card"
@@ -658,19 +711,36 @@
 
           </img>
         </el-form-item>
-        <el-form-item label="整改时间" prop="rectificationTime" >
+
+        <el-form-item label="整改描述" prop="rectificationText" >
+          <el-input type="textarea" v-model="form.rectificationText" placeholder="请输入整改描述" :disabled="disabled" />
+        </el-form-item>
+
+        <el-divider content-position="left" ><i class="el-icon-info"></i><span class="boxx">复查信息</span></el-divider>
+          <el-row :gutter="24" class="mb8">
+            <el-col :span="12">
+              <el-form-item label="复查人" prop="personLiable" v-if="disabled">
+                <el-select v-model="form.personLiable" filterable placeholder="请选择">
+                  <el-option
+                    v-for="item in staffList"
+                    :key="item.staffId"
+                    :label="item.staffName"
+                    :value="item.staffId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="复查时间" prop="inspectTime" >
                 <el-date-picker clearable size="small"
-                          :disabled="disabled"
-                          v-model="form.rectificationTime"
+                                v-model="form.inspectTime"
                                 type="datetime"
                                 value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择复查时间">
+                                placeholder="选择复查时间" v-if="disabled">
                 </el-date-picker>
               </el-form-item>
-        <el-form-item label="整改描述" prop="rectificationText" >
-          <el-input type="textarea" v-model="form.rectificationText" placeholder="请输入整改描述" :disabled="disabled" />
-        </el-form-item>
-
+            </el-col>
+           </el-row>
 
         <el-form-item label="复查图片" v-if="disabled" prop="picture">
           <MyFileUpload
@@ -693,22 +763,13 @@
         <el-form-item label="复查描述" prop="inspectResult" v-if="disabled">
           <el-input type="textarea" v-model="form.inspectResult" placeholder="请输入复查结果描述" />
         </el-form-item>
-        <el-form-item label="复查人" prop="personLiable" v-if="disabled">
-          <el-select v-model="form.personLiable" filterable placeholder="请选择">
-            <el-option
-              v-for="item in staffList"
-              :key="item.staffId"
-              :label="item.staffName"
-              :value="item.staffId">
-            </el-option>
-          </el-select>
-        </el-form-item>
+
 
 
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel2">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -870,6 +931,13 @@ export default {
       this.fileList1=[];
       this.fileList2=[];
     },
+    cancel2() {
+      this.open3 = false;
+      this.reset();
+      this.fileList=[];
+      this.fileList1=[];
+      this.fileList2=[];
+     },
     // 表单重置
     reset() {
       this.form = {
@@ -1166,4 +1234,23 @@ export default {
   ::v-deep .el-input.is-disabled .el-input__inner {
     color: #606266;
   }
+  ::v-deep .el-form-item {
+    margin-bottom: 18px;
+  }
+.boxd{
+  width: 100%;
+  height: 30px;
+  display: flex;
+  justify-content: center;
+  margin-bottom: 10px;
+
+}
+.boxx {
+    font-size: 17px;
+    font-weight: bold;
+    padding-left: 5px;
+  }
+::v-deep .el-dialog__body{
+  padding:0px 20px!important;
+}
 </style>