-- 时间搜索

This commit is contained in:
yuping
2022-12-06 18:20:46 +08:00
parent db9c26cf46
commit 18d5554778
6 changed files with 859 additions and 703 deletions

35
package-lock.json generated
View File

@@ -19,6 +19,7 @@
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",
"jquery": "^3.6.1", "jquery": "^3.6.1",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"moment": "^2.29.4",
"qrcode.vue": "^3.3.3", "qrcode.vue": "^3.3.3",
"qs": "^6.11.0", "qs": "^6.11.0",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
@@ -3578,8 +3579,6 @@
"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz", "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
"dev": true, "dev": true,
"optional": true,
"peer": true,
"dependencies": { "dependencies": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0", "json-schema-traverse": "^1.0.0",
@@ -3591,9 +3590,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true, "dev": true
"optional": true,
"peer": true
}, },
"node_modules/ajv-keywords": { "node_modules/ajv-keywords": {
"version": "3.5.2", "version": "3.5.2",
@@ -8046,6 +8043,14 @@
"integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==", "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==",
"dev": true "dev": true
}, },
"node_modules/moment": {
"version": "2.29.4",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
"engines": {
"node": "*"
}
},
"node_modules/mrmime": { "node_modules/mrmime": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz", "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
@@ -13718,6 +13723,7 @@
"integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==", "integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/core": "^7.12.16",
"@babel/helper-compilation-targets": "^7.12.16", "@babel/helper-compilation-targets": "^7.12.16",
"@babel/helper-module-imports": "^7.12.13", "@babel/helper-module-imports": "^7.12.13",
"@babel/plugin-proposal-class-properties": "^7.12.13", "@babel/plugin-proposal-class-properties": "^7.12.13",
@@ -13730,6 +13736,7 @@
"@vue/babel-plugin-jsx": "^1.0.3", "@vue/babel-plugin-jsx": "^1.0.3",
"@vue/babel-preset-jsx": "^1.1.2", "@vue/babel-preset-jsx": "^1.1.2",
"babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-dynamic-import-node": "^2.3.3",
"core-js": "^3.8.3",
"core-js-compat": "^3.8.3", "core-js-compat": "^3.8.3",
"semver": "^7.3.4" "semver": "^7.3.4"
}, },
@@ -14568,14 +14575,15 @@
"resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz", "resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
"dev": true, "dev": true,
"requires": {}, "requires": {
"ajv": "^8.0.0"
},
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz", "version": "8.11.0",
"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
"dev": true, "dev": true,
"optional": true,
"peer": true,
"requires": { "requires": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0", "json-schema-traverse": "^1.0.0",
@@ -14587,9 +14595,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true, "dev": true
"optional": true,
"peer": true
} }
} }
}, },
@@ -18184,6 +18190,11 @@
"integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==", "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==",
"dev": true "dev": true
}, },
"moment": {
"version": "2.29.4",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
},
"mrmime": { "mrmime": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz", "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",

View File

@@ -19,6 +19,7 @@
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",
"jquery": "^3.6.1", "jquery": "^3.6.1",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"moment": "^2.29.4",
"qrcode.vue": "^3.3.3", "qrcode.vue": "^3.3.3",
"qs": "^6.11.0", "qs": "^6.11.0",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",

View File

@@ -52,6 +52,10 @@
<div class="select fitems"> <div class="select fitems">
<a-range-picker <a-range-picker
v-model:value="projectTime" v-model:value="projectTime"
:show-time="{
defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
}"
valueFormat="X"
separator="至" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
/> />
@@ -3105,6 +3109,7 @@ import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import SeeModal from "./components/seeModal.vue"; import SeeModal from "./components/seeModal.vue";
import * as moment from 'moment'
//列表表格 //列表表格
const columns1 = [ const columns1 = [
@@ -4027,10 +4032,8 @@ export default defineComponent({
let startTime = ""; let startTime = "";
let endTime = ""; let endTime = "";
if (state.projectTime) { if (state.projectTime) {
startTime = parseInt( startTime = state.projectTime[0]
new Date(state.projectTime[0].$d).getTime() / 1000 endTime = state.projectTime[1]
);
endTime = parseInt(new Date(state.projectTime[1].$d).getTime() / 1000);
} }
let res = await list({ let res = await list({
pageNo: state.currentPage1, pageNo: state.currentPage1,
@@ -5556,6 +5559,7 @@ export default defineComponent({
return { return {
...toRefs(state), ...toRefs(state),
getdateToDateFn, getdateToDateFn,
moment,
getdateToTimeFn, getdateToTimeFn,
handlePostSure, handlePostSure,
handleDeleteKaike, handleDeleteKaike,

View File

@@ -52,6 +52,9 @@
<div class="inpbox1"> <div class="inpbox1">
<a-range-picker <a-range-picker
v-model:value="valueDate" v-model:value="valueDate"
:show-time="{
defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
}"
style="border-radius: 8px; height: 40px; margin-left: 5px" style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X" valueFormat="X"
@@ -142,6 +145,7 @@
<script> <script>
import {onMounted, reactive, toRefs} from "vue"; import {onMounted, reactive, toRefs} from "vue";
import {auditedlist} from "../../api/indexAudit"; import {auditedlist} from "../../api/indexAudit";
import * as moment from 'moment'
export default { export default {
name: "ProjectViewed", name: "ProjectViewed",
@@ -347,6 +351,7 @@ export default {
...toRefs(state), ...toRefs(state),
getProjList, getProjList,
changePagination, changePagination,
moment,
reset, reset,
closeProjAuditModal, closeProjAuditModal,
showProjAuditModal, showProjAuditModal,

View File

@@ -32,8 +32,12 @@
/> --> /> -->
<a-range-picker <a-range-picker
v-model:value="searchdate" v-model:value="searchdate"
:show-time="{
defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
}"
separator="至" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
@change="searchTimeChange" @change="searchTimeChange"
/> />
</div> </div>
@@ -66,15 +70,15 @@
<div class="datanull" v-if="tableDataTotal === 0"> <div class="datanull" v-if="tableDataTotal === 0">
<div class="nodata_box"> <div class="nodata_box">
<div class="left"> <div class="left">
<img src="../../assets/images/taskpage/left1.png" /> <img src="../../assets/images/taskpage/left1.png"/>
</div> </div>
<div class="center"> <div class="center">
<img src="../../assets/images/leveladd/picture.png" /> <img src="../../assets/images/leveladd/picture.png"/>
</div> </div>
<div class="text1">无数据</div> <div class="text1">无数据</div>
<div class="text2">请添加路径</div> <div class="text2">请添加路径</div>
<div class="right"> <div class="right">
<img src="../../assets/images/leveladd/right.png" /> <img src="../../assets/images/leveladd/right.png"/>
</div> </div>
</div> </div>
</div> </div>
@@ -124,7 +128,7 @@
> >
<div class="out"> <div class="out">
<div class="top"> <div class="top">
<img class="topimg" src="../../assets/images/courseManage/add1.png" /> <img class="topimg" src="../../assets/images/courseManage/add1.png"/>
<div class="topc">创建路径</div> <div class="topc">创建路径</div>
<div @click="handleOut" style="margin-left: 500px; cursor: pointer"> <div @click="handleOut" style="margin-left: 500px; cursor: pointer">
<img <img
@@ -207,14 +211,14 @@
v-if="imgData.length > 5" v-if="imgData.length > 5"
class="learnBgItem learnBgMore" class="learnBgItem learnBgMore"
> >
查看更多 <img src="../../assets/images/projectadd/go.png" /> 查看更多 <img src="../../assets/images/projectadd/go.png"/>
</div> </div>
</div> </div>
</div> </div>
<div class="info"> <div class="info">
<div class="inname">路径说明</div> <div class="inname">路径说明</div>
<div class="in"> <div class="in">
<a-textarea v-model:value="pathIntro" maxlength="150" /> <a-textarea v-model:value="pathIntro" maxlength="150"/>
<div class="showcount">{{ pathIntro.length }}/150</div> <div class="showcount">{{ pathIntro.length }}/150</div>
</div> </div>
</div> </div>
@@ -227,7 +231,7 @@
class="aeLoading" class="aeLoading"
:style="{ display: lpLoading ? 'flex' : 'none' }" :style="{ display: lpLoading ? 'flex' : 'none' }"
> >
<a-spin :spinning="lpLoading" tip="添加中..." /> <a-spin :spinning="lpLoading" tip="添加中..."/>
</div> </div>
</div> </div>
</div> </div>
@@ -243,7 +247,7 @@
> >
<div class="out"> <div class="out">
<div class="top"> <div class="top">
<img class="topimg" src="../../assets/images/courseManage/add1.png" /> <img class="topimg" src="../../assets/images/courseManage/add1.png"/>
<div class="topc">编辑路径</div> <div class="topc">编辑路径</div>
<div @click="handleOut1" style="margin-left: 500px; cursor: pointer"> <div @click="handleOut1" style="margin-left: 500px; cursor: pointer">
<img <img
@@ -327,14 +331,14 @@
v-if="imgData.length > 5" v-if="imgData.length > 5"
class="learnBgItem learnBgMore" class="learnBgItem learnBgMore"
> >
查看更多 <img src="../../assets/images/projectadd/go.png" /> 查看更多 <img src="../../assets/images/projectadd/go.png"/>
</div> </div>
</div> </div>
</div> </div>
<div class="info"> <div class="info">
<div class="inname">路径说明</div> <div class="inname">路径说明</div>
<div class="in"> <div class="in">
<a-textarea v-model:value="pathIntro" maxlength="150" /> <a-textarea v-model:value="pathIntro" maxlength="150"/>
<div class="showcount">{{ pathIntro.length }}/150</div> <div class="showcount">{{ pathIntro.length }}/150</div>
</div> </div>
</div> </div>
@@ -657,8 +661,8 @@
</div> </div>
</template> </template>
<script> <script>
import { reactive, toRefs, onMounted, watch, computed } from "vue"; import {reactive, toRefs, onMounted, watch, computed} from "vue";
import { useRouter } from "vue-router"; import {useRouter} from "vue-router";
// import OwnerShip from "../../components/drawers/Ownership"; // import OwnerShip from "../../components/drawers/Ownership";
// import PowerList from "../../components/drawers/PowerList"; // import PowerList from "../../components/drawers/PowerList";
// import QueryRight from "../../components/drawers/QueryRight"; // import QueryRight from "../../components/drawers/QueryRight";
@@ -667,16 +671,17 @@ import ProjPowerList from "../../components/drawers/ProjPowerList";
import ProjCheckShip from "../../components/drawers/ProjCheckPower"; import ProjCheckShip from "../../components/drawers/ProjCheckPower";
// import ManageRight from "../../components/drawers/ManageRight"; // import ManageRight from "../../components/drawers/ManageRight";
import * as api from "../../api/index1"; import * as api from "../../api/index1";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
import { import {
toDate,
commonData, commonData,
changeOwnership, changeOwnership,
// setCookie // setCookie
} from "../../api/method"; } from "../../api/method";
import { storage } from "../../api/storage"; import {storage} from "../../api/storage";
import { useStore } from "vuex"; import {useStore} from "vuex";
import OrgClass from "@/components/project/OrgClass"; import OrgClass from "@/components/project/OrgClass";
import * as moment from 'moment'
export default { export default {
name: "learningPath", name: "learningPath",
components: { components: {
@@ -1047,17 +1052,17 @@ export default {
: "-", : "-",
creater: value.createName ? value.createName : "-", creater: value.createName ? value.createName : "-",
pubtime: value.publishTime pubtime: value.publishTime
? toDate(value.publishTime, "Y-M-D h:m:s") ? value.publishTime
: "-", : "-",
cretime: value.createTime cretime: value.createTime
? toDate(value.createTime, "Y-M-D h:m:s") ? value.createTime
: "-", : "-",
remark: value.remark ? value.remark : "-", remark: value.remark ? value.remark : "-",
}; };
array.push(obj); array.push(obj);
}); });
state.tableData = array; state.tableData = array;
console.log(array,tableData) console.log(array, tableData)
}; };
const tableDataFunc = () => { const tableDataFunc = () => {
@@ -1121,7 +1126,7 @@ export default {
width: 200, width: 200,
align: "center", align: "center",
fixed: "right", fixed: "right",
scopedSlots: { customRender: "action" }, //引入的插槽 scopedSlots: {customRender: "action"}, //引入的插槽
customRender: (text) => { customRender: (text) => {
// console.log(text); // console.log(text);
return ( return (
@@ -1462,7 +1467,7 @@ export default {
}); });
//添加归属权 [id: '966735050643083264', name: '丁舟航'] //添加归属权 [id: '966735050643083264', name: '丁舟航']
let selectPeopleArr = [ let selectPeopleArr = [
{ id: res.data.data.createId, name: res.data.data.createName }, {id: res.data.data.createId, name: res.data.data.createName},
]; ];
changeOwnership( changeOwnership(
"learnPath", "learnPath",
@@ -1484,8 +1489,8 @@ export default {
pageSize: state.pageSize, pageSize: state.pageSize,
name: state.pathnameSearch, name: state.pathnameSearch,
status: state.statusClassify, status: state.statusClassify,
beginTime: state.startTime, beginTime: state.searchdate ? state.searchdate[0] : '',
endTime: state.endTime, endTime: state.searchdate ? state.searchdate[1] : '',
}; };
api api
.getLearnPath(obj) .getLearnPath(obj)
@@ -1759,6 +1764,7 @@ export default {
return { return {
...toRefs(state), ...toRefs(state),
selectProjectName, selectProjectName,
moment,
expandTable, expandTable,
handleOut, handleOut,
handleOut1, handleOut1,
@@ -1807,17 +1813,21 @@ export default {
display: block; display: block;
clear: both; clear: both;
} }
.CreatePath { .CreatePath {
.ant-modal { .ant-modal {
width: 680px !important; width: 680px !important;
height: 528px !important; height: 528px !important;
.ant-modal-content { .ant-modal-content {
width: 680px !important; width: 680px !important;
height: 528px !important; height: 528px !important;
.ant-modal-body { .ant-modal-body {
width: 680px !important; width: 680px !important;
height: 528px !important; height: 528px !important;
padding: 0 !important; padding: 0 !important;
.out { .out {
display: block; display: block;
position: absolute; position: absolute;
@@ -1830,6 +1840,7 @@ export default {
left: 50%; left: 50%;
top: 50%; top: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
.top { .top {
width: 100%; width: 100%;
height: 68px; height: 68px;
@@ -1840,18 +1851,21 @@ export default {
); );
display: flex; display: flex;
align-items: center; align-items: center;
.topimg { .topimg {
width: 18px; width: 18px;
height: 18px; height: 18px;
margin-left: 27px; margin-left: 27px;
margin-top: -2px; margin-top: -2px;
} }
.topc { .topc {
color: #000000; color: #000000;
font-size: 16px; font-size: 16px;
margin-left: 8px; margin-left: 8px;
} }
} }
.mid { .mid {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -1859,11 +1873,13 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.d { .d {
// margin-top: 8px; // margin-top: 8px;
// color: #ff4e4e; // color: #ff4e4e;
margin-left: -5px; margin-left: -5px;
} }
.name { .name {
width: 78%; width: 78%;
// background-color: lightcoral; // background-color: lightcoral;
@@ -1878,16 +1894,19 @@ export default {
font-size: 14px; font-size: 14px;
margin-left: 7px; margin-left: 7px;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
width: 81%; width: 81%;
position: relative; position: relative;
.ant-input { .ant-input {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
width: 100%; width: 100%;
height: 40px; height: 40px;
} }
.showcount { .showcount {
position: absolute; position: absolute;
right: 10px; right: 10px;
@@ -1896,6 +1915,7 @@ export default {
} }
} }
} }
.bac { .bac {
width: 78%; width: 78%;
// background-color: lightcoral; // background-color: lightcoral;
@@ -1906,12 +1926,14 @@ export default {
margin-top: 18px; margin-top: 18px;
color: #ff4e4e; color: #ff4e4e;
} }
.inname { .inname {
color: #6f6f6f; color: #6f6f6f;
font-size: 14px; font-size: 14px;
margin-left: 7px; margin-left: 7px;
margin-top: 15px; margin-top: 15px;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
width: 81%; width: 81%;
@@ -1926,11 +1948,13 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.learnBg { .learnBg {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
min-height: 110px; min-height: 110px;
max-height: 300px; max-height: 300px;
.learnBgItem { .learnBgItem {
border-radius: 8px; border-radius: 8px;
width: 136px; width: 136px;
@@ -1940,6 +1964,7 @@ export default {
margin-bottom: 20px; margin-bottom: 20px;
margin-right: 6px; margin-right: 6px;
} }
.learnBgMore { .learnBgMore {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -1953,6 +1978,7 @@ export default {
} }
} }
} }
.info { .info {
width: 78%; width: 78%;
// background-color: lightcoral; // background-color: lightcoral;
@@ -1968,10 +1994,12 @@ export default {
margin-left: 26px; margin-left: 26px;
margin-top: 15px; margin-top: 15px;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
width: 81%; width: 81%;
position: relative; position: relative;
.ant-input { .ant-input {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
@@ -1979,6 +2007,7 @@ export default {
height: 130px; height: 130px;
resize: none; resize: none;
} }
.showcount { .showcount {
position: absolute; position: absolute;
right: 10px; right: 10px;
@@ -1987,12 +2016,14 @@ export default {
} }
} }
} }
.btn { .btn {
width: 33%; width: 33%;
margin-top: 30px; margin-top: 30px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 30px; margin-bottom: 30px;
.samtn { .samtn {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -2001,10 +2032,12 @@ export default {
border-radius: 8px; border-radius: 8px;
cursor: pointer; cursor: pointer;
} }
.btn1 { .btn1 {
background-color: #fff; background-color: #fff;
color: #4ea6ff; color: #4ea6ff;
} }
.btn2 { .btn2 {
background-color: #4ea6ff; background-color: #4ea6ff;
color: #fff; color: #fff;
@@ -2016,20 +2049,25 @@ export default {
} }
} }
} }
.learnBgMoreModal { .learnBgMoreModal {
.ant-modal { .ant-modal {
width: 680px !important; width: 680px !important;
height: 528px !important; height: 528px !important;
.ant-modal-content { .ant-modal-content {
width: 680px !important; width: 680px !important;
height: 528px !important; height: 528px !important;
.ant-modal-body { .ant-modal-body {
width: 680px !important; width: 680px !important;
height: 528px !important; height: 528px !important;
padding: 0 !important; padding: 0 !important;
.main { .main {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.top { .top {
padding-left: 51px; padding-left: 51px;
padding-right: 51px; padding-right: 51px;
@@ -2038,6 +2076,7 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
cursor: pointer; cursor: pointer;
.topc { .topc {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
@@ -2045,6 +2084,7 @@ export default {
line-height: 36px; line-height: 36px;
} }
} }
.imagesBox { .imagesBox {
display: flex; display: flex;
// justify-content: space-between; // justify-content: space-between;
@@ -2054,6 +2094,7 @@ export default {
margin-top: 20px; margin-top: 20px;
height: 350px; height: 350px;
overflow-y: auto; overflow-y: auto;
.learnBgItem { .learnBgItem {
border-radius: 8px; border-radius: 8px;
width: 136px; width: 136px;
@@ -2064,6 +2105,7 @@ export default {
margin-right: 10px; margin-right: 10px;
} }
} }
.btn { .btn {
width: 100%; width: 100%;
position: absolute; position: absolute;
@@ -2071,6 +2113,7 @@ export default {
margin-top: 30px; margin-top: 30px;
display: flex; display: flex;
justify-content: center; justify-content: center;
.samtn { .samtn {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -2079,10 +2122,12 @@ export default {
border-radius: 8px; border-radius: 8px;
cursor: pointer; cursor: pointer;
} }
.btn1 { .btn1 {
background-color: #fff; background-color: #fff;
color: #4ea6ff; color: #4ea6ff;
} }
.btn2 { .btn2 {
background-color: #4ea6ff; background-color: #4ea6ff;
color: #fff; color: #fff;
@@ -2094,16 +2139,19 @@ export default {
} }
} }
} }
.pub { .pub {
.ant-modal { .ant-modal {
.ant-modal-body { .ant-modal-body {
padding: 0; padding: 0;
.modalHeader { .modalHeader {
background: linear-gradient( background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100% rgba(78, 166, 255, 0) 100%
); );
} }
.modalMain { .modalMain {
.projectname { .projectname {
color: rgba(79, 81, 86, 1); color: rgba(79, 81, 86, 1);
@@ -2112,23 +2160,28 @@ export default {
margin-left: 62px; margin-left: 62px;
font-weight: 500; font-weight: 500;
} }
.projecttime { .projecttime {
margin-left: 221px; margin-left: 221px;
.timeti { .timeti {
color: rgba(153, 155, 163, 1); color: rgba(153, 155, 163, 1);
font-size: 14px; font-size: 14px;
line-height: 36px; line-height: 36px;
} }
.timeme { .timeme {
color: rgba(79, 81, 86, 1); color: rgba(79, 81, 86, 1);
font-size: 14px; font-size: 14px;
line-height: 36px; line-height: 36px;
} }
} }
.projectbox { .projectbox {
margin-top: 26px; margin-top: 26px;
display: flex; display: flex;
justify-content: center; justify-content: center;
.promessage { .promessage {
width: 280px; width: 280px;
height: 110px; height: 110px;
@@ -2139,6 +2192,7 @@ export default {
); );
border-radius: 10px; border-radius: 10px;
margin-right: 7px; margin-right: 7px;
.messageme { .messageme {
color: rgba(255, 182, 78, 1); color: rgba(255, 182, 78, 1);
font-size: 14px; font-size: 14px;
@@ -2146,12 +2200,14 @@ export default {
margin-top: 17px; margin-top: 17px;
margin-left: 30px; margin-left: 30px;
} }
.messagege { .messagege {
color: rgba(153, 155, 163, 1); color: rgba(153, 155, 163, 1);
font-size: 14px; font-size: 14px;
margin-left: 30px; margin-left: 30px;
} }
} }
.stumessage { .stumessage {
width: 280px; width: 280px;
height: 110px; height: 110px;
@@ -2161,6 +2217,7 @@ export default {
rgba(240, 248, 254, 1) rgba(240, 248, 254, 1)
); );
border-radius: 10px; border-radius: 10px;
.messageme1 { .messageme1 {
color: rgba(78, 166, 255, 1); color: rgba(78, 166, 255, 1);
font-size: 14px; font-size: 14px;
@@ -2168,6 +2225,7 @@ export default {
margin-top: 17px; margin-top: 17px;
margin-left: 30px; margin-left: 30px;
} }
.messagege1 { .messagege1 {
color: rgba(153, 155, 163, 1); color: rgba(153, 155, 163, 1);
font-size: 14px; font-size: 14px;
@@ -2175,26 +2233,32 @@ export default {
} }
} }
} }
.send { .send {
margin-top: 30px; margin-top: 30px;
margin-left: 61px; margin-left: 61px;
.sendtext { .sendtext {
margin-left: 11px; margin-left: 11px;
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);
font-size: 14px; font-size: 14px;
} }
} }
.ckb { .ckb {
margin-top: 20px; margin-top: 20px;
margin-left: 62px; margin-left: 62px;
.sendpeo { .sendpeo {
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);
font-size: 14px; font-size: 14px;
} }
.ant-checkbox-inner { .ant-checkbox-inner {
border-radius: 4px; border-radius: 4px;
} }
} }
.pubtn { .pubtn {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -2213,6 +2277,7 @@ export default {
align-items: center; align-items: center;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
} }
.pubtn2 { .pubtn2 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -2230,17 +2295,21 @@ export default {
} }
} }
} }
.CopyModal { .CopyModal {
.ant-modal { .ant-modal {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-content { .ant-modal-content {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-body { .ant-modal-body {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
padding: 0 !important; padding: 0 !important;
.delete { .delete {
z-index: 999; z-index: 999;
width: 424px; width: 424px;
@@ -2261,15 +2330,18 @@ export default {
rgba(78, 166, 255, 0) 100% rgba(78, 166, 255, 0) 100%
); );
} }
.del_main { .del_main {
width: 100%; width: 100%;
position: relative; position: relative;
.header { .header {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 20px; padding-top: 20px;
padding-left: 26px; padding-left: 26px;
font-size: 16px; font-size: 16px;
.icon { .icon {
width: 16px; width: 16px;
height: 16px; height: 16px;
@@ -2277,6 +2349,7 @@ export default {
background-image: url(@/assets/images/taskpage/gan.png); background-image: url(@/assets/images/taskpage/gan.png);
background-size: 100% 100%; background-size: 100% 100%;
} }
.close_exit { .close_exit {
position: absolute; position: absolute;
right: 42px; right: 42px;
@@ -2287,6 +2360,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.body { .body {
width: 100%; width: 100%;
margin: 34px auto 56px auto; margin: 34px auto 56px auto;
@@ -2296,6 +2370,7 @@ export default {
flex-direction: column; flex-direction: column;
// background-color: red; // background-color: red;
position: relative; position: relative;
.back { .back {
position: absolute; position: absolute;
top: 30px; top: 30px;
@@ -2304,10 +2379,12 @@ export default {
color: #666666; color: #666666;
} }
} }
.del_btnbox { .del_btnbox {
display: flex; display: flex;
margin: 30px auto; margin: 30px auto;
justify-content: center; justify-content: center;
.del_btn { .del_btn {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -2319,17 +2396,20 @@ export default {
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 40px; line-height: 40px;
} }
} }
.btn1 { .btn1 {
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff; color: #4ea6ff;
margin-right: 14px; margin-right: 14px;
} }
.btn2 { .btn2 {
background-color: #4ea6ff; background-color: #4ea6ff;
color: #ffffff; color: #ffffff;
@@ -2341,6 +2421,7 @@ export default {
} }
} }
} }
.learningPath { .learningPath {
width: 100%; width: 100%;
// height: 100%; // height: 100%;
@@ -2355,22 +2436,26 @@ export default {
//background: red; //background: red;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.nodata_box { .nodata_box {
width: 412px; width: 412px;
height: 212px; height: 212px;
position: relative; position: relative;
background: linear-gradient(180deg, #fef3dd, #fffaf0); background: linear-gradient(180deg, #fef3dd, #fffaf0);
border-radius: 10px; border-radius: 10px;
.left { .left {
position: absolute; position: absolute;
top: 18px; top: 18px;
left: 0; left: 0;
} }
.center { .center {
position: absolute; position: absolute;
top: 32px; top: 32px;
left: 170px; left: 170px;
} }
.text1 { .text1 {
position: absolute; position: absolute;
top: 128px; top: 128px;
@@ -2379,6 +2464,7 @@ export default {
color: #ffb64e; color: #ffb64e;
font-weight: 500; font-weight: 500;
} }
.text2 { .text2 {
position: absolute; position: absolute;
bottom: 32px; bottom: 32px;
@@ -2387,6 +2473,7 @@ export default {
color: #878b92; color: #878b92;
font-weight: 500; font-weight: 500;
} }
.right { .right {
position: absolute; position: absolute;
bottom: 18px; bottom: 18px;
@@ -2394,6 +2481,7 @@ export default {
} }
} }
} }
.filter { .filter {
margin-left: 35px; margin-left: 35px;
margin-right: 35px; margin-right: 35px;
@@ -2401,17 +2489,21 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
.filterItems { .filterItems {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.pathnameInp { .pathnameInp {
margin-right: 20px; margin-right: 20px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.select { .select {
margin-right: 20px; margin-right: 20px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
@@ -2424,9 +2516,11 @@ export default {
margin-right: 14px; margin-right: 14px;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.search { .search {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -2435,6 +2529,7 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
} }
.btnn { .btnn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
@@ -2447,9 +2542,11 @@ export default {
margin-right: 14px; margin-right: 14px;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.search { .search {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -2458,6 +2555,7 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
} }
.btn1 { .btn1 {
.search { .search {
width: 15px; width: 15px;
@@ -2465,6 +2563,7 @@ export default {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
} }
.btn2 { .btn2 {
.search { .search {
width: 16px; width: 16px;
@@ -2472,25 +2571,32 @@ export default {
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset1.png");
} }
} }
.btn1:hover { .btn1:hover {
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
.search { .search {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
.btnText { .btnText {
color: #ffffff; color: #ffffff;
} }
} }
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
.btn2:hover { .btn2:hover {
background: rgba(64, 158, 255, 0.1); background: rgba(64, 158, 255, 0.1);
} }
.btn2:active { .btn2:active {
background: rgba(64, 158, 255, 0.2); background: rgba(64, 158, 255, 0.2);
} }
} }
.btns { .btns {
display: flex; display: flex;
// flex-wrap: wrap; // flex-wrap: wrap;
@@ -2506,9 +2612,11 @@ export default {
margin-right: 14px; margin-right: 14px;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.search { .search {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -2517,28 +2625,35 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
} }
.btn3 { .btn3 {
margin-right: 0px; margin-right: 0px;
.search { .search {
width: 17px; width: 17px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/add0.png"); background-image: url("../../assets/images/courseManage/add0.png");
} }
} }
.btn3:hover { .btn3:hover {
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
.search { .search {
background-image: url("../../assets/images/courseManage/add0.png"); background-image: url("../../assets/images/courseManage/add0.png");
} }
.btnText { .btnText {
color: #ffffff; color: #ffffff;
} }
} }
.btn3:active { .btn3:active {
background: #0982ff; background: #0982ff;
} }
} }
} }
.tableBox { .tableBox {
// margin: 20px 38px 30px; // margin: 20px 38px 30px;
margin: 10px 35px 0px 35px; margin: 10px 35px 0px 35px;
@@ -2553,8 +2668,10 @@ export default {
background: #f6f9fd; background: #f6f9fd;
} }
} }
.tableBox { .tableBox {
padding-bottom: 20px; padding-bottom: 20px;
.pa { .pa {
// position: absolute; // position: absolute;
// bottom: 20px; // bottom: 20px;
@@ -2569,13 +2686,16 @@ export default {
// bottom: -40px; // bottom: -40px;
} }
} }
.operation { .operation {
display: flex; display: flex;
justify-content: right; justify-content: right;
.nSelect { .nSelect {
.fb { .fb {
display: flex; display: flex;
white-space: nowrap; white-space: nowrap;
.jc { .jc {
color: #4ea6ff; color: #4ea6ff;
font-size: 14px; font-size: 14px;
@@ -2585,12 +2705,14 @@ export default {
} }
} }
} }
.tableSelect { .tableSelect {
// margin-right: 20px; // margin-right: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: right; justify-content: right;
white-space: nowrap; white-space: nowrap;
.g1 { .g1 {
color: #4ea6ff; color: #4ea6ff;
font-size: 14px; font-size: 14px;
@@ -2606,6 +2728,7 @@ export default {
.opa { .opa {
display: flex; display: flex;
justify-content: right; justify-content: right;
.opacation { .opacation {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -2615,12 +2738,15 @@ export default {
.activecls { .activecls {
display: inline-block; display: inline-block;
} }
.errorCls { .errorCls {
display: none; display: none;
} }
.more { .more {
position: relative; position: relative;
height: 100%; height: 100%;
.moreArrow { .moreArrow {
width: 13px; width: 13px;
height: 7px; height: 7px;
@@ -2630,6 +2756,7 @@ export default {
margin: 2px; margin: 2px;
margin-left: 7px; margin-left: 7px;
} }
.moreItems { .moreItems {
width: 80px; width: 80px;
height: 70px; height: 70px;
@@ -2644,9 +2771,11 @@ export default {
z-index: 999; z-index: 999;
} }
} }
.more:hover .moreArrow { .more:hover .moreArrow {
background-image: url("../../assets/images/navtop/up.png"); background-image: url("../../assets/images/navtop/up.png");
} }
.more:hover .moreItems { .more:hover .moreItems {
display: block; display: block;
} }

View File

@@ -49,6 +49,9 @@
<div class="select"> <div class="select">
<a-range-picker <a-range-picker
v-model:value="searchParam.valueDate" v-model:value="searchParam.valueDate"
:show-time="{
defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
}"
style="border-radius: 8px; height: 40px; margin-left: 5px" style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X" valueFormat="X"
@@ -405,7 +408,9 @@
多层{{ projectInfo.parentId ? '子' : '' }}项目 多层{{ projectInfo.parentId ? '子' : '' }}项目
</div> </div>
<div class="centermain1"> <div class="centermain1">
{{ projectInfo.parentId ? '可创建班级,通过班级填写基础信息并创建任务' : '包含子项目,分为多层子项目和单层子项目,多层子项目可创建班级,通过班级填写基础信息并创建任务' }} {{
projectInfo.parentId ? '可创建班级,通过班级填写基础信息并创建任务' : '包含子项目,分为多层子项目和单层子项目,多层子项目可创建班级,通过班级填写基础信息并创建任务'
}}
</div> </div>
</div> </div>
</div> </div>
@@ -810,7 +815,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectClass from "@/components/project/ProjectClass"; import ProjectClass from "@/components/project/ProjectClass";
import OrgClass from "@/components/project/OrgClass"; import OrgClass from "@/components/project/OrgClass";
import dayjs from "dayjs"; import dayjs from "dayjs";
import * as moment from 'moment'
export default { export default {
name: "projectManage", name: "projectManage",
@@ -1745,6 +1750,7 @@ export default {
return { return {
...toRefs(state), ...toRefs(state),
dayjs, dayjs,
moment,
reFinashedProject, reFinashedProject,
showBackFinashModal, showBackFinashModal,
timeChange, timeChange,