Skip to content

P
projectMgmtClient
Commit 79badce1 by 孙香冬
Options

no message

parent 824bd438
Showing with 102 additions and 35 deletions
src/App.vue
......@@ -34,6 +34,12 @@ export default {
list-style: none;
}
.pull-right {
float: right;
display: inline-block;
clear: both;
}
/* #app {
top: 0;
left: 50%;
......
src/pages/boss/createProject.vue
......@@ -2,9 +2,9 @@
<div class="createProjectBox">
<div class="createProjectMainBox">
<el-card class="box-card">
<el-form ref="form" label-width="80px">
<el-form ref="form" label-width="100px">
<el-form-item label="项目名称">
<el-input size="mini" style="width:400px" v-model="projectName"></el-input>
<el-input size="mini" style="width:600px" v-model="projectName"></el-input>
</el-form-item>
<el-form-item label="项目类型 ">
<el-select size="mini" v-model="projectType" placeholder="请选择">
......@@ -19,14 +19,14 @@
<el-form-item label="项目背景">
<el-input type="textarea" size="mini"
resize="none"
style="width:400px"
style="width:600px"
:rows="8"
v-model="projectDes"></el-input>
</el-form-item>
</el-form>
<div class="null40Div"></div>
<div class="createProjectButtonBox">
<el-button @click="createProject" size="mini" round>创建项目</el-button>
<el-button type="primary" @click="createProject" plain>主要按钮</el-button>
</div>
</el-card>
</div>
......@@ -68,21 +68,27 @@ export default {
.createProjectBox{
width: 100%;
}
.createProjectBox .createProjectMainBox {
width: 66%;
}
.createProjectBox .createProjectMainBox .el-card {
box-shadow: 0 2px 12px 0 rgba(252, 252, 252, 0.144);
background-color: rgb(255 255 255 / 15%);
border-radius: 6px;
}
.createProjectBox .createProjectMainBox .el-form-item__label {
color: aliceblue;
color: rgb(0, 0, 0);
font-size: 16px;
}
.createProjectBox .createProjectMainBox .createProjectButtonBox {
width: 95%;
width: 95%;
height: 40px;
text-align: center;
}
.createProjectBox .createProjectMainBox .el-card_body {
background-color: #fff;
}
.createProjectButtonBox .el-button {
background-color: rgb(255, 134, 54);
color: #fff;
border: #fff 1px solid;
font-size: 16px;
}
</style>
\ No newline at end of file
src/pages/project/projectList.vue
......@@ -144,7 +144,7 @@ export default {
height: 100% !important;
width: 100% !important;
border-radius: 0px;
background-color: rgb(229 120 11);
background-color: rgb(230, 131, 33);
border-color: rgb(255 255 255 / 35%);
}
......
src/pages/project/task.vue
......@@ -22,17 +22,15 @@
<div class="desBox">距离提交日剩余
<font v-if="item.day <= 3" style="color:red;"> {{item.day}} </font>
<font v-else-if="item.day <= 5" style="color:rgb(255, 172, 62);"> {{item.day}} </font>
<font v-else> {{item.day}} </font>
天
<el-button class="upTaskBox" size="mini">提交任务</el-button>
<font v-else> {{item.day}} </font> 天
<el-button class="upTaskBox" size="mini" @click="submit">提交任务</el-button>
</div>
<div class="buttonBox">
<el-upload
action="http://192.168.0.105:6068/file/upfile"
action="http://192.168.0.47:6066/files"
:on-change="handleChange"
:data="paramaterObj">
<el-button size="small" type="primary">{{item.haveUp}}</el-button>
<el-button size="small" type="primary" @click="uploadFiles">{{item.haveUp}}</el-button>
</el-upload>
</div>
</div>
......@@ -65,6 +63,7 @@ export default {
{pName:"徐汇教育局二期", status:"success", day:10, process:80, haveUp:"重新上传" },
{pName:"长三角", status:"success", day:10, process:100, haveUp:"重新上传" },
];
this.submitUpload();
},
methods:{
initMyTaskList:async function() {
......@@ -84,6 +83,18 @@ export default {
this.$message.error("提交失败");
}
},
uploadFiles:async function() {
let result = await this.$store.dispatch('files/uploadFiles', {filename, fType, pId});
console.log(result);
if (result && result.data && result.data.isOk) {
console.log("成功");
this.$message.success("上传成功");
this.$refs.upload.submit();
} else {
this.$message.error("上传失败");
}
// this.$refs.upload.submit();
},
handleChange() {
}
......@@ -202,4 +213,13 @@ export default {
.myTaskBaseBox .onceProjectCheckBox .el-progress__text {
color: rgb(255, 255, 255);
}
.el-upload-list {
width: 300px;
height: 30px;
border: 1px solid #000;
}
.el-upload-list li{
width: 300px;
height: 30px;
}
</style>
\ No newline at end of file
src/pages/self/addNotebook.vue
......@@ -27,8 +27,12 @@
<el-input v-model="title" style="width:60%" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="内容：">
<el-input resize="none" v-model="body" type="textarea" :autosize="{ minRows: 25, maxRows: 25}" style="width:60%" placeholder="请输入内容"></el-input>
<el-input resize="none" v-model="body" type="textarea" :autosize="{ minRows: 20, maxRows: 20}" style="width:60%" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="">
<el-button type="primary" plain class="pull-right">确 认</el-button>
</el-form-item>
</el-form>
</div>
</template>
......@@ -85,4 +89,12 @@ export default {
.addNotebookBox .el-radio {
color: rgb(0, 0, 0);
}
.addNotebookBox .pull-right {
width: 100px !important;
background-color: rgb(255, 134, 54);
color: #fff;
border: #fff 1px solid;
font-size: 16px;
}
</style>
\ No newline at end of file
src/pages/self/fileInfo.vue
......@@ -28,24 +28,32 @@ const docx = require("docx-preview");
export default {
data() {
return {
pId:this.checkId,
vHtml:"",
thisFileList:[],
}
},
mounted:function() {
this.initFile();
this.initFileList();
this.initFileList(this.pId);
},
methods: {
initFileList() {
this.thisFileList = [
{fileName:"科艺统一认证对接文档.docs", userName:"张三"},
{fileName:"科艺统一认证对接文档.docs", userName:"张三"},
{fileName:"科艺统一认证对接文档.docs", userName:"张三"},
{fileName:"科艺统一认证对接文档.docs", userName:"张三"},
{fileName:"科艺统一认证对接文档.docs", userName:"张三"},
{fileName:"科艺统一认证对接文档.docs", userName:"张三"},
];
async initFileList(pId) {
this.pid = pId;
let result = await this.$store.dispatch('files/getProjectFile', {pId});
if (result && result.data && result.data.fileInfo) {
this.thisFileList = result.data.fileInfo;
} else {
this.$message.error("获取文件失败");
}
// this.thisFileList = [
// {fileName:"科艺统一认证对接文档.docs", userName:"张三"},
// {fileName:"科艺统一认证对接文档.docs", userName:"张三"},
// {fileName:"科艺统一认证对接文档.docs", userName:"张三"},
// {fileName:"科艺统一认证对接文档.docs", userName:"张三"},
// {fileName:"科艺统一认证对接文档.docs", userName:"张三"},
// {fileName:"科艺统一认证对接文档.docs", userName:"张三"},
// ];
},
initFile:function() {
let url = "http://192.168.0.105:6066/test.docx";
......@@ -61,7 +69,7 @@ export default {
}
};
xhr.send();
}
},
},
}
</script>
......
src/pages/self/notebook.vue
......@@ -2,7 +2,7 @@
<div class="notebookBox">
<div class="selectNotebookBox">
<div class="addNotebookBox">
<el-button type="primary" @click="addNotebookEvent"><font style="font-size:20px" class="el-icon-plus"></font></el-button>
<el-button type="primary" @click="addNotebookEvent"><font style="font-size:20px; color:#fff;" class="el-icon-plus"></font></el-button>
</div>
</div>
<div class="notebookMainBox">
......@@ -115,9 +115,10 @@ export default {
height: 100% !important;
width: 100% !important;
border-radius: 0px;
background-color:rgb(229 120 11);
background-color:rgb(255, 134, 54);
border-color: rgb(107, 107, 107);
box-shadow: 0 2px 10px 0 rgba(110, 110, 110, 0.705);
border: 1px #fff solid;
}
/* 弹出框 */
......
src/server/axiosInstance.js
import axios from 'axios'
const serverUrl = 'http://192.168.0.105:6066';
const serverUrl = 'http://192.168.0.47:6066';
let server = axios.create({
baseURL: serverUrl,
......
src/server/menu.js
......@@ -26,6 +26,7 @@ let picList = [
{subName:"笔记", path:"/desk/notebook"},
{subName:"文件仓库", path:"/desk/files"},
{subName:"项目列表", path:"/project/projectList"},
{subName:"新建项目", path:"/boss/createProject"},
]
},
{
......
src/server/url.js
......@@ -24,4 +24,8 @@ export const feedbackUrlConfig = {
export const publicUrlConfig = {
"成员列表":"/api/member/memberlist",
"反馈用成员列表":"/api/member/feedbackmemberlist",
};
\ No newline at end of file
};
export const filesUrlConfig = {
"上传文件":"/api/files/uploadfiles",
}
\ No newline at end of file
src/store/project/actions.js
import postReq from '../../server/axiosInstance';
import { projectUrlConfig } from '../../server/url';
import { projectUrlConfig, filesUrlConfig } from '../../server/url';
//获取列表
......@@ -33,3 +33,8 @@ export async function myTaskList({commit}, payload) {
export async function submitTask({commit}, payload) {
return await postReq(projectUrlConfig.提交任务, payload);
}
//上传文件
export async function uploadFiles({commit}, payload) {
return await postReq(filesUrlConfig.上传文件, payload);
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment