Merge remote-tracking branch 'origin/master'

danger-manage-system/src/main/resources/mapper/system/TEnterpriseSystemMapper.xml

@@ -32,7 +32,7 @@
     <select id="selectTEnterpriseSystemList" parameterType="TEnterpriseSystem" resultMap="TEnterpriseSystemResult">
         <include refid="selectTEnterpriseSystemVo"/>
         <where>
-            <if test="systemTitle != null  and systemTitle != ''"> and system_title = #{systemTitle}</if>
+            <if test="systemTitle != null  and systemTitle != ''"> and system_title like concat('%', #{systemTitle}, '%')</if>
             <if test="systemType != null  and systemType != ''"> and system_type = #{systemType}</if>
             <if test="hierarchy != null  and hierarchy != ''"> and hierarchy = #{hierarchy}</if>
             <if test="referenceNum != null  and referenceNum != ''"> and reference_num = #{referenceNum}</if>

danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_post p on t.post_id = p.post_id
         <where>  t.is_del = '0' and t.user_staff='1'
             <if test="staffName != null  and staffName != ''"> and t.staff_name like concat('%', #{staffName}, '%')</if>
-            <if test="staffCode != null  and staffCode != ''"> and t.staff_code = #{staffCode}</if>
+            <if test="staffCode != null  and staffCode != ''"> and t.staff_code like concat('%', #{staffCode}, '%')</if>
             <if test="sex != null  and sex != ''"> and t.sex = #{sex}</if>
             <if test="deptId != null "> and t.dept_id = #{deptId}</if>
             <if test="phonenumber != null and phonenumber != ''">

danger-manage-system/src/main/resources/mapper/system/TWorkPermitMapper.xml

@@ -181,12 +181,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          t_work_permit permit
         LEFT JOIN t_special_work_permit special ON permit.work_permit_id = special.work_permit_id
         LEFT JOIN t_special_work_permit_sign sign ON special.special_work_permit_id = sign.permit_id
-        WHERE (
+        <where>
+            (
             permit.link_man = #{currentLoginUser}
             OR sign.sign_id = #{currentLoginUser}
-        )
-        <where>
-            <if test="applyDept != null  and applyDept != ''"> and apply_dept = #{applyDept}</if>
+            )
+            <if test="applyDept != null  and applyDept != ''">and apply_dept like concat('%', #{applyDept}, '%')</if>
             <if test="linkMan != null  and linkMan != ''"> and link_man = #{linkMan}</if>
             <if test="linkPhone != null  and linkPhone != ''"> and link_phone = #{linkPhone}</if>
             <if test="workBound != null  and workBound != ''"> and work_bound = #{workBound}</if>

danger-manage-web/src/views/educationPlanExam/lessonsProgram/index.vue

@@ -70,11 +70,17 @@
 
     <el-table v-loading="loading" :data="lessonsList">
       <el-table-column label="课程标题" align="center" prop="courseName" />
-      <el-table-column
-        label="课程类别"
-        align="center"
-        prop="planName"
-      />
+      <el-table-column label="课程类别" align="center" prop="courseType">
+        <template v-slot="scope">
+          <div>
+            {{
+              courseOptions.filter(
+                (item) => item.planId == scope.row.courseType
+              )[0].planName
+            }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="课程状态" align="center" prop="status">
         <template v-slot="scope">
           <div>{{ ["未发布", "已发布"][scope.row.status] }}</div>
@@ -82,12 +88,13 @@
       </el-table-column>
       <el-table-column label="附件" align="center" prop="enclosure">
         <template v-slot="{ row: { enclosure } }">
-          <a :href="enclosure" class="down-load">下载附件</a>
+          <a v-if="enclosure.indexOf('.txt')>=0" @click="downloadText(enclosure)" class="down-load">下载附件</a>
+          <a v-else :href="enclosure" class="down-load">下载附件</a>
         </template>
       </el-table-column>
       <el-table-column label="视频" align="center" prop="video">
         <template v-slot="{ row: { courseName, video } }">
-          <a @click="downLoad(video, courseName)" class="down-load"
+          <a @click="downLoadVideo(video, courseName)" class="down-load"
             >下载视频</a
           >
         </template>
@@ -347,7 +354,45 @@ export default {
       if (!cellValue) return "-";
       else return cellValue;
     },
-    downLoad(url, name) {
+    downloadText(url) {
+      // url = url.replace(/\\/g, "/");
+      const xhr = new XMLHttpRequest();
+      xhr.open("GET", url, true);
+      xhr.responseType = "blob";
+      //xhr.setRequestHeader('Authorization', 'Basic a2VybWl0Omtlcm1pdA==');
+      xhr.onload = function () {
+        if (xhr.readyState === 4 && xhr.status === 200) {
+          let blob = this.response;
+          console.log(blob);
+          // 转换一个blob链接
+          // 注: URL.createObjectURL() 静态方法会创建一个 DOMString(DOMString 是一个UTF-16字符串)，
+          // 其中包含一个表示参数中给出的对象的URL。这个URL的生命周期和创建它的窗口中的document绑定
+          let downLoadUrl = window.URL.createObjectURL(
+            new Blob([blob], {
+              type: "txt",
+            })
+          );
+          // 视频的type是video/mp4，图片是image/jpeg
+          // 01.创建a标签
+          let a = document.createElement("a");
+          // 02.给a标签的属性download设定名称
+          a.download = name;
+          // 03.设置下载的文件名
+          a.href = downLoadUrl;
+          // 04.对a标签做一个隐藏处理
+          a.style.display = "none";
+          // 05.向文档中添加a标签
+          document.body.appendChild(a);
+          // 06.启动点击事件
+          a.click();
+          // 07.下载完毕删除此标签
+          a.remove();
+        }
+      };
+
+      xhr.send();
+    },
+    downLoadVideo(url, name) {
       var xhr = new XMLHttpRequest();
       xhr.open("GET", url, true);
       xhr.responseType = "arraybuffer"; // 返回类型blob

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

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-03 10:51:24
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-10-20 10:25:41
+ * @LastEditTime: 2022-11-22 14:16:37
  * @FilePath: /danger-manage-web/src/views/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -460,7 +460,7 @@ export default {
                 // 探测介质
                 tcjz: item.mapDeviceMedium,
                 sbzt: item.monitorDeviceStatus,
-                jcz: item.monitorValue + "" + item.mapDeviceUnit,
+                jcz:item.monitorValue?item.monitorValue + "" + item.mapDeviceUnit:'-',
                 shortNum: 12,
                 config: { scale: 1, textHeight: -94 },
               };

danger-manage-web/src/views/safetyManagement/investment/index.vue

@@ -254,7 +254,10 @@ export default {
           { required: true, message: "请选择投入年度", trigger: "blur" }
         ],
         investmentFunds: [
-          { required: true, message: "请输入投入资金", trigger: "blur" }
+          { required: true, message: "投入资金数字总共不超过11位，小数点不超过2位", validator: this.investmentFundsValidate }
+        ],
+        income: [
+          { required: true, message: "同期收入数字总共不超过11位，小数点不超过2位", validator: this.incomeValidate }
         ],
         investmentType: [
           { required: true, message: "请选择投入类型", trigger: "blur" }
@@ -278,6 +281,38 @@ export default {
     });
   },
   methods: {
+    investmentFundsValidate(rule, value, callback){
+      let reg = /^([1-9]\d*\.?\d{0,2}|0\.\d{1,2}|0)$/;
+      if(value != '' && value != null){
+        if(value.replace(".","").length > 11){
+          console.log(value,"value");
+          callback(new Error('数字不能超过11位'));
+        }
+        if(reg.test(value)){
+          callback();
+        }else{
+          callback(new Error('请输入正确投入资金(小数点不超过2位)'));
+        }
+      }else{
+        callback(new Error('请输入投入资金(小数点不超过2位)'));
+      }
+    },
+    incomeValidate(rule, value, callback){
+      let reg = /^([1-9]\d*\.?\d{0,2}|0\.\d{1,2}|0)$/;
+      if(value != '' && value != null){
+        if(value.replace(".","").length > 11){
+          console.log(value,"value");
+          callback(new Error('数字不能超过11位'));
+        }
+        if(reg.test(value)){
+          callback();
+        }else{
+          callback(new Error('请输入正确同期收入(小数点不超过2位)'));
+        }
+      }else{
+        callback();
+      }
+    },
     // 投入类型
     investmentFormat(row, column) {
       return this.selectDictLabel(this.investmentOptions, row.investmentType);