pssr设计变更

pssr修改子页面跳转

ui/src/views/pssr/moc/index.vue

@@ -43,7 +43,8 @@
           @click="handleAdd"
           v-hasPermi="['pssr:moc:add']"
           v-if="isApprove==0"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -54,7 +55,8 @@
           @click="handleUpdate"
           v-hasPermi="['pssr:moc:edit']"
           v-if="isApprove==0"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -65,7 +67,8 @@
           @click="handleDelete"
           v-hasPermi="['pssr:moc:remove']"
           v-if="isApprove==0"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -75,7 +78,8 @@
           @click="handleImport"
           v-hasPermi="['pssr:moc:edit']"
           v-if="isApprove==0"
-        >导入</el-button>
+        >导入
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -85,7 +89,8 @@
           @click="handleExport"
           v-hasPermi="['pssr:moc:export']"
           v-if="isApprove==0"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -148,15 +153,25 @@
       <el-table-column label="相关文档更新" align="center" prop="docUpdate" :show-overflow-tooltip="true"/>
       <el-table-column label="培训" align="center" prop="training" :show-overflow-tooltip="true"/>
       <el-table-column label="PSSR" align="center" prop="pssr" :show-overflow-tooltip="true"/>
-      <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="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
+                       width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirm1) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true"
+                       width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirm2) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="确认时间" align="center" prop="confirmationDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </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">
+      <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

ui/src/views/pssr/subitem/index.vue

@@ -28,7 +28,7 @@
     <div v-if="sn=='rsfh'">
       <protection :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
-    <div v-if="sn=='aqcs'">
+    <div v-if="sn=='aqss'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="安全阀" name="first">
           <safety-valve :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
@@ -68,13 +68,13 @@
     <div v-if="sn=='txjk'">
       <patrol :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
-    <div v-if="sn=='hjvocxt'">
+    <div v-if="sn=='hbss'">
       <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)" @refreshHisList="refreshHisList"/>
     </div>
-    <div v-if="sn=='xtdqzh'">
+    <div v-if="sn=='dqzh'">
       <nitrogen :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='sksgfmzt'">
@@ -108,10 +108,10 @@
     <div v-if="sn=='bjlszqr'">
       <alarm :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
-    <div v-if="sn=='qtjcq'">
+    <div v-if="sn=='qtjcy'">
       <gasdetector :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
-    <div v-if="sn=='zm'">
+    <div v-if="sn=='zmdbr'">
       <lighting :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='djsb'">