Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-web/src/views/index.vue

@@ -52,7 +52,7 @@
       <div class="div-col1">
         <el-card>
           <div style="width: 50%;height: 100%; text-align: center;float: left;font-size: 15px;">
-            <img src="../assets/equipment.png" width="15%" style="margin-top: 2.5rem;">
+            <img src="../assets/equipment.png" width="14%" style="margin-top: 2.5rem;">
             <p>安全装置</p>
           </div>
           <div style="width: 50%;height: 100%;text-align: center;line-height: 8rem;float: right;font-size: 2.5rem;font-family: 'UnidreamLED';">{{totalObj.equipmentTotal}}</div>

gassafetyprogress-web/src/views/statistic/hiddenStatisticAnalysis/index.vue

@@ -102,54 +102,59 @@
               <el-row>
                 <el-col :span="10">
                   <el-form-item label="隐患名称:">
-                    <font>{{detailForm.hiddenTitle}}</font>
+                    <el-input v-model="detailForm.hiddenTitle" disabled/>
                   </el-form-item>
                   <el-form-item label="隐患发现人员:">
-                    <font>{{detailForm.hiddenFindPeople}}</font>
+                    <el-input v-model="detailForm.hiddenFindPeople" disabled/>
                   </el-form-item>
                   <el-form-item label="发现时间:">
-                    <font>{{detailForm.hiddenFindDate}}</font>
+                    <el-input v-model="detailForm.hiddenFindDate" disabled/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="13">
                   <el-form-item label="隐患等级:">
-                    <font v-if="detailForm.hiddenType == '1'">一级隐患</font>
-                    <font v-if="detailForm.hiddenType == '2'">二级隐患</font>
-                    <font v-if="detailForm.hiddenType == '3'">三级隐患</font>
+                    <el-input v-if="detailForm.hiddenType == '1'" value="一级隐患" disabled/>
+                    <el-input v-if="detailForm.hiddenType == '2'" value="二级隐患" disabled/>
+                    <el-input v-if="detailForm.hiddenType == '3'" value="三级隐患" disabled/>
                   </el-form-item>
                   <el-form-item label="隐患位置:">
-                    <font>{{detailForm.hiddenLocation}}</font>
+                    <el-input v-model="detailForm.hiddenLocation" disabled/>
                   </el-form-item>
+                  <el-form-item label="整治情况:">
+                    <el-input v-if="detailForm.remediation == '1'" value="已完成" disabled/>
+                    <el-input v-if="detailForm.remediation == '2'" value="未完成" disabled/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="23">
                   <el-form-item label="处理方案:">
                     <span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlan != ''">
                       <i class="el-icon el-icon-view"></i>查看/下载
                     </span>
-                    <span v-else>-</span>
+                    <span v-else><el-input disabled/></span>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
+                <el-col :span="23">
                   <el-form-item label="隐患内容:">
-                  <font>{{detailForm.hiddenContent}}</font>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="整治情况:">
-                  <font v-if="detailForm.remediation == '1'">已完成</font>
-                  <font v-if="detailForm.remediation == '2'">未完成</font>
+                    <el-input type="textarea" v-model="detailForm.hiddenContent" disabled/>
                   </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
+                <el-col :span="23">
                   <el-form-item label="备注信息:">
-                  <font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
-                  <font v-else> - </font>
+                    <el-input type="textarea" v-model="detailForm.remarks" disabled/>
                   </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </el-col>
 
           <el-col :span="9">
-            <div style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
+            <div style="width: 100%;height: 390px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
               <div style="width: 100%;height: 100%" id="hiddenContainer"></div>
             </div>
           </el-col>

gassafetyprogress-web/src/views/statistic/troubleStatisticAnalysis/index.vue

@@ -73,75 +73,76 @@
           <el-col :span="14">
             <el-form ref="detailForm" :model="detailForm" label-width="120px">
               <el-row>
-                <el-col :span="10">
+                <el-col :span="11">
                   <el-form-item label="事故名称:">
