Merge remote-tracking branch 'origin/master'

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

@@ -51,13 +51,27 @@
 
     <el-table v-loading="loading" :data="contractorInfoList">
       <el-table-column label="单位名称" align="center" prop="contractorName" />
-      <el-table-column label="主要负责人" align="center" prop="keyPerson" />
-      <el-table-column label="主要负责人手机" align="center" prop="keyPersonPhone" />
+      <el-table-column label="主要负责人" align="center" prop="keyPerson" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.keyPerson != null && scope.row.keyPerson != ''">{{scope.row.keyPerson}}</span>
+          <span v-else>
+            -
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="主要负责人手机" align="center" prop="keyPersonPhone" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.keyPersonPhone != null && scope.row.keyPersonPhone != ''">{{scope.row.keyPersonPhone}}</span>
+          <span v-else>
+            -
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位资质" align="center" prop="certificateUrl" style="text-align:center;">
         <template slot-scope="scope">
           <span v-if="scope.row.certificateUrl != null && scope.row.certificateUrl != ''">
-          <img :src="scope.row.certificateUrl" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(scope.row)"/>
-          <el-image :ref="'a'+scope.row.id" :src="scope.row.certificateUrl" v-show="false" :preview-src-list="[scope.row.certificateUrl]" v-if="scope.row.certificateUrl != '' && scope.row.certificateUrl != null"></el-image>
+            <img :src="scope.row.certificateUrl" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(scope.row)"/>
+            <el-image :ref="'a'+scope.row.id" :src="scope.row.certificateUrl" v-show="false" :preview-src-list="[scope.row.certificateUrl]" v-if="scope.row.certificateUrl != '' && scope.row.certificateUrl != null"></el-image>
           </span>
           <span v-else>
             -

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

@@ -67,8 +67,13 @@
       <el-table-column label="设备编号" align="center" prop="deviceCode" />
       <el-table-column label="现场照片" align="center" prop="fileUrl" >
         <template slot-scope="scope">
-          <img :src="scope.row.fileUrl" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(scope.row)"/>
-          <el-image :ref="'a'+scope.row.id" :src="scope.row.fileUrl" v-show="false" :preview-src-list="[scope.row.fileUrl]" v-if="scope.row.fileUrl != '' && scope.row.fileUrl != null"></el-image>
+          <span v-if="scope.row.fileUrl != null && scope.row.fileUrl != ''">
+            <img :src="scope.row.fileUrl" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(scope.row)"/>
+            <el-image :ref="'a'+scope.row.id" :src="scope.row.fileUrl" v-show="false" :preview-src-list="[scope.row.fileUrl]" v-if="scope.row.fileUrl != '' && scope.row.fileUrl != null"></el-image>
+          </span>
+          <span v-else>
+            -
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="故障描述" align="center" prop="troubleDescribe" />

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

@@ -107,7 +107,7 @@
 
     <!-- 添加或修改投入台账对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="23">
             <el-form-item label="投入台账名称" prop="investmentName">