Browse Source

更新 版本;文案

wzg 2 years ago
parent
commit
7cef59dba3

+ 5 - 5
src/components/Header.vue

@@ -97,10 +97,10 @@ import api from "../apis/fetch";
 import { onMounted, ref } from "vue";
 import { BellFilled } from "@element-plus/icons";
 import _ from "lodash";
-// import { AnonymousLogin, tcb } from "../apis/cloudLogin";
-// const db = tcb.database();
-// const v = db.collection("huihenduo_versions");
-// const __ = db.command;
+import { AnonymousLogin, tcb } from "../apis/cloudLogin";
+const db = tcb.database();
+const v = db.collection("huihenduo_versions");
+const __ = db.command;
 
 export default {
   components: {
@@ -170,7 +170,7 @@ export default {
       //     getUnphotographNotice();
       //   }
       // }, 2 * 60 * 1000);
-      // cloudLogin();
+      cloudLogin();
     });
     let timelineData = ref([]);
     async function cloudLogin() {

+ 5 - 5
src/views/toolManage/urls.vue

@@ -385,16 +385,16 @@
 
 <script setup>
 import { reactive, ref, onMounted } from "vue";
-// import { AnonymousLogin, tcb } from "apis/cloudLogin";
+import { AnonymousLogin, tcb } from "apis/cloudLogin";
 import _ from "lodash";
 import { ElMessage, ElMessageBox } from "element-plus";
 import store from "../../store";
 import { chooseFile } from "../../utils/chooseFile";
 import copy from "copy-to-clipboard";
 
-// const db = tcb.database();
-// const p = db.collection("huihenduo_projects");
-// const __ = db.command;
+const db = tcb.database();
+const p = db.collection("huihenduo_projects");
+const __ = db.command;
 let pcData = ref([]);
 let wxData = ref([]);
 async function init() {
@@ -527,7 +527,7 @@ function copy2(url) {
 }
 
 onMounted(() => {
-  // init();
+  init();
 });
 </script>
 

+ 7 - 11
src/views/toolManage/versions.vue

@@ -1,11 +1,7 @@
 <template>
-  <div class="mt10 df aic jcsb">
+  <div class="mt10 df aic jcsb mb20">
     <div>
-      <el-button
-        type="primary"
-        class="mb20 mr30"
-        @click="isModalVisable = true"
-      >
+      <el-button type="primary" class="mr30" @click="isModalVisable = true">
         添加版本记录
       </el-button>
       <el-popover placement="bottom" trigger="hover" :width="240">
@@ -180,13 +176,13 @@
 
 <script setup>
 import { reactive, ref, onMounted } from "vue";
-// import { AnonymousLogin, tcb } from "apis/cloudLogin";
+import { AnonymousLogin, tcb } from "apis/cloudLogin";
 import _ from "lodash";
 import { ElMessage, ElMessageBox } from "element-plus";
 import store from "../../store";
-// const db = tcb.database();
-// const v = db.collection("huihenduo_versions");
-// const __ = db.command;
+const db = tcb.database();
+const v = db.collection("huihenduo_versions");
+const __ = db.command;
 
 let versions = ref([]);
 let isModalVisable = ref(false);
@@ -339,7 +335,7 @@ function pageChange(e) {
 }
 
 onMounted(() => {
-  // init();
+  init();
 });
 </script>
 

+ 15 - 2
src/views/voyage/voyageDetail.vue

@@ -429,8 +429,21 @@
         :name="item.portId + ''"
       ></el-tab-pane>
     </el-tabs>
-    <div class="container-second-title df aic jcsb">
+    <div class="container-second-title df">
       <div>天气信息</div>
+      <div
+        class="ml10"
+        style="
+          font-size: 12px;
+          color: rgba(0, 0, 0, 0.2);
+          font-weight: normal;
+          scale: 0.9;
+        "
+      >
+        天气信息为天气预报反应船舶所在区域即将发生天气情况
+        <br />
+        预报下雨情况为预警信息请联系船东拍摄现场实际情况。
+      </div>
     </div>
     <el-table style="width: 1200px" :data="weatherTableData" stripe>
       <el-table-column
@@ -691,7 +704,7 @@
       <el-pagination
         background
         layout="prev, pager, next"
-        :current-page="currentPage"
+        :current-page="dischargeCurrentPage"
         :total="total"
         @current-change="pageChange"
       ></el-pagination>