Merge branch 'master' into gtz

src/views/energy/electric-acquisition.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: zwq
- * @LastEditTime: 2021-12-17 15:27:13
+ * @LastEditTime: 2021-12-17 16:10:47
  * @Description:
 -->
 <template>
@@ -19,7 +19,7 @@
       </el-col>
       <el-col :span="22">
         <el-card class="base-container" style="min-height: 540px">
-          <el-row style="z-index: 10;">
+          <el-row style="z-index: 10;float:right;margin-right:20px">
             <el-radio-group
               style="margin: 0 20px; position:relative; bottom: 2px"
               size="small"

src/views/energy/gas-acquisition.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: zwq
- * @LastEditTime: 2021-12-17 15:24:18
+ * @LastEditTime: 2021-12-17 16:01:13
  * @Description:
 -->
 <template>
@@ -19,7 +19,7 @@
       </el-col>
       <el-col :span="22">
         <el-card class="base-container" style="min-height: 540px">
-          <el-row style="z-index: 10;">
+          <el-row style="z-index: 10;float:right;margin-right:20px">
             <el-radio-group
               style="margin: 0 20px; position:relative; bottom: 2px"
               size="small"

src/views/energy/temperature-acquisition.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: zwq
- * @LastEditTime: 2021-12-17 15:25:52
+ * @LastEditTime: 2021-12-17 16:11:06
  * @Description:
 -->
 <template>
@@ -19,7 +19,7 @@
       </el-col>
       <el-col :span="22">
         <el-card class="base-container" style="min-height: 540px">
-          <el-row style="z-index: 10;">
+          <el-row style="z-index: 10;float:right;margin-right:20px">
             <el-radio-group
               style="margin: 0 20px; position:relative; bottom: 2px"
               size="small"