Merge branch 'fiveadd' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into five-second-add

src/utils/methodsTool.js

@@ -38,6 +38,14 @@ export default {
 		}
 		return Y + M + D;
 	},
+	/**
+	 * 
+	 * @returns 获取当前时间戳
+	 */
+	getNewTime(){
+		var data = new Date().getTime()
+		return data
+	},
 	//判断是否为数字
 	isNotANumber(inputData) {
 		//isNaN(inputData)不能判断空串或一个空格

src/views/education/classManageMent/classList/addClass/index.vue

@@ -227,7 +227,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item
+            <!-- <el-form-item
               v-if="listData.interfaceAccountId"
               label="学习网址"
               prop="officialLearningUrl"
@@ -236,7 +236,7 @@
                 v-model="listData.officialLearningUrl"
                 placeholder="请输入学习的网址"
               ></el-input>
-            </el-form-item>
+            </el-form-item> -->
           </div>
           <el-form-item label="备注" prop="remark">
             <el-input
@@ -392,7 +392,7 @@ export default {
         cityId: "",
         classGradeGoodsAddBos: [],
         studentUpper: 300,
-        officialLearningUrl: "",
+        // officialLearningUrl: "",
       },
       rules: {
         className: [
@@ -661,9 +661,9 @@ export default {
     //提交
     submit() {
       var data = JSON.parse(JSON.stringify(this.listData));
-      if(!data.interfaceAccountId){
-        delete data.officialLearningUrl
-      }
+      // if(!data.interfaceAccountId){
+      //   delete data.officialLearningUrl
+      // }
       if (data.timeList.length) {
         data.classStartTime = this.listData.timeList[0] / 1000;
         data.classEndTime = this.listData.timeList[1] / 1000;

src/views/education/classManageMent/classList/manageClass/baseInfo.vue

@@ -286,7 +286,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item
+              <!-- <el-form-item
                 v-if="listData.interfaceAccountId"
                 label="学习网址"
                 prop="officialLearningUrl"
@@ -295,7 +295,7 @@
                   v-model="listData.officialLearningUrl"
                   placeholder="请输入学习的网址"
                 ></el-input>
-              </el-form-item>
+              </el-form-item> -->
             </div>
             <el-form-item label="备注" prop="remark">
               <el-input
@@ -577,9 +577,9 @@ export default {
       if (data.learningStatus === 3) {
         data.learningTimeStart = this.listData.learningTimeStart / 1000;
       }
-      if(!data.interfaceAccountId){
-        delete data.officialLearningUrl
-      }
+      // if(!data.interfaceAccountId){
+      //   delete data.officialLearningUrl
+      // }
       delete data.goodsList;
       this.$api.editGradegrade(data).then((res) => {
         this.$message.success("修改成功");

src/views/education/dataReview/informationTemplate/index.vue

@@ -1203,7 +1203,8 @@ export default {
       });
     },
     getDowm() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20211214.docx";
+      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20211214.docx" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);

src/views/education/examManagement/applicationData/asPlanned.vue

@@ -612,7 +612,8 @@ export default {
   },
   methods: {
     getDowm() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20211228.xls";
+      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20211228.xls" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);

src/views/education/examManagement/applicationData/bulkImportPlan/newRegister.vue

@@ -404,7 +404,8 @@ export default {
      * 窗口下载模板
      */
     getDowm() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220214.xls";
+      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220214.xls" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);

src/views/education/examManagement/applicationData/cancelAppointMent/index.vue

@@ -355,7 +355,8 @@ export default {
      * 下载模板
      */
     getDowm() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220214.xls";
+      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220214.xls" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);

src/views/education/examManagement/applicationData/examRegistration/index.vue

@@ -465,7 +465,8 @@ export default {
      * 下载模板
      */
     getDowm() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220214.xls";
+      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220214.xls" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);

src/views/education/examManagement/applicationData/formerAccount/index.vue

@@ -375,7 +375,8 @@ export default {
      * 下载模板
      */
     getDowm() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220214.xls";
+      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220214.xls" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);

src/views/resource/bankManagement/testPaperManagement/editPaper/topicEditPaper/wordPop.vue

@@ -81,7 +81,8 @@ export default {
   methods: {
     getDowm() {
       let url =
-        baseUrls.BASE_IMG_URL + "/oss/images/file/20220324/1648102107588.docx";
+        baseUrls.BASE_IMG_URL + "/oss/images/file/20220324/1648102107588.docx" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".docx";
       document.body.appendChild(link);

src/views/resource/bankManagement/topicManagement/excelPop.vue

@@ -36,7 +36,8 @@ export default {
   methods: {
     getDowm() {
       let url =
-        baseUrls.BASE_IMG_URL + "/oss/images/file/20220307/1646623385198.xlsx";
+        baseUrls.BASE_IMG_URL + "/oss/images/file/20220307/1646623385198.xlsx" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);

src/views/resource/bankManagement/topicManagement/wordPop.vue

@@ -171,7 +171,8 @@ export default {
     },
     getDowm() {
       let url =
-        baseUrls.BASE_IMG_URL + "/oss/images/file/20220324/1648102107588.docx";
+        baseUrls.BASE_IMG_URL + "/oss/images/file/20220324/1648102107588.docx" +
+        `?time=${this.$methodsTools.getNewTime()}`;;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".docx";
       document.body.appendChild(link);

src/views/resource/videoManagement/festival/index.vue

@@ -326,7 +326,10 @@ export default {
   },
   methods: {
     getDowm() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220304/1646382321115.xlsx";
+      let url =
+        baseUrls.BASE_IMG_URL +
+        "/oss/images/file/20220304/1646382321115.xlsx" +
+        `?time=${this.$methodsTools.getNewTime()}`;
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);
@@ -348,10 +351,13 @@ export default {
               self.$message.success("导入成功");
               self.dialogDR = false;
             } else {
-              let ary = res.data.errorLog.split("\r\n")
-              ary = ary.filter(item => {
-                return item.length > 0
-              }).reverse().join("\r\n")
+              let ary = res.data.errorLog.split("\r\n");
+              ary = ary
+                .filter((item) => {
+                  return item.length > 0;
+                })
+                .reverse()
+                .join("\r\n");
               self.errorData = ary;
               self.dialogERROR = true;
             }