2 Komitmen e919323a34 ... 3b6668e843

Pembuat SHA1 Pesan Tanggal
  cl 3b6668e843 Merge branch 'master' of http://221.182.8.141:11666/chenlong/xx_sw_dp 1 tahun lalu
  cl 93937ec413 修改 1 tahun lalu
3 mengubah file dengan 6 tambahan dan 3 penghapusan
  1. 2 2
      index.html
  2. 1 1
      src/components/Dialog/mapDialog.vue
  3. 3 0
      src/utils/TFMapUitl.ts

+ 2 - 2
index.html

@@ -16,8 +16,8 @@
     <script src="./static/MicroFrontend.js"></script>
     <script src="./static/mapConfig.js"></script>
     <!-- <script src="./static/grant.js"></script> -->
-    <script src="/build/grant.js"></script>
-    <!-- <script src="http://106.12.170.138:4001/build/grant.js"></script> -->
+    <!-- <script src="/build/grant.js"></script> -->
+    <script src="http://106.12.170.138:4001/build/grant.js"></script>
     <link rel="stylesheet" href="./public/static/jessibuca/iconfont/iconfont.css" />
     <style>
       .leaflet-popup-tip-container {

+ 1 - 1
src/components/Dialog/mapDialog.vue

@@ -111,7 +111,7 @@
                     </a-radio-group>
                     <div>
                       <a-range-picker :disabled-date="disabledDate" v-model:value="searchTime"
-                        valueFormat="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm" :placeholder="['开始时间', '结束时间']" />
+                        valueFormat="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" show-time :placeholder="['开始时间', '结束时间']" />
                     </div>
                     <div>
                       <a-button type="primary" @click="search(senid, sensor_name, dchar)">开始查询</a-button>

+ 3 - 0
src/utils/TFMapUitl.ts

@@ -462,6 +462,9 @@ class TFMapUitl {
     return str + str2 + str3
   }
   setWd(wds) {
+    if(wds == '--'){
+      return wds;
+    }
     let wd = wds*1
     if (wd >= 348.76 || wd <= 11.25) {
       return 'N';