zhangjie 6 月之前
父節點
當前提交
38341a05c3

+ 2 - 2
src/modules/admin/components/school/ModifyDatabaseSync.vue

@@ -87,7 +87,7 @@
             placeholder="请输入定时同步时间"
             clearable
           ></el-input>
-          <p class="tips-info">如每天1点开始同步,0 0 1 * * ?</p>
+          <p class="tips-info">如每天1点开始同步,0 0 1 * * ?</p>
         </el-form-item>
         <el-form-item prop="phoneNumber" label="同步异常预警:">
           <el-input
@@ -119,7 +119,7 @@ const initModalForm = {
   dataType: "",
   startTime: "",
   endTime: "",
-  cron: "",
+  cron: "0 0 1 * * ?",
   phoneNumber: "",
 };
 

+ 12 - 0
src/modules/admin/components/school/SchoolSetDatabaseSync.vue

@@ -177,6 +177,9 @@
         </el-pagination>
       </div>
     </div>
+    <div class="tips-info">
+      <p>同步数据类型:{{ dataTypeTips }}</p>
+    </div>
 
     <!-- ModifyDatabaseSync -->
     <ModifyDatabaseSync
@@ -202,6 +205,7 @@ import {
 import { DATABASE_TYPE } from "@/constants/enumerate";
 import ModifyDatabaseSync from "./ModifyDatabaseSync.vue";
 import DatabaseSyncLogDialog from "./DatabaseSyncLogDialog.vue";
+import { DATABASE_SYNC_TYPE } from "@/constants/enumerate";
 
 const initModalForm = {
   type: "",
@@ -308,11 +312,19 @@ export default {
       total: 0,
       curRow: {},
       DATABASE_TYPE,
+      DATABASE_SYNC_TYPE,
       // log
       logList: [],
       logModalIsShow: false,
     };
   },
+  computed: {
+    dataTypeTips() {
+      return Object.entries(this.DATABASE_SYNC_TYPE)
+        .map(([key, val]) => `${key}:${val}`)
+        .join(",");
+    },
+  },
   mounted() {
     this.getBaseInfo();
     this.toPage(1);

+ 10 - 9
src/modules/card/api.js

@@ -1,4 +1,5 @@
 import { $postParam, $post } from "@/plugins/axios";
+import { fileMD5 } from "@/plugins/md5";
 
 export const cardConfigInfos = (id) => {
   return $postParam("/api/admin/basic/card_rule/get_one", { id });
@@ -15,20 +16,20 @@ export const saveCard1 = (datas, config = {}) => {
   }
 };
 
-export const saveCard = (datas, config = {}) => {
+export const saveCard = async (datas, config = {}) => {
   const formData = new FormData();
   for (const key in datas) {
     const val = datas[key];
     if (key === "content") {
-      formData.append(
-        key,
-        new File([val], `${Date.now()}.json`, { type: "text/json" })
-      );
+      const file = new File([val], `${Date.now()}.json`, { type: "text/json" });
+      formData.append(key, file);
+      const md5 = await fileMD5(file);
+      formData.append(`${key}Md5`, md5);
     } else if (key === "htmlContent") {
-      formData.append(
-        key,
-        new File([val], `${Date.now()}.html`, { type: "text/html" })
-      );
+      const file = new File([val], `${Date.now()}.html`, { type: "text/html" });
+      formData.append(key, file);
+      const md5 = await fileMD5(file);
+      formData.append(`${key}Md5`, md5);
     } else {
       formData.append(key, val);
     }

+ 1 - 1
src/modules/course/components/CourseDocumentDetail.vue

@@ -190,7 +190,7 @@
       </div>
 
       <div class="tool-footer">
-        <el-button type="primary" @click="confirmToolDownload">下载</el-button>
+        <el-button type="primary" @click="confirmToolDownload">确定</el-button>
       </div>
       <div slot="title"></div>
       <div slot="footer"></div>