Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/neic

src/components/area/LabelArea.vue

@@ -1,37 +1,12 @@
 /* 标注区 */
 <template>
-  <gy-card
-    title="标注区"
-    area-style="label"
-    circle-style="yellow"
-    content-style="25"
-  >
-    <div
-      v-for="mk in values"
-      :key="mk"
-      @contextmenu="contextmenu(mk)"
-      style="width: 120px; margin-left: 10px; margin-top: 10px"
-    >
-      <img
-        src="../../assets/img/LabelArea/flag.png"
-        style="float: left; margin-top: 5px; margin-left: 15px"
-      />
-      <div style="text-align: center">{{ mk.title }}</div>
-      <input
-        v-model="mk.value"
-        style="
-          border: none;
-          background-color: #292929;
-          height: 30px;
-          border-radius: 6px;
-          text-align: center;
-          outline: none;
-          width: 120px;
-          color: rgb(220, 220, 220);
-        "
-      />
-    </div>
-  </gy-card>
+    <gy-card title="标注区" area-style="label" circle-style="yellow" content-style="25">
+        <div v-for="mk in values" :key="mk" @contextmenu="contextmenu(mk)" style="width:100px;margin-left:10px;margin-top:10px;display: inline-block;">
+            <img src="../../assets/img/LabelArea/flag.png" style="float:left;margin-top:5px;margin-left:12px;"/>
+            <div style="text-align:center;font-size:12px;float:right;margin-right:12px;">{{mk.title}}</div>
+            <input v-model="mk.value" style="font-size:12px;border:none;background-color:#292929;height:26px;border-radius:6px;text-align:center;outline:none;width:100px;color:rgb(220,220,220);"/>
+        </div>
+    </gy-card>
 </template>
 
 <script>

src/components/area/RecommendedArea.vue

@@ -6,12 +6,12 @@
     circle-style="green"
     content-style="37"
   >
-  <div>
+  <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
   <table v-for="vl in values" :key="vl">
       <tr>{{vl.stationName}}</tr>
       <tr>{{vl.content}}</tr>
       <tr>{{vl.createTime}}</tr>
-  </table>
+  </table>  
   </div>
   </gy-card>
 </template>
@@ -60,6 +60,7 @@ table{
   margin-top: 10px;
   padding-top: 10px;
   background-repeat:no-repeat;
+  
 }
 </style>
 

src/components/area/windturbine/control/ControlMatrixCard.vue

@@ -135,11 +135,11 @@ export default {
 }
 /*  最外层卡片 */
 .card {
-  width: 112px;
-  height: 50px;
+  width: 110px;
+  height: 49px;
   font-size: 12px;
-  margin-right: 3px;
-  margin-bottom: 3px;
+  margin-top: 5px;
+  margin-left: 4px;
   display: flex;
   flex-direction: row;
   cursor: pointer;