保存进度!
This commit is contained in:
parent
a6f2ec63ef
commit
8d1f4e5a1c
|
@ -2,7 +2,7 @@
|
||||||
* @Author: Kane
|
* @Author: Kane
|
||||||
* @Date: 2023-01-04 11:05:44
|
* @Date: 2023-01-04 11:05:44
|
||||||
* @LastEditors: Kane
|
* @LastEditors: Kane
|
||||||
* @LastEditTime: 2023-01-26 10:29:03
|
* @LastEditTime: 2023-01-28 23:35:47
|
||||||
* @FilePath: \admin_system\src\layout\Index.vue
|
* @FilePath: \admin_system\src\layout\Index.vue
|
||||||
* @Description:
|
* @Description:
|
||||||
*
|
*
|
||||||
|
@ -51,8 +51,6 @@ export default {
|
||||||
#layout-container {
|
#layout-container {
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
max-height: 100vh;
|
max-height: 100vh;
|
||||||
/* overflow: hiddens; */
|
|
||||||
/* min-width: 1280px; */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#layout-container-down {
|
#layout-container-down {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* @Author: Kane
|
* @Author: Kane
|
||||||
* @Date: 2022-12-14 15:12:46
|
* @Date: 2022-12-14 15:12:46
|
||||||
* @LastEditors: Kane
|
* @LastEditors: Kane
|
||||||
* @LastEditTime: 2023-01-28 16:00:58
|
* @LastEditTime: 2023-01-28 21:38:31
|
||||||
* @FilePath: \admin_system\src\router\index.js
|
* @FilePath: \admin_system\src\router\index.js
|
||||||
* @Description: 定义应用路由配置
|
* @Description: 定义应用路由配置
|
||||||
*
|
*
|
||||||
|
@ -41,6 +41,7 @@ const routes = [
|
||||||
title: "总览",
|
title: "总览",
|
||||||
icon: "house",
|
icon: "house",
|
||||||
},
|
},
|
||||||
|
component: () => import("../layout/Index.vue"),
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
path: "/desktop",
|
path: "/desktop",
|
||||||
|
@ -52,7 +53,6 @@ const routes = [
|
||||||
component: () => import("../views/overview/OverView.vue"),
|
component: () => import("../views/overview/OverView.vue"),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
component: () => import("../layout/Index.vue"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
//需求管理
|
//需求管理
|
||||||
|
@ -193,14 +193,14 @@ router.beforeEach((to) =>
|
||||||
}
|
}
|
||||||
|
|
||||||
//修改默认打开的页面,跳向工作台
|
//修改默认打开的页面,跳向工作台
|
||||||
if (to.name === "Home")
|
// if (to.name === "Home")
|
||||||
{
|
// {
|
||||||
console.log("跳向工作台");
|
// console.log("跳向工作台");
|
||||||
|
|
||||||
return {
|
// return {
|
||||||
name: "DeskTop",
|
// name: "DeskTop",
|
||||||
};
|
// };
|
||||||
}
|
// }
|
||||||
});
|
});
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* @Author: Kane
|
* @Author: Kane
|
||||||
* @Date: 2022-12-14 15:23:54
|
* @Date: 2022-12-14 15:23:54
|
||||||
* @LastEditors: Kane
|
* @LastEditors: Kane
|
||||||
* @LastEditTime: 2023-01-18 22:24:21
|
* @LastEditTime: 2023-01-28 21:35:47
|
||||||
* @FilePath: \admin_system\src\views\account\Login.vue
|
* @FilePath: \admin_system\src\views\account\Login.vue
|
||||||
* @Description:
|
* @Description:
|
||||||
*
|
*
|
||||||
|
@ -139,7 +139,7 @@ export default {
|
||||||
this.saveUserInfo(data);
|
this.saveUserInfo(data);
|
||||||
|
|
||||||
//验证成功,跳转路由
|
//验证成功,跳转路由
|
||||||
router.push("/home");
|
router.push("/Desktop");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* @Author: Kane
|
* @Author: Kane
|
||||||
* @Date: 2023-01-25 23:13:47
|
* @Date: 2023-01-25 23:13:47
|
||||||
* @LastEditors: Kane
|
* @LastEditors: Kane
|
||||||
* @LastEditTime: 2023-01-28 17:44:26
|
* @LastEditTime: 2023-01-28 23:40:51
|
||||||
* @FilePath: \admin_system\src\views\requirement\RequirementManager.vue
|
* @FilePath: \admin_system\src\views\requirement\RequirementManager.vue
|
||||||
* @Description:
|
* @Description:
|
||||||
*
|
*
|
||||||
|
@ -121,64 +121,90 @@
|
||||||
</el-pagination>
|
</el-pagination>
|
||||||
</div>
|
</div>
|
||||||
<!-- 需求详细信息对话框 -->
|
<!-- 需求详细信息对话框 -->
|
||||||
<el-dialog class="requirement-detail-dialog" v-model="dialogRequirementDetailVisible" width="55%"
|
<el-dialog title="需求内容" class="requirement-detail-dialog" v-model="dialogRequirementDetailVisible" width="900px"
|
||||||
:close-on-click-modal="true" :close-on-press-escape="false" :show-close="false" title="需求详情">
|
:close-on-click-modal="true" :close-on-press-escape="false" :show-close="true" :center="false">
|
||||||
<el-scrollbar height="300px">
|
<el-tabs v-model="activeTabName">
|
||||||
<div class="requirement-detail-wrapper" style="padding: 0px 10px;">
|
<el-tab-pane name="requirement-detail" label="详情">
|
||||||
<el-row :gutter="10">
|
<el-scrollbar height="300px">
|
||||||
<el-col :span="2">
|
<div class="requirement-detail-wrapper">
|
||||||
<span>标题</span>
|
<el-row :gutter="10">
|
||||||
</el-col>
|
<el-col :span="2">
|
||||||
<el-col :span="22">
|
<span>标题</span>
|
||||||
<el-input></el-input>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="22">
|
||||||
</el-row>
|
<el-input></el-input>
|
||||||
<el-row :gutter="10">
|
</el-col>
|
||||||
<el-col :span="2">
|
</el-row>
|
||||||
<span>需求编号</span>
|
<el-row :gutter="10">
|
||||||
</el-col>
|
<el-col :span="2">
|
||||||
<el-col :span="6">
|
<span>需求编号</span>
|
||||||
<el-input v-model="query_param.requirement_serial"></el-input>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="6">
|
||||||
<el-col :span="2">
|
<el-input v-model="query_param.requirement_serial"></el-input>
|
||||||
<span>申请人</span>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="2">
|
||||||
<el-col :span="6">
|
<span>申请人</span>
|
||||||
<el-input v-model="query_param.request_people"></el-input>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="6">
|
||||||
<el-col :span="2">
|
<el-input v-model="query_param.request_people"></el-input>
|
||||||
<span>状态</span>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="2">
|
||||||
<el-col :span="6">
|
<span>状态</span>
|
||||||
<!-- <el-input v-model="query_param.status"></el-input> -->
|
</el-col>
|
||||||
<el-select multiple collapse-tags collapse-tags-tooltip v-model="query_param.status">
|
<el-col :span="6">
|
||||||
<el-option v-for="option in requirement_status" :value="option"
|
<!-- <el-input v-model="query_param.status"></el-input> -->
|
||||||
:key="option"></el-option>
|
<el-select multiple collapse-tags collapse-tags-tooltip
|
||||||
</el-select>
|
v-model="query_param.status">
|
||||||
</el-col>
|
<el-option v-for="option in requirement_status" :value="option"
|
||||||
</el-row>
|
:key="option"></el-option>
|
||||||
<el-row :gutter="10">
|
</el-select>
|
||||||
<el-col :span="2">
|
</el-col>
|
||||||
<span>提交日期</span>
|
</el-row>
|
||||||
</el-col>
|
<el-row :gutter="10">
|
||||||
<el-col :span="6">
|
<el-col :span="2">
|
||||||
<el-date-picker v-model="query_param.submit_start_date"
|
<span>提交日期</span>
|
||||||
style="width:100%;"></el-date-picker>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="6">
|
||||||
<el-col :span="2">
|
<el-date-picker v-model="query_param.submit_start_date"
|
||||||
<span>至</span>
|
style="width:100%;"></el-date-picker>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="2">
|
||||||
<el-date-picker v-model="query_param.submit_end_date" style="width:100%;"></el-date-picker>
|
<span>至</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
<el-col :span="6">
|
||||||
</div>
|
<el-date-picker v-model="query_param.submit_end_date"
|
||||||
</el-scrollbar>
|
style="width:100%;"></el-date-picker>
|
||||||
<template #footer>
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
</el-scrollbar>
|
||||||
|
</el-tab-pane>
|
||||||
|
<el-tab-pane name="issue-date" label="排期">
|
||||||
|
<el-scrollbar height="300px">
|
||||||
|
<el-table style="width:100%;" border stripe>
|
||||||
|
<el-table-column label="需求编号" align="center" min-width="200"></el-table-column>
|
||||||
|
<el-table-column label="初次排期" align="center" width="200"></el-table-column>
|
||||||
|
<el-table-column label="最终排期" align="center" width="200"></el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</el-scrollbar>
|
||||||
|
</el-tab-pane>
|
||||||
|
<el-tab-pane name="comment" label="备注">
|
||||||
|
<el-scrollbar height="400px">
|
||||||
|
<p>hello world</p>
|
||||||
|
<p><span style="font-size: 24px;">ejfalsjfoewafsdjfdsfewo;sd;fk</span></p>
|
||||||
|
<ol>
|
||||||
|
<li><span style="color: rgb(225, 60, 57); font-size: 24px;">12344</span></li>
|
||||||
|
<li><span style="font-size: 24px;">33445</span></li>
|
||||||
|
</ol>
|
||||||
|
<p><br></p>
|
||||||
|
</el-scrollbar>
|
||||||
|
</el-tab-pane>
|
||||||
|
</el-tabs>
|
||||||
|
<!-- <template #footer>
|
||||||
<div class="dialogFooter">
|
<div class="dialogFooter">
|
||||||
<el-button type="primary" @click="dialogRequirementDetailVisible = false;">关闭</el-button>
|
<el-button type="primary" @click="dialogRequirementDetailVisible = false;">关闭</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template> -->
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -204,6 +230,7 @@ export default {
|
||||||
"未提交", "部门审核", "需求分析", "技术开发", "待发布", "已发布", "被退回",
|
"未提交", "部门审核", "需求分析", "技术开发", "待发布", "已发布", "被退回",
|
||||||
],
|
],
|
||||||
dialogRequirementDetailVisible: false, //需求详情对话框是否显示
|
dialogRequirementDetailVisible: false, //需求详情对话框是否显示
|
||||||
|
activeTabName: "requirement-detail",
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
@ -353,11 +380,15 @@ export default {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: left;
|
justify-content: left;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
/* margin-top: 10px; */
|
||||||
|
}
|
||||||
|
|
||||||
|
.requirement-detail-dialog .el-row+.el-row {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.requirement-detail-wrapper {
|
.requirement-detail-wrapper {
|
||||||
padding: 0 10px;
|
padding: 0px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.requirement-detail-wrapper span {
|
.requirement-detail-wrapper span {
|
||||||
|
@ -366,3 +397,8 @@ export default {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
<style>
|
||||||
|
.requirement-detail-dialog .el-dialog__body {
|
||||||
|
padding: 0px 15px !important;
|
||||||
|
}
|
||||||
|
</style>
|
Loading…
Reference in New Issue