This commit is contained in:
kclf
2022-12-04 20:06:18 +08:00
parent a19b87299f
commit 2c4e6c08ff
3 changed files with 541 additions and 521 deletions

21
package-lock.json generated
View File

@@ -3591,6 +3591,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",
@@ -3602,7 +3604,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",
@@ -13767,7 +13771,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",
@@ -13780,7 +13783,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"
},
@@ -14627,15 +14629,14 @@
"resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
"dev": true,
"requires": {
"ajv": "^8.0.0"
},
"requires": {},
"dependencies": {
"ajv": {
"version": "8.11.0",
"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
"version": "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",
@@ -14647,7 +14648,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
}
}
},

View File

@@ -24,7 +24,7 @@ const http = axios.create({
http.interceptors.request.use(
(config) => {
// console.log('config', config)
console.log("config", config);
// const token = localStorage.getItem("token");
// // const token = getCookie('token')
// // console.log('token', token)
@@ -34,8 +34,9 @@ http.interceptors.request.use(
// console.log("当前请求页面无token,请执行操作!!!");
// // 此处测试默认配置token
// config.headers.token = "123456";
// }
// config.headers.token =
// "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7";
// // }
return config;
},
(err) => {
@@ -64,8 +65,8 @@ http.interceptors.response.use(
},
function (error) {
if (error.message == "timeout of 1ms exceeded") {
message.destroy()
message.error("请求超时")
message.destroy();
message.error("请求超时");
}
console.log("api error %o", error);
return Promise.reject(error);

View File

@@ -990,8 +990,7 @@
</div>
</div>
</div>
</a-modal
>
</a-modal>
<!-- 是否删除阶段弹窗 -->
<a-modal
@@ -1027,7 +1026,14 @@
</template>
<script>
import {reactive, toRefs, onMounted, onUnmounted, onUpdated, watch} from "vue";
import {
reactive,
toRefs,
onMounted,
onUnmounted,
onUpdated,
watch,
} from "vue";
import AddOnline from "../../components/drawers/AddOnline.vue";
import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
import AddCase from "../../components/drawers/AddCase.vue";
@@ -1045,7 +1051,7 @@ import * as api from "../../api/indexTaskadd";
import * as apistage from "../../api/indexStage";
import * as apimove from "../../api/indexMovetask";
import draggable from "vuedraggable";
import {storage} from "../../api/storage";
// import { storage } from "../../api/storage";
// import UnlockMode from "../../components/drawers/UnlockMode.vue";
// import * as api1 from "../../api/index1";
import { useRoute, useRouter } from "vue-router";
@@ -1160,8 +1166,8 @@ export default {
};
watch(route, () => {
console.log(route)
})
console.log(route);
});
// 把数据放到state里
const getTableData = (tableData) => {
@@ -1366,15 +1372,13 @@ export default {
let obj = {
projectId: state.projectId,
};
await api
.getTask(obj)
.then((res) => {
await api.getTask(obj).then((res) => {
console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectInfo.name;
state.picUrl = res.data.data.projectInfo.picUrl;
state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList);
updateStageChoosd()
updateStageChoosd();
// let leng = res.data.data.stageList.length;
// if (leng > 0) {
// let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null;
@@ -1442,7 +1446,7 @@ export default {
// }
// let final = state.level.find((item) => item.id == state.chooseStageId);
// getTableData(final.taskList);
})
});
};
//获取修改、删除id投票)
@@ -1459,25 +1463,33 @@ export default {
//删除任务
const deleteTask = async () => {
await api.deleteTask({projectTaskIds: state.deleteID})
await api.deleteTask({ projectTaskIds: state.deleteID });
//删除后更新索引
};
function updateStageChoosd() {
console.log('updateStageChoosd')
console.log(state.chooseStageId)
if (state.chooseStageId && state.stageList.find(e => e.stageId == state.chooseStageId)) {
getTableData(state.stageList.find(e => e.stageId == state.chooseStageId)?.taskList);
return
console.log("updateStageChoosd");
console.log(state.chooseStageId);
if (
state.chooseStageId &&
state.stageList.find((e) => e.stageId == state.chooseStageId)
) {
getTableData(
state.stageList.find((e) => e.stageId == state.chooseStageId)
?.taskList
);
return;
}
state.chooseStageId = ''
const arr = state.stageList.filter(e => e.name);
state.chooseStageId = "";
const arr = state.stageList.filter((e) => e.name);
arr && arr.length && (state.chooseStageId = arr[0].stageId);
if (!state.chooseStageId) {
getTableData(state.stageList[0].taskList)
return
getTableData(state.stageList[0].taskList);
return;
}
getTableData(state.stageList.find(e => e.stageId == state.chooseStageId)?.taskList);
getTableData(
state.stageList.find((e) => e.stageId == state.chooseStageId)?.taskList
);
}
const showChangeModal = () => {
@@ -1613,7 +1625,9 @@ export default {
message.success("修改阶段成功");
await getTask();
state.chooseStageId = res.data.data.stageId;
let final = state.level.find((item) => item.id == state.chooseStageId);
let final = state.level.find(
(item) => item.id == state.chooseStageId
);
getTableData(final.taskList);
})
.catch((err) => {
@@ -1636,7 +1650,9 @@ export default {
message.success("添加阶段成功");
await getTask();
state.chooseStageId = res.data.data.stageId;
let final = state.level.find((item) => item.id == state.chooseStageId);
let final = state.level.find(
(item) => item.id == state.chooseStageId
);
getTableData(final.taskList);
})
.catch((err) => {