Merge remote-tracking branch 'origin/新动火作业1128' into 重点工程定位需求

# Conflicts:
#	src/views/map/dialog/index.vue

src/views/dangerousWork/hotwork/components/corpInfo.vue

@@ -77,7 +77,7 @@ export default {
       edit: false,
       listQuery: {
         page: 1,
-        limit: 10
+        limit: 20
       },
       total: 0,
       KEYWORDS: '',
@@ -108,6 +108,7 @@ export default {
         requestFN(
           '/dangerousWork/hotwork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
           {
+            COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
             KEYWORDS: this.KEYWORDS
           }
         ).then((data) => {

src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue

@@ -84,6 +84,7 @@
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
+    <div style="height: 50px"></div>
   </div>
 </template>
 <script>
@@ -101,7 +102,7 @@ export default {
       edit: false,
       listQuery: {
         page: 1,
-        limit: 10
+        limit: 20
       },
       total: 0,
       KEYWORDS: '',

src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue

@@ -119,7 +119,7 @@ export default {
       edit: false,
       listQuery: {
         page: 1,
-        limit: 10
+        limit: 20
       },
       total: 0,
       KEYWORDS: '',

src/views/map/dialog/hotworkFirst.vue

@@ -67,8 +67,8 @@
             <tr>
               <td>序号</td>
               <td>安全措施</td>
-              <td>是否涉及</td>
-              <td>确认人</td>
+              <td style="width: 80px; text-align: center">是否涉及</td>
+              <td style="width: 80px; text-align: center">确认人</td>
             </tr>
             <tr v-for="(item,index) in measuresList" :key="index">
               <td>{{ index + 1 }}</td>