保存进度！
This commit is contained in:
parent
c6e2d0ba06
commit
ddb57c8961
@ -2,7 +2,7 @@
|
||||
* @Author: Kane
|
||||
* @Date: 2023-01-04 11:05:44
|
||||
* @LastEditors: Kane
|
||||
* @LastEditTime: 2023-02-04 22:48:20
|
||||
* @LastEditTime: 2023-02-05 10:53:45
|
||||
* @FilePath: /IT工具综合平台/src/layout/Index.vue
|
||||
* @Description:
|
||||
*
|
||||
@ -52,14 +52,12 @@ export default {
|
||||
|
||||
onMounted(() =>
|
||||
{
|
||||
|
||||
//加载数据
|
||||
// query_requirement_status()
|
||||
// .then((response) =>
|
||||
// {
|
||||
// // debugger;
|
||||
// const data = response.data;
|
||||
|
||||
// console.log(data);
|
||||
// })
|
||||
// .catch((error) =>
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
* @Author: Kane
|
||||
* @Date: 2023-01-04 11:30:33
|
||||
* @LastEditors: Kane
|
||||
* @LastEditTime: 2023-02-04 01:15:34
|
||||
* @FilePath: \IT工具综合平台\src\layout\components\Aside.vue
|
||||
* @LastEditTime: 2023-02-05 10:47:17
|
||||
* @FilePath: /IT工具综合平台/src/layout/components/Aside.vue
|
||||
* @Description:
|
||||
*
|
||||
* Copyright (c) ${2022} by Kane, All Rights Reserved. 223142 2f4156
|
||||
@ -92,7 +92,7 @@ export default {
|
||||
//获取导航栏是否折叠的标志
|
||||
asideCollapse()
|
||||
{
|
||||
return this.$store.state.app.asideBarCollapse;
|
||||
return this.$store.state.app.ui.asideBarCollapse;
|
||||
}
|
||||
},
|
||||
created()
|
||||
|
||||
@ -2,16 +2,19 @@
|
||||
* @Author: Kane
|
||||
* @Date: 2023-01-07 22:25:43
|
||||
* @LastEditors: Kane
|
||||
* @LastEditTime: 2023-01-11 09:44:46
|
||||
* @FilePath: \admin_system\src\store\modules\app.js
|
||||
* @LastEditTime: 2023-02-05 10:47:28
|
||||
* @FilePath: /IT工具综合平台/src/store/modules/app.js
|
||||
* @Description: vuex中存放全局数据的模块
|
||||
*
|
||||
* Copyright (c) ${2022} by Kane, All Rights Reserved.
|
||||
*/
|
||||
const state = {
|
||||
count: 1001,
|
||||
asideBarCollapse: false, //侧边栏折叠标志位
|
||||
userInfo: null, //用户信息和token
|
||||
ui:{ //ui相关的数据
|
||||
asideBarCollapse: false, //侧边栏折叠标志位
|
||||
|
||||
},
|
||||
};
|
||||
const getters = {};
|
||||
const mutations = {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: Kane
|
||||
* @Date: 2023-02-04 15:48:00
|
||||
* @LastEditors: Kane
|
||||
* @LastEditTime: 2023-02-04 17:11:07
|
||||
* @LastEditTime: 2023-02-05 11:47:17
|
||||
* @FilePath: /IT工具综合平台/src/utils/api/requirement/requirement.js
|
||||
* @Description:
|
||||
*
|
||||
@ -10,15 +10,42 @@
|
||||
*/
|
||||
import instance from "@/utils/api/request";
|
||||
import { API_URL } from "@/utils/api/config";
|
||||
import router from "@/router/index";
|
||||
|
||||
function query_requirement_status()
|
||||
/*****************************************************
|
||||
* 从后台获取需求管理页面所需数据，存放到vuex中。
|
||||
* @param ui 保存ui标志位的对象
|
||||
* @param store 保存在vuex中需求相关的对象
|
||||
* @param error_page_name 提示错误页面的路径
|
||||
*****************************************************/
|
||||
function query_requirement_ui(requirement_store, error_page_name)
|
||||
{
|
||||
return instance.request(
|
||||
//发送请求
|
||||
instance.request(
|
||||
{
|
||||
method: "post",
|
||||
url: API_URL.URL_QUERY_REQUIREMENT_STATUS,
|
||||
})
|
||||
.then((response) =>
|
||||
{
|
||||
const data = response.data;
|
||||
|
||||
if (data.success === true)
|
||||
{
|
||||
requirement_store.status = data.requirement_status;
|
||||
}
|
||||
);
|
||||
})
|
||||
.catch((error) =>
|
||||
{
|
||||
console.log("获取需求后台数据失败", error);
|
||||
router.push(
|
||||
{
|
||||
name: error_page_name,
|
||||
query: {
|
||||
error
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
export { query_requirement_status };
|
||||
export { query_requirement_ui };
|
||||
@ -66,8 +66,9 @@
|
||||
|
||||
<script >
|
||||
import { reactive, onBeforeMount } from "vue";
|
||||
import { useStore } from "vuex";
|
||||
import { useRouter } from "vue-router";
|
||||
import { query_requirement_status } from "@/utils/api/requirement/requirement.js";
|
||||
import { query_requirement_ui } from "@/utils/api/requirement/requirement.js";
|
||||
|
||||
export default {
|
||||
name: "DeskTop",
|
||||
@ -76,6 +77,7 @@ export default {
|
||||
let start_date = reactive(new Date());
|
||||
let end_date = reactive(new Date());
|
||||
const router = useRouter();
|
||||
const store = useStore();
|
||||
|
||||
onBeforeMount(() =>
|
||||
{
|
||||
@ -87,20 +89,13 @@ export default {
|
||||
|
||||
const testRequest = () =>
|
||||
{
|
||||
// const ui = store.state.app.ui;
|
||||
// const requirement = store.state.requirement;
|
||||
//加载数据;
|
||||
query_requirement_status()
|
||||
.then((response) =>
|
||||
{
|
||||
// debugger;
|
||||
const data = response.data;
|
||||
query_requirement_ui(store);
|
||||
|
||||
console.log(data);
|
||||
})
|
||||
.catch((error) =>
|
||||
{
|
||||
// debugger;
|
||||
console.log(error);
|
||||
});
|
||||
console.log(store.state.app);
|
||||
console.log(store.state.requirement);
|
||||
};
|
||||
|
||||
const testError = () =>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: Kane
|
||||
* @Date: 2023-02-02 22:19:12
|
||||
* @LastEditors: Kane
|
||||
* @LastEditTime: 2023-02-04 11:56:05
|
||||
* @LastEditTime: 2023-02-05 11:52:27
|
||||
* @FilePath: /IT工具综合平台/src/views/requirement/RequirementManager.vue
|
||||
* @Description:
|
||||
*
|
||||
@ -39,7 +39,7 @@
|
||||
<el-col :span="4">
|
||||
<!-- <el-input v-model="query_param.status"></el-input> -->
|
||||
<el-select multiple collapse-tags collapse-tags-tooltip v-model.trim.lazy="query_param.status">
|
||||
<el-option v-for="option in ui.requirement_status" :value="option" :key="option"></el-option>
|
||||
<el-option v-for="option in statusData" :value="option.status_name" :key="option.status_code + option.status_name"></el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="6"></el-col>
|
||||
@ -231,14 +231,15 @@ import { reactive, computed, onBeforeMount } from "vue";
|
||||
//import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
|
||||
import { requirementTestData } from '@/test/data/TestData';
|
||||
import { useRouter } from "vue-router";
|
||||
//import router from "@/router/index";
|
||||
import {useStore} from "vuex";
|
||||
import {query_requirement_ui} from "@/utils/api/requirement/requirement";
|
||||
|
||||
export default {
|
||||
name: "requirement-manager",
|
||||
setup()
|
||||
{
|
||||
const router = useRouter();
|
||||
|
||||
const store = useStore();
|
||||
const requirement_data = requirementTestData;
|
||||
const ui = reactive(
|
||||
{
|
||||
@ -275,6 +276,11 @@ export default {
|
||||
return requirement_data.slice(startIndex, endIndex);
|
||||
});
|
||||
|
||||
const statusData = computed(()=>
|
||||
{
|
||||
return store.state.requirement.status;
|
||||
});
|
||||
|
||||
const onTablePageSizeChange = (pageSize) =>
|
||||
{
|
||||
console.log("选择的pageSize", pageSize);
|
||||
@ -336,6 +342,13 @@ export default {
|
||||
query_param.commit_start_date.setMonth(query_param.commit_end_date.getMonth() - 1);
|
||||
});
|
||||
|
||||
//加载数据
|
||||
query_requirement_ui( store.state.requirement, "ErrorPage" );
|
||||
|
||||
//输出控制台
|
||||
console.log(store.state.app);
|
||||
console.log(store.state.requirement);
|
||||
|
||||
return {
|
||||
//data
|
||||
requirement_data,
|
||||
@ -344,6 +357,7 @@ export default {
|
||||
//计算属性
|
||||
tableHeight,
|
||||
tableData,
|
||||
statusData,
|
||||
//方法
|
||||
editRequirement,
|
||||
addNewRequirement,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user