Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

# Conflicts:
#	gassafety-web/src/views/riskManagement/hiddenTrouble/index.vue

gassafety-web/src/components/PopWindow/flowMeter.vue

@@ -7,7 +7,7 @@
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="11">
+          <el-col :span="22">
             <el-form-item label="所属管道" prop="pipeId">
               <el-select
                 v-model="form.pipeId"

gassafety-web/src/components/PopWindow/pressureGage.vue

@@ -7,7 +7,7 @@
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="11">
+          <el-col :span="22">
             <el-form-item label="所属管道" prop="pipeId">
               <el-select
                 v-model="form.pipeId"

gassafety-web/src/components/PopWindow/regulatorBox.vue

@@ -7,7 +7,7 @@
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="11">
+          <el-col :span="22">
             <el-form-item label="所属管道" prop="pipeId">
               <el-select
                 v-model="form.pipeId"

gassafety-web/src/components/PopWindow/valveWell.vue

@@ -7,7 +7,7 @@
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
-          <el-col :span="11">
+          <el-col :span="22">
             <el-form-item label="所属管道" prop="pipeId">
               <el-select
                 v-model="form.pipeId"

gassafety-web/src/views/riskManagement/hiddenTrouble/index.vue

@@ -84,7 +84,7 @@
       </el-table-column>
       <el-table-column label="图片" align="center" prop="pictureUrl" style="text-align:center;">
         <template slot-scope="scope">
-          <img :src="scope.row.pictureUrl" style="width: 20%;vertical-align:middle;" @click="showPicture(scope.row)"/>
+          <img :src="scope.row.pictureUrl" style="width: 20%;vertical-align:middle;cursor:pointer;" @click="showPicture(scope.row)"/>
           <el-image :ref="'a'+scope.row.troubleId" :src="scope.row.pictureUrl" v-show="false" :preview-src-list="[scope.row.pictureUrl]" v-if="scope.row.pictureUrl != '' && scope.row.pictureUrl != null"></el-image>
         </template>
       </el-table-column>