jiangbiao 10 månader sedan
förälder
incheckning
a72098a7d0

+ 13 - 15
master/src/main/java/com/ruoyi/project/patrol/patrol/controller/TPatrolPlanController.java

@@ -20,7 +20,6 @@ import com.ruoyi.project.patrol.patrol.service.ITPatrolIssuesService;
 import com.ruoyi.project.patrol.patrol.service.ITPatrolMainService;
 import com.ruoyi.project.patrol.patrol.service.ITPatrolPlanService;
 import com.ruoyi.project.pssr.controller.TPssrApproveController;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPatrol;
 import com.ruoyi.project.pssr.service.ITPssrPatrolService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
@@ -236,28 +235,27 @@ public class TPatrolPlanController extends BaseController {
                 // 确认计划如果有关联的pssr巡检,修改pssr巡检状态
                 TPssrPatrol tPssrPatrol = new TPssrPatrol();
                 tPssrPatrol.setPlanId(tPatrolPlan.getId());
-                Long subId = null;
                 for (TPssrPatrol pssrPatrol : tPssrPatrolService.selectTPssrPatrolList(tPssrPatrol)) {
-                    subId = pssrPatrol.getSubId();
                     pssrPatrol.setPlanStatus(2L);
                     pssrPatrol.setConfirmDate(new Date());
                     pssrPatrol.setConfirmer(getUserId().toString());
                     pssrPatrol.setUpdatedate(new Date());
                     pssrPatrol.setUpdaterCode(getUserId().toString());
                     tPssrPatrolService.updateTPssrPatrol(pssrPatrol);
-                }
-                tPssrPatrol = new TPssrPatrol();
-                tPssrPatrol.setSubId(subId);
-                boolean flag = true;
-                //当所有的pssr巡检都确认过后,发起申请
-                for (TPssrPatrol pssrPatrol : tPssrPatrolService.selectTPssrPatrolList(tPssrPatrol)) {
-                    if (pssrPatrol.getPlanStatus() != 2L) {
-                        flag = false;
-                        break;
+
+                    TPssrPatrol patrol = new TPssrPatrol();
+                    patrol.setSubId(pssrPatrol.getSubId());
+                    boolean flag = true;
+                    //当所有的pssr巡检都确认过后,发起申请
+                    for (TPssrPatrol tpssrPatrol : tPssrPatrolService.selectTPssrPatrolList(patrol)) {
+                        if (tpssrPatrol.getPlanStatus() != 2L) {
+                            flag = false;
+                            break;
+                        }
+                    }
+                    if (flag) {
+                        tPssrApproveController.doApprove(pssrPatrol.getSubId());
                     }
-                }
-                if (flag){
-                    tPssrApproveController.doApprove(subId);
                 }
             } catch (Exception e) {
                 logger.error(e.getMessage(), e);

+ 71 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAboveallController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.project.pssr.controller;
 
-import com.deepoove.poi.data.*;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -9,13 +8,16 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrAboveall;
+import com.ruoyi.project.pssr.domain.TPssrPatrol;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrAboveallService;
+import com.ruoyi.project.pssr.service.ITPssrPatrolService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -34,6 +36,9 @@ public class TPssrAboveallController extends BaseController {
     @Autowired
     private ITPssrSubcontentService tPssrSubcontentService;
 
+    @Autowired
+    private ITPssrPatrolService tPssrPatrolService;
+
     /**
      * 查询PSSR列表
      */
@@ -90,11 +95,76 @@ public class TPssrAboveallController extends BaseController {
                 subcontent.setCreatedate(new Date());
                 subcontent.setCreaterCode(getUserId().toString());
                 tPssrSubcontentService.insertTPssrSubcontent(subcontent);
+
+                String userId = getUserId().toString();
+                if (subcontent.getForShort().equals("xqf")) {
+                    new Thread(() -> {
+                        List<TPssrPatrol> tPssrPatrols = new ArrayList<>();
+//                        手提式/小推车式灭火器/灭火器材箱检查记录,1
+                        tPssrPatrols.add(getEntity(1L, subcontent.getId()));
+//                        消防水炮检查记录,2
+                        tPssrPatrols.add(getEntity(2L, subcontent.getId()));
+//                        地上消火栓检查记录,3
+                        tPssrPatrols.add(getEntity(3L, subcontent.getId()));
+//                        消防水带箱检查记录,4
+                        tPssrPatrols.add(getEntity(4L, subcontent.getId()));
+//                        消防竖管检查记录,5
+                        tPssrPatrols.add(getEntity(5L, subcontent.getId()));
+//                        自动喷淋灭火系统检查记录,6
+                        tPssrPatrols.add(getEntity(6L, subcontent.getId()));
+//                        应急事故柜检查记录,7
+                        tPssrPatrols.add(getEntity(7L, subcontent.getId()));
+//                        现场可燃气体检测器/火灾报警系统检查记录,8
+                        tPssrPatrols.add(getEntity(8L, subcontent.getId()));
+//                        CO2气体保护系统检查记录,9
+                        tPssrPatrols.add(getEntity(9L, subcontent.getId()));
+//                        淋浴洗眼器检查记录,12
+                        tPssrPatrols.add(getEntity(12L, subcontent.getId()));
+//                        应急沙箱检查记录,13
+                        tPssrPatrols.add(getEntity(13L, subcontent.getId()));
+//                        常闭式防爆门/防火门检查记录,14
+                        tPssrPatrols.add(getEntity(14L, subcontent.getId()));
+//                        风向标/风向袋/新风系统正压计检查记录,15
+                        tPssrPatrols.add(getEntity(15L, subcontent.getId()));
+//                        蒸汽幕检查记录,16
+                        tPssrPatrols.add(getEntity(16L, subcontent.getId()));
+                        for (TPssrPatrol pssrPatrol : tPssrPatrols) {
+                            tPssrPatrolService.insertTPssrPatrol(pssrPatrol, userId);
+                        }
+                    }, "新增消气防数据").start();
+                } else if (subcontent.getForShort().equals("txjk")) {
+                    new Thread(() -> {
+                        List<TPssrPatrol> tPssrPatrols = new ArrayList<>();
+//                        PAGA系统检查记录,10
+                        tPssrPatrols.add(getEntity(10L, subcontent.getId()));
+//                        CCTV系统检查记录,11
+                        tPssrPatrols.add(getEntity(11L, subcontent.getId()));
+                        for (TPssrPatrol pssrPatrol : tPssrPatrols) {
+                            tPssrPatrolService.insertTPssrPatrol(pssrPatrol, userId);
+                        }
+                    }, "新增通讯监控数据").start();
+                } else if (subcontent.getForShort().equals("bxsjcy")) {
+                    new Thread(() -> {
+                        List<TPssrPatrol> tPssrPatrols = new ArrayList<>();
+//                        四合一/苯系物/硫化氢/二氧化碳/射线一氧化碳检测仪检查记录,18
+                        tPssrPatrols.add(getEntity(18L, subcontent.getId()));
+                        for (TPssrPatrol pssrPatrol : tPssrPatrols) {
+                            tPssrPatrolService.insertTPssrPatrol(pssrPatrol, userId);
+                        }
+                    }, "新增便携式检测仪数据").start();
+                }
             }
         }
         return AjaxResult.success();
     }
 
+    private TPssrPatrol getEntity(Long planType, Long subId) {
+        TPssrPatrol tPssrPatrol = new TPssrPatrol();
+        tPssrPatrol.setPlanType(planType);
+        tPssrPatrol.setSubId(subId);
+        return tPssrPatrol;
+    }
+
     /**
      * 修改PSSR
      */

+ 2 - 22
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPatrolController.java

@@ -12,6 +12,7 @@ import com.ruoyi.project.patrol.patrol.service.ITPatrolMainService;
 import com.ruoyi.project.patrol.patrol.service.ITPatrolPlanService;
 import com.ruoyi.project.pssr.domain.TPssrPatrol;
 import com.ruoyi.project.pssr.service.ITPssrPatrolService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -75,28 +76,7 @@ public class TPssrPatrolController extends BaseController {
     @Log(title = "巡检", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPatrol tPssrPatrol) {
-        TPatrolPlan tPatrolPlan = new TPatrolPlan();
-        tPatrolPlan.setPatrolType(tPssrPatrol.getPlanType().toString());
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        tPatrolPlan.setPlanYear((long) calendar.get(Calendar.YEAR));
-        tPatrolPlan.setPlanQuarter((long) calendar.get(Calendar.MONTH)+1);
-        tPatrolPlan.setPlanName(getPlanName(tPssrPatrol.getPlanType().toString(),calendar));
-        TPatrolPlan plan = tPatrolPlanService.add(tPatrolPlan, getUserId().toString());
-        tPssrPatrol.setPlanId(plan.getId());
-        tPssrPatrol.setApproveStatus(0L);
-        tPssrPatrol.setPlanStatus(1L);
-        return toAjax(tPssrPatrolService.insertTPssrPatrol(tPssrPatrol));
-    }
-
-    // 根据当年的巡检类型查询设备名称
-    private String getPlanName(String planType,Calendar calendar) {
-        TPatrolMain tPatrolMain = new TPatrolMain();
-        tPatrolMain.setPatrolType(planType);
-        tPatrolMain.setYear(String.valueOf(calendar.get(Calendar.YEAR)));
-        TPatrolMain main = tPatrolMainService.selectTPatrolMainList(tPatrolMain).get(0);
-        String planName = calendar.get(Calendar.YEAR) +"年-"+(calendar.get(Calendar.MONTH)+1) +"月-PSSR临时计划-"+main.getDevName();
-        return planName;
+        return toAjax(tPssrPatrolService.insertTPssrPatrol(tPssrPatrol,getUserId().toString()));
     }
 
     /**

+ 1 - 1
master/src/main/java/com/ruoyi/project/pssr/service/ITPssrPatrolService.java

@@ -33,7 +33,7 @@ public interface ITPssrPatrolService
      * @param tPssrPatrol 巡检
      * @return 结果
      */
-    public int insertTPssrPatrol(TPssrPatrol tPssrPatrol);
+    public int insertTPssrPatrol(TPssrPatrol tPssrPatrol,String userId);
 
     /**
      * 修改巡检

+ 46 - 1
master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrPatrolServiceImpl.java

@@ -1,6 +1,16 @@
 package com.ruoyi.project.pssr.service.impl;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.project.patrol.patrol.domain.TPatrolMain;
+import com.ruoyi.project.patrol.patrol.domain.TPatrolPlan;
+import com.ruoyi.project.patrol.patrol.mapper.TPatrolPlanMapper;
+import com.ruoyi.project.patrol.patrol.service.ITPatrolMainService;
+import com.ruoyi.project.patrol.patrol.service.ITPatrolPlanService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.pssr.mapper.TPssrPatrolMapper;
@@ -18,6 +28,10 @@ public class TPssrPatrolServiceImpl implements ITPssrPatrolService
 {
     @Autowired
     private TPssrPatrolMapper tPssrPatrolMapper;
+    @Autowired
+    private ITPatrolPlanService tPatrolPlanService;
+    @Autowired
+    private ITPatrolMainService tPatrolMainService;
 
     /**
      * 查询巡检
@@ -50,11 +64,42 @@ public class TPssrPatrolServiceImpl implements ITPssrPatrolService
      * @return 结果
      */
     @Override
-    public int insertTPssrPatrol(TPssrPatrol tPssrPatrol)
+    public int insertTPssrPatrol(TPssrPatrol tPssrPatrol,String userId)
     {
+        //根据设备类型查询当月的巡检计划
+        TPatrolPlan tPatrolPlan = new TPatrolPlan();
+        tPatrolPlan.setPatrolType(tPssrPatrol.getPlanType().toString());
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        tPatrolPlan.setPlanYear((long) calendar.get(Calendar.YEAR));
+        tPatrolPlan.setPlanQuarter((long) calendar.get(Calendar.MONTH) + 1);
+        List<TPatrolPlan> tPatrolPlans = tPatrolPlanService.selectTPatrolPlanList(tPatrolPlan);
+        Long planId = null;
+        //存在对应计划时,取已存在的计划
+        if (CollectionUtils.isNotEmpty(tPatrolPlans)) {
+            planId = tPatrolPlans.get(0).getId();
+        } else {
+            //否则生成新的临时计划
+            tPatrolPlan.setPlanName(getPlanName(tPssrPatrol.getPlanType().toString(), calendar));
+            TPatrolPlan plan = tPatrolPlanService.add(tPatrolPlan, userId);
+            planId = plan.getId();
+        }
+        tPssrPatrol.setPlanId(planId);
+        tPssrPatrol.setApproveStatus(0L);
+        tPssrPatrol.setPlanStatus(1L);
         return tPssrPatrolMapper.insertTPssrPatrol(tPssrPatrol);
     }
 
+    // 根据巡检类型生成计划名称
+    private String getPlanName(String planType, Calendar calendar) {
+        TPatrolMain tPatrolMain = new TPatrolMain();
+        tPatrolMain.setPatrolType(planType);
+        tPatrolMain.setYear(String.valueOf(calendar.get(Calendar.YEAR)));
+        TPatrolMain main = tPatrolMainService.selectTPatrolMainList(tPatrolMain).get(0);
+        String planName = calendar.get(Calendar.YEAR) + "年-" + (calendar.get(Calendar.MONTH) + 1) + "月-PSSR临时计划-" + main.getDevName();
+        return planName;
+    }
+
     /**
      * 修改巡检
      *

+ 2 - 18
ui/src/views/pssr/hygiene/index.vue

@@ -230,24 +230,8 @@
       </el-table-column>
       <el-table-column label="检查内容" align="center" prop="checkContent" :show-overflow-tooltip="true"/>
       <el-table-column label="检查结果" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
-      <el-form-item label="确认人1" prop="confirm1">
-        <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
-                   placeholder="请选择确认人1">
-          <el-option v-for="user in userOptions"
-                     :label="user.nickName"
-                     :value="user.userId+''"
-                     :key="user.userId"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="确认人2" prop="confirm2">
-        <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
-                   placeholder="请选择确认人2">
-          <el-option v-for="user in userOptions"
-                     :label="user.nickName"
-                     :value="user.userId+''"
-                     :key="user.userId"/>
-        </el-select>
-      </el-form-item>
+      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true"/>
       <el-table-column label="确认时间" align="center" prop="confirmationDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>

+ 1 - 18
ui/src/views/pssr/patrol/index.vue

@@ -7,6 +7,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:patrol:export']"
         >导出
         </el-button>
@@ -31,24 +32,6 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <!--      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <el-button-->
-      <!--            size="mini"-->
-      <!--            type="text"-->
-      <!--            icon="el-icon-edit"-->
-      <!--            @click="handleUpdate(scope.row)"-->
-      <!--            v-hasPermi="['pssr:patrol:edit']"-->
-      <!--          >修改</el-button>-->
-      <!--          <el-button-->
-      <!--            size="mini"-->
-      <!--            type="text"-->
-      <!--            icon="el-icon-delete"-->
-      <!--            @click="handleDelete(scope.row)"-->
-      <!--            v-hasPermi="['pssr:patrol:remove']"-->
-      <!--          >删除</el-button>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
     </el-table>
 
     <pagination

+ 23 - 23
ui/src/views/pssr/subitem/index.vue

@@ -17,16 +17,16 @@
       </el-tabs>
     </div>
     <div v-if="sn=='kgfa'">
-      <programme :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <programme :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='mb'">
       <blind :sub-id="Number(si)" :is-approve="Number(isApprove)"  @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='qm'">
-      <airtight :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <airtight :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='rsfh'">
-      <protection :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <protection :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='aqcs'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -48,34 +48,34 @@
       </el-tabs>
     </div>
     <div v-if="sn=='gygc'">
-      <public :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <public :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='yl'">
-      <material :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <material :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='xcws'">
-      <hygiene :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <hygiene :sub-id="Number(si)" :is-approve="Number(isApprove)"  @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='sbqj'">
-      <cleaning :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <cleaning :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='dj'">
-      <circuit :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <circuit :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='xqf'">
-      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='txjk'">
-      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='hjvocxt'">
-      <torchvoc :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <torchvoc :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='bxsjcy'">
-      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='xtdqzh'">
-      <nitrogen :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <nitrogen :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='sksgfmzt'">
       <lock :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
@@ -94,34 +94,34 @@
       </el-tabs>
     </div>
     <div v-if="sn=='zdj'">
-      <frame :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <frame :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='tzsb'">
-      <pipe :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <pipe :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='ybjy'">
-      <instrument-calibration :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <instrument-calibration :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='yblscs'">
-      <instrument-test :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <instrument-test :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='bjlszqr'">
-      <alarm :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <alarm :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='qtjcq'">
-      <gasdetector :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <gasdetector :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='zm'">
-      <lighting :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <lighting :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='djsb'">
-      <motor :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <motor :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='jdjdkj'">
-      <franklinism :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <franklinism :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='zxfxy'">
-      <analyzer :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <analyzer :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
   </div>
 </template>