Merge remote-tracking branch 'origin/master'

src/views/ledger/anemometer.vue

@@ -196,8 +196,8 @@
     <el-dialog title="详情" :visible.sync="unusualdialog" width="400px">
       <p>测风塔名称：{{ hightower.anemometerName }}</p>
       <p>测风塔编号：{{ hightower.anemometerCode }}</p>
-      <p>经度：{{ hightower.longitude }}</p>
-      <p>维度：{{ hightower.latitude }}</p>
+      <p>经度：{{ hightower.longitude }}°</p>
+      <p>维度：{{ hightower.latitude }}°</p>
       <p>状态: {{ hightower.state === 1 ? "启用" : "停用" }}</p>
       <p v-for="(item, index) in cftList" :key="index">
         测风塔高度：{{ item.anemometerHeight }}米

src/views/ledger/component/windsiteMessage.vue

@@ -36,12 +36,12 @@
         </div>
         <div class="condition">
           <p>经度:</p>
-          <span>{{ unusualdialogdata.longitude }}</span>
+          <span>{{ unusualdialogdata.longitude }}°</span>
         </div>
 
         <div class="condition">
           <p>纬度:</p>
-          <span>{{ unusualdialogdata.latitude }}</span>
+          <span>{{ unusualdialogdata.latitude }}°</span>
         </div>
 
         <div class="condition">

src/views/ledger/component/windsitetower.vue

@@ -32,9 +32,17 @@
         </el-table-column>
         <el-table-column prop="sightcing" align="center" label="是否标杆">
           <template slot-scope="scope">
-          <span v-if="scope.row.sightcing === 1 || scope.row.sightcing === '是'">是</span>
-          <span v-else-if="scope.row.sightcing === 2 || scope.row.sightcing === '否'">否</span>
-        </template>
+            <span
+              v-if="scope.row.sightcing === 1 || scope.row.sightcing === '是'"
+              >是</span
+            >
+            <span
+              v-else-if="
+                scope.row.sightcing === 2 || scope.row.sightcing === '否'
+              "
+              >否</span
+            >
+          </template>
         </el-table-column>
         <el-table-column
           prop="elevationHeight"
@@ -43,11 +51,16 @@
           width="120"
         >
         </el-table-column>
-        <el-table-column prop="latitude" align="center" label="经度" width="80">
-        </el-table-column>
         <el-table-column
           prop="longitude"
           align="center"
+          label="经度"
+          width="80"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="latitude"
+          align="center"
           label="纬度"
           width="80"
         >

src/views/ledger/draught.vue

@@ -362,12 +362,12 @@
         </div>
         <div class="condition">
           <p>经度:</p>
-          <span>{{ particularsdata.longitude }}</span>
+          <span>{{ particularsdata.longitude }}°</span>
         </div>
 
         <div class="condition">
           <p>纬度:</p>
-          <span>{{ particularsdata.latitude }}</span>
+          <span>{{ particularsdata.latitude }}°</span>
         </div>
         <div class="condition">
           <p>额定风速:</p>

src/views/ledger/milltype.vue

@@ -390,8 +390,8 @@ export default {
           { required: true, message: "请输入塔筒高度", trigger: "blur" },
           { validator: this.validateNumber, trigger: ["blur", "change"] },
         ],
-        vaneLong: [
-          { required: true, message: "请输入叶片长度", trigger: "blur" },
+        rotorDiameter: [
+          { required: true, message: "请输入叶轮直径", trigger: "blur" },
           { validator: this.validateNumber, trigger: ["blur", "change"] },
         ],
       },