Merge remote-tracking branch 'origin/master'

gassafety-web/package-lock.json

@@ -12541,6 +12541,11 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
+    "velocity-animate": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/velocity-animate/-/velocity-animate-1.5.2.tgz",
+      "integrity": "sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg=="
+    },
     "vendors": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",

gassafety-web/src/views/enterprise/mapView/components/RightPic.vue

@@ -29,7 +29,7 @@
           class="el-bottom"
           ref="table"
         >
-          <el-table-column prop="unitName" label="所在单位" width="">
+          <el-table-column prop="unitName" label="所在单位" width="100">
             <template slot-scope="scope">
               <div class="ddd" :title="scope.row.unitName">
                 {{ scope.row.unitName }}
@@ -50,7 +50,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="alarmTime" label="预警时间" width="180">
+          <el-table-column prop="alarmTime" label="预警时间" width="160">
           </el-table-column>
           <el-table-column prop="handledStatus" label="状态" width="">
             <template slot-scope="scope">