-                    <font>{{detailForm.troubleName}}</font>
+                    <el-input v-model="detailForm.troubleName" disabled/>
                   </el-form-item>
                   <el-form-item label="事故原因:">
-                    <font>{{detailForm.troubleReason}}</font>
+                    <el-input v-model="detailForm.troubleReason" disabled/>
                   </el-form-item>
                   <el-form-item label="责任单位:">
-                    <font v-if="detailForm.responsibleUnit != '' && detailForm.responsibleUnit != null">{{detailForm.responsibleUnit}}</font>
-                    <font v-else> - </font>
+                    <el-input v-model="detailForm.responsibleUnit" disabled/>
                   </el-form-item>
                   <el-form-item label="是否人员伤亡:">
-                    <font v-if="detailForm.isCasualties == '1'">是</font>
-                    <font v-if="detailForm.isCasualties == '2'">否</font>
+                    <el-input v-if="detailForm.isCasualties == '1'" value="是" disabled/>
+                    <el-input v-if="detailForm.isCasualties == '2'" value="是" disabled/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="13">
+                <el-col :span="12">
                   <el-form-item label="事故类型:">
-                    <font v-if="detailForm.troubleType == '1'">安全生产事故</font>
-                    <font v-if="detailForm.troubleType == '2'">非生产安全事故</font>
+                    <el-input v-if="detailForm.troubleType == '1'" value="安全生产事故" disabled/>
+                    <el-input v-if="detailForm.troubleType == '2'" value="非生产安全事故" disabled/>
                   </el-form-item>
                   <el-form-item label="事故地点:">
-                    <font>{{detailForm.troubleLocation}}</font>
+                    <el-input v-model="detailForm.troubleLocation" disabled/>
                   </el-form-item>
                   <el-form-item label="责任人员:">
-                    <font v-if="detailForm.responsiblePeople != '' && detailForm.responsiblePeople != null">{{detailForm.responsiblePeople}}</font>
-                    <font v-else> - </font>
+                    <el-input v-model="detailForm.responsiblePeople" disabled/>
                   </el-form-item>
                   <el-form-item label="是否处理:">
-                    <font v-if="detailForm.isDeal == '1'">已处理</font>
-                    <font v-if="detailForm.isDeal == '2'">未处理</font>
+                    <el-input v-if="detailForm.isDeal == '1'" value="已处理" disabled/>
+                    <el-input v-if="detailForm.isDeal == '2'" value="未处理" disabled/>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row v-if="detailForm.isCasualties == '1'">
                 <el-col :span="11">
                   <el-form-item label="受伤人数:">
-                    <font>{{detailForm.injuryNum}}</font>
+                    <el-input v-model="detailForm.injuryNum" disabled/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="死亡人数:">
-                    <font>{{detailForm.deathNum}}</font>
+                    <el-input v-model="detailForm.deathNum" disabled/>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
+                <el-col :span="23">
                   <el-form-item label="处理完成时间:">
-                  <font v-if="detailForm.dealDate != '' && detailForm.dealDate != null">{{detailForm.dealDate}}</font>
-                  <font v-else> - </font>
+                    <el-input v-model="detailForm.dealDate" disabled/>
                   </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
+                <el-col :span="23">
                   <el-form-item label="简要经过:">
-                  <font v-if="detailForm.briefProcess != '' && detailForm.briefProcess != null">{{detailForm.briefProcess}}</font>
-                  <font v-else> - </font>
+                    <el-input type="textarea" v-model="detailForm.briefProcess" disabled/>
                   </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
+                <el-col :span="23">
                   <el-form-item label="备注信息:">
-                  <font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
-                  <font v-else> - </font>
+                    <el-input type="textarea" v-model="detailForm.remarks" disabled/>
                   </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </el-col>
 
           <el-col :span="9">
-            <div style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
+            <div style="width: 100%;height: 390px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
               <div style="width: 100%;height: 100%" id="troubleContainer"></div>
             </div>
           </el-col>