Merge remote-tracking branch 'origin/develop' into develop

package-lock.json

@@ -3579,6 +3579,8 @@
 			"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
 			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
 			"dev": true,
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"json-schema-traverse": "^1.0.0",
@@ -3590,7 +3592,9 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
 			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
+			"dev": true,
+			"optional": true,
+			"peer": true
 		},
 		"node_modules/ajv-keywords": {
 			"version": "3.5.2",
@@ -13723,7 +13727,6 @@
 			"integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.12.16",
 				"@babel/helper-compilation-targets": "^7.12.16",
 				"@babel/helper-module-imports": "^7.12.13",
 				"@babel/plugin-proposal-class-properties": "^7.12.13",
@@ -13736,7 +13739,6 @@
 				"@vue/babel-plugin-jsx": "^1.0.3",
 				"@vue/babel-preset-jsx": "^1.1.2",
 				"babel-plugin-dynamic-import-node": "^2.3.3",
-				"core-js": "^3.8.3",
 				"core-js-compat": "^3.8.3",
 				"semver": "^7.3.4"
 			},
@@ -14575,15 +14577,14 @@
 			"resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
 			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
 			"dev": true,
-			"requires": {
+			"requires": {},
-				"ajv": "^8.0.0"
-			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.11.0",
+					"version": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
-					"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
 					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
 					"dev": true,
+					"optional": true,
+					"peer": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
 						"json-schema-traverse": "^1.0.0",
@@ -14595,7 +14596,9 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
 					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
+					"dev": true,
+					"optional": true,
+					"peer": true
 				}
 			}
 		},

src/views/courselibrary/CoursewareManage.vue

@@ -53,8 +53,11 @@
             <a-range-picker
               v-model:value="projectTime"
               :show-time="{
-                    defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+                defaultValue: [
-                  }"
+                  moment('00:00:00', 'HH:mm:ss'),
+                  moment('23:59:59', 'HH:mm:ss'),
+                ],
+              }"
               valueFormat="X"
               separator="至"
               :placeholder="['        开始时间', '        结束时间']"
@@ -3109,7 +3112,7 @@ import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 
 import SeeModal from "./components/seeModal.vue";
-import * as moment from 'moment'
+import * as moment from "moment";
 
 //列表表格
 const columns1 = [
@@ -3367,6 +3370,7 @@ const columns6 = [
     key: "num",
     width: "6%",
     align: "center",
+    ellipsis: true,
     customRender: ({ index }) => {
       //{ text, record, index, column }
       return index + 1;
@@ -3399,6 +3403,7 @@ const columns6 = [
     dataIndex: "starttime",
     key: "starttime",
     width: "12%",
+    ellipsis: true,
     align: "center",
     customRender: ({ text }) => {
       return text ? getdateToTime(text * 1000) : "-";
@@ -3409,6 +3414,7 @@ const columns6 = [
     dataIndex: "createtime",
     key: "createtime",
     width: "12%",
+    ellipsis: true,
     align: "center",
     customRender: ({ text }) => {
       return text ? getdateToTime(text * 1000) : "-";
@@ -4032,8 +4038,8 @@ export default defineComponent({
       let startTime = "";
       let endTime = "";
       if (state.projectTime) {
-        startTime = state.projectTime[0]
+        startTime = state.projectTime[0];
-        endTime = state.projectTime[1]
+        endTime = state.projectTime[1];
       }
       let res = await list({
         pageNo: state.currentPage1,