2022-3-26 吴卿华

gassafetyprogress-web/src/views/regulation/device/index.vue

@@ -89,15 +89,34 @@
               <img :src="List.row.iconUrl" width="100px">
         </template>
       </el-table-column>
-      <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="设备编号" align="center" prop="deviceCode" />
-      <el-table-column label="所在地址" align="center" prop="deviceAddr" />
-      <el-table-column label="设备型号" align="center" prop="deviceModel" />
-      <el-table-column label="设备类型" align="center" prop="deviceType" />
-      <el-table-column label="权属单位名称" align="center" prop="beyondEnterpriseName" />
+      <el-table-column label="设备名称" align="center" prop="deviceName">
+        <span slot-scope="scope" v-if="scope.row.deviceName">{{scope.row.deviceName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="设备编号" align="center" prop="deviceCode">
+        <span slot-scope="scope" v-if="scope.row.deviceCode">{{scope.row.deviceCode}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="所在地址" align="center" prop="deviceAddr">
+        <span slot-scope="scope" v-if="scope.row.deviceAddr">{{scope.row.deviceAddr}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="设备型号" align="center" prop="deviceModel" >
+        <span slot-scope="scope" v-if="scope.row.deviceModel">{{scope.row.deviceModel}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="设备类型" align="center" prop="deviceType" >
+        <span slot-scope="scope" v-if="scope.row.deviceType">{{scope.row.deviceType}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="权属单位名称" align="center" prop="beyondEnterpriseName" >
+        <span slot-scope="scope" v-if="scope.row.beyondEnterpriseName">{{scope.row.beyondEnterpriseName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
       <el-table-column label="安装时间" align="center" prop="installationTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.installationTime, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.installationTime">{{ parseTime(scope.row.installationTime, '{y}-{m}-{d}') }}</span>
+          <span v-else>-</span>
         </template>
       </el-table-column>
       <el-table-column label="照片" align="center"  >

gassafetyprogress-web/src/views/regulation/gasuser/index.vue

@@ -53,14 +53,38 @@
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!--<el-table-column label="用户账号" align="center" prop="username" />-->
-      <el-table-column label="用户名称" align="center" prop="nickName" />
-      <el-table-column label="用户类型" align="center" prop="userType" />
-      <el-table-column label="地址" align="center" prop="address" />
-      <el-table-column label="经度" align="center" prop="longitude" />
-      <el-table-column label="纬度" align="center" prop="latitude" />
-      <el-table-column label="联系人" align="center" prop="linkman" />
-      <el-table-column label="电话" align="center" prop="phone" />
-      <el-table-column label="邮箱" align="center" prop="email" />
+      <el-table-column label="用户名称" align="center" prop="nickName" >
+        <span slot-scope="scope" v-if="scope.row.nickName">{{scope.row.nickName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="用户类型" align="center" prop="userType" >
+        <span slot-scope="scope" v-if="scope.row.userType">{{scope.row.userType}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="地址" align="center" prop="address" >
+        <span slot-scope="scope" v-if="scope.row.address">{{scope.row.address}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="经度" align="center" prop="longitude" >
+        <span slot-scope="scope" v-if="scope.row.longitude">{{scope.row.longitude}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="纬度" align="center" prop="latitude" >
+        <span slot-scope="scope" v-if="scope.row.latitude">{{scope.row.latitude}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="联系人" align="center" prop="linkman" >
+        <span slot-scope="scope" v-if="scope.row.linkman">{{scope.row.linkman}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="电话" align="center" prop="phone" >
+        <span slot-scope="scope" v-if="scope.row.phone">{{scope.row.phone}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="邮箱" align="center" prop="email" >
+        <span slot-scope="scope" v-if="scope.row.email">{{scope.row.email}}</span>
+        <span v-else>-</span>
+      </el-table-column>
       <!--<el-table-column label="备注" align="center" prop="remarks" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

gassafetyprogress-web/src/views/regulation/info/index.vue

@@ -80,14 +80,38 @@
           <img  :src="List.row.doDusiness" width="100px">
         </template>
       </el-table-column>
-      <el-table-column label="企业名称" align="center" prop="enterpriseName" />
-      <el-table-column label="注册地址" align="center" prop="registerAddress" />
-      <el-table-column label="法定代表人" align="center" prop="legalRepresentative" />
-      <el-table-column label="经营区域" align="center" prop="businessArea" />
-      <el-table-column label="许可证编号" align="center" prop="licenseKey" />
-      <el-table-column label="许可证有效期" align="center" prop="licenseValidityTime" />
-      <el-table-column label="年度监督检查情况" align="center" prop="annualSupervisionInspection" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="企业名称" align="center" prop="enterpriseName" >
+        <span slot-scope="scope" v-if="scope.row.enterpriseName">{{scope.row.enterpriseName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="注册地址" align="center" prop="registerAddress" >
+        <span slot-scope="scope" v-if="scope.row.registerAddress">{{scope.row.registerAddress}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="法定代表人" align="center" prop="legalRepresentative" >
+        <span slot-scope="scope" v-if="scope.row.legalRepresentative">{{scope.row.legalRepresentative}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="经营区域" align="center" prop="businessArea">
+        <span slot-scope="scope" v-if="scope.row.businessArea">{{scope.row.businessArea}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="许可证编号" align="center" prop="licenseKey" >
+        <span slot-scope="scope" v-if="scope.row.licenseKey">{{scope.row.licenseKey}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="许可证有效期" align="center" prop="licenseValidityTime" >
+        <span slot-scope="scope" v-if="scope.row.licenseValidityTime">{{scope.row.licenseValidityTime}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="年度监督检查情况" align="center" prop="annualSupervisionInspection" >
+        <span slot-scope="scope" v-if="scope.row.annualSupervisionInspection">{{scope.row.annualSupervisionInspection}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" >
+        <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
+        <span v-else>-</span>
+      </el-table-column>
       <el-table-column label="营业执照" align="center"  >
         <template slot-scope="List">
           <span

gassafetyprogress-web/src/views/regulation/pipe/index.vue

@@ -92,16 +92,40 @@
 
     <el-table v-loading="loading" :data="pipeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管道长度(米)" align="center" prop="pipeLength" />
-      <el-table-column label="走向" align="center" prop="pipeTrend" />
-      <el-table-column label="管径(厘米)" align="center" prop="pipeDiameter" />
-      <el-table-column label="压力" align="center" prop="pipePressure" />
+      <el-table-column label="管道长度(米)" align="center" prop="pipeLength" >
+        <span slot-scope="scope" v-if="scope.row.pipeLength">{{scope.row.pipeLength}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="走向" align="center" prop="pipeTrend" >
+        <span slot-scope="scope" v-if="scope.row.pipeTrend">{{scope.row.pipeTrend}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="管径(厘米)" align="center" prop="pipeDiameter" >
+        <span slot-scope="scope" v-if="scope.row.pipeDiameter">{{scope.row.pipeDiameter}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="压力" align="center" prop="pipePressure" >
+        <span slot-scope="scope" v-if="scope.row.pipePressure">{{scope.row.pipePressure}}</span>
+        <span v-else>-</span>
+      </el-table-column>
 <!--      <el-table-column label="人员类型" align="center" prop="peopleOccupation" />-->
-      <el-table-column label="建设年代" align="center" prop="buildDate" />
-      <el-table-column label="建设单位" align="center" prop="buildUnit" />
-      <el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" />
+      <el-table-column label="建设年代" align="center" prop="buildDate" >
+        <span slot-scope="scope" v-if="scope.row.buildDate">{{scope.row.buildDate}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="建设单位" align="center" prop="buildUnit" >
+        <span slot-scope="scope" v-if="scope.row.buildUnit">{{scope.row.buildUnit}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" >
+        <span slot-scope="scope" v-if="scope.row.beyondEnterpriseName">{{scope.row.beyondEnterpriseName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
 <!--      <el-table-column label="坐标" align="center" prop="coordinates" />-->
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="备注" align="center" prop="remarks" >
+        <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
+        <span v-else>-</span>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

gassafetyprogress-web/src/views/regulation/station/index.vue

@@ -88,19 +88,43 @@
           <img  :src="List.row.pictureAddress" width="100px">
         </template>
       </el-table-column>
-      <el-table-column label="场站类型" align="center" prop="siteStationType" />
-      <el-table-column label="场站名称" align="center" prop="siteStationName" />
+      <el-table-column label="场站类型" align="center" prop="siteStationType" >
+        <span slot-scope="scope" v-if="scope.row.siteStationType">{{scope.row.siteStationType}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="场站名称" align="center" prop="siteStationName" >
+        <span slot-scope="scope" v-if="scope.row.siteStationName">{{scope.row.siteStationName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
       <el-table-column label="建设年代" align="center" prop="buildDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.buildDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="建设单位" align="center" prop="buildUnit" />
-      <el-table-column label="权属单位" align="center" prop="beyondEnterpriseId" />
-      <el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" />
-      <el-table-column label="经度" align="center" prop="longitude" />
-      <el-table-column label="纬度" align="center" prop="latitude" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="建设单位" align="center" prop="buildUnit" >
+        <span slot-scope="scope" v-if="scope.row.buildUnit">{{scope.row.buildUnit}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="权属单位" align="center" prop="beyondEnterpriseId" >
+        <span slot-scope="scope" v-if="scope.row.beyondEnterpriseId">{{scope.row.beyondEnterpriseId}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" >
+        <span slot-scope="scope" v-if="scope.row.beyondEnterpriseName">{{scope.row.beyondEnterpriseName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="经度" align="center" prop="longitude" >
+        <span slot-scope="scope" v-if="scope.row.longitude">{{scope.row.longitude}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="纬度" align="center" prop="latitude" >
+        <span slot-scope="scope" v-if="scope.row.latitude">{{scope.row.latitude}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" >
+        <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
+        <span v-else>-</span>
+      </el-table-column>
       <el-table-column label="照片" align="center"  >
         <template slot-scope="List">
           <span

gassafetyprogress-web/src/views/regulation/supervise/index.vue

@@ -88,15 +88,42 @@
           <img  :src="List.row.avatarAddress" width="100px">
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="employedPeopleName" />
-      <el-table-column label="身份证号" align="center" prop="idCard" />
-      <el-table-column label="技能岗位证书编号" align="center" prop="certificateNum" />
-      <el-table-column label="受聘企业名称" align="center" prop="beyondEnterpriseName" />
-      <el-table-column label="发证部门" align="center" prop="registerExaminationType" />
-      <el-table-column label="任职岗位" align="center" prop="peopleOccupation" />
-      <el-table-column label="发证日期" align="center" prop="issueDate" />
-      <el-table-column label="复检日期" align="center" prop="certificateChange" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="姓名" align="center" prop="employedPeopleName" >
+        <span slot-scope="scope" v-if="scope.row.employedPeopleName">{{scope.row.employedPeopleName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="身份证号" align="center" prop="idCard" >
+        <span slot-scope="scope" v-if="scope.row.idCard">{{scope.row.idCard}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="技能岗位证书编号" align="center" prop="certificateNum" >
+        <span slot-scope="scope" v-if="scope.row.certificateNum">{{scope.row.certificateNum}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="受聘企业名称" align="center" prop="beyondEnterpriseName" >
+        <span slot-scope="scope" v-if="scope.row.beyondEnterpriseName">{{scope.row.beyondEnterpriseName}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="发证部门" align="center" prop="registerExaminationType" >
+        <span slot-scope="scope" v-if="scope.row.registerExaminationType">{{scope.row.registerExaminationType}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="任职岗位" align="center" prop="peopleOccupation" >
+        <span slot-scope="scope" v-if="scope.row.peopleOccupation">{{scope.row.peopleOccupation}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="发证日期" align="center" prop="issueDate" >
+        <span slot-scope="scope" v-if="scope.row.issueDate">{{scope.row.issueDate}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="复检日期" align="center" prop="certificateChange" >
+        <span slot-scope="scope" v-if="scope.row.certificateChange">{{scope.row.certificateChange}}</span>
+        <span v-else>-</span>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" >
+        <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
+        <span v-else>-</span>
+      </el-table-column>
       <el-table-column label="照片" align="center"  >
       <template slot-scope="List">
           <span