Skip to content

9
912project
提交 b9ec06d3 authored 作者: zax's avatar zax
浏览文件
操作

合并分支 'zax' 到 'master'

软件清单 查看合并请求 !55
上级 a6ece57a c4366db3
隐藏空白字符变更
内嵌 并排
正在显示 包含 122 行增加 和 52 行删除
src/assets/changeElementStyle.css
浏览文件 @ b9ec06d3
......@@ -201,3 +201,6 @@
font-size: 18px;
vertical-align: middle;
}
.el-upload-list{
display: none;
}
\ No newline at end of file
src/components/projectManagement/document/document.vue
浏览文件 @ b9ec06d3
......@@ -4,12 +4,12 @@
<el-row>
<el-col :span="24">
<div class="content">
<p class="search">
<span class="searchVal">
<el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input>
</span>
<span class="button buttonSave">搜索</span>
</p>
<!-- <p class="search">-->
<!-- <span class="searchVal">-->
<!-- <el-input v-model="searchVal" size="medium" @change="search('search')" placeholder="请输入"></el-input>-->
<!-- </span>-->
<!-- <span class="button buttonSave" @click="search('search')">搜索</span>-->
<!-- </p>-->
<div class="common-table">
<el-table
highlight-current-row
......@@ -23,33 +23,35 @@
align="center">
</el-table-column>
<el-table-column
prop="roleName"
:formatter="timeChange"
prop="createTime"
label="创建时间"
align="center">
</el-table-column>
<el-table-column
prop="unitName"
:formatter="uploadTimeChange"
prop="uploadTime"
label="最近提交时间"
align="center">
</el-table-column>
<el-table-column
prop="number"
prop="userName"
label="提交人"
align="center">
</el-table-column>
<el-table-column
label="操作"
align="center">
<template >
<span class="button buttonSave buttonHandle">下载</span>
<template slot-scope="scope">
<span class="button buttonSave buttonHandle" @click="download(scope.row)">下载</span>
<span class="button buttonSave buttonHandle">
上传
<el-upload
style="margin-top: -43px;"
style="margin-top: -38px;width: 58px;position: absolute; right: 27px;"
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:before-upload="uploadFile">
<el-button size="small" type="primary"></el-button>
<el-button size="small" @click="upLoad(scope.row)" type="primary" style="background-color: rgba(0,0,0,0);border: none"></el-button>
</el-upload>
</span>
</template>
......@@ -65,7 +67,7 @@
:page-size="pageSize"
background
layout="prev, pager, next, jumper"
:total="totleLength">
:total="totalLength">
</el-pagination>
</div>
<!-- 分页 -->
......@@ -86,6 +88,7 @@ export default {
currentPage: 1, // 分页第一页
pageSize: 8, // 每页个数
totalLength: 0, // 获取后台传的所有数据的长度
fileId: ''
}
},
mounted() {
......@@ -94,14 +97,27 @@ export default {
},
methods: {
// 查询
search () {
let data = {
page: this.currentPage,
pageSize: this.pageSize,
t: {
projectId: this.value.id
search (val) {
let data = {}
if (val === 'search') {
data = {
page: 1,
pageSize: this.pageSize,
t: {
projectId: this.value.id,
name: this.searchVal
}
}
} else {
data = {
page: this.currentPage,
pageSize: this.pageSize,
t: {
projectId: this.value.id
}
}
}
this.$server.postFileSearch(data).then(res => {
console.log(res.data.data.rows)
this.totalLength = res.data.data.total;
......@@ -114,19 +130,58 @@ export default {
},
// 当前页数
handleCurrentChange(val) {
// console.log(`当前页: ${val}`);
this.currentPage = val;
this.search();
},
// 文件下载
download (val) {
if (val.path) {
let link = document.createElement('a');
link.download ='文件';
link.style.display = 'none';
link.href = val.path;
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
} else {
this.$message('没有文件可以下载');
}
},
// 文件上传id获取
upLoad(row) {
this.fileId = row.id;
},
// 文件上传
uploadFile(file) {
let formdata = new FormData();
formdata.append('file', file);
let data = {
id: this.value.id,
id: this.fileId,
value: formdata
}
this.$server.postFileUpload(this.value.id).then(res => {
console.log(res)
this.$server.postFileUpload(data).then(res => {
if (res.data.code === 200) {
this.$message.success('文件上传成功！');
this.search('search');
} else {
this.$message.error('文件上传失败！');
}
}).catch(err => {
this.$message.error('文件上传失败！');
})
},
// 时间转换
timeChange(row) {
if (row.createTime) {
let d = new Date(row.createTime);
return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
}
},
uploadTimeChange(row) {
if (row.uploadTime) {
let d = new Date(row.uploadTime);
return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
}
}
}
}
......@@ -153,27 +208,21 @@ export default {
margin-left: 12px;
}
.document .content .buttonHandle{
width: 50px;
display: initial;
width: 58px;
}
/*上传按钮*/
.document .content>>>.el-button--small{
font-size: 18px;
}
.document .content>>>.el-button--primary{
background-color: rgba(0,0,0,0);
border-color: rgba(0,0,0,0);
margin-left: 62px;
width: 39px;
}
.el-checkbox__input.is-checked{
background: url('./img/click.png');
}
.document .content>>> .el-checkbox__inner{
background: url('./img/clickN.png') !important;
}
.document .el-checkbox__input.is-disabled + span.el-checkbox__label{
color: #333333 !important;
font-size: 18px;
}
.document .content .el-table--enable-row-hover .el-table__body tr:hover>td>span{
background-color: #d5e3ff;
color: #fff;
}
.document .content>>>.el-upload{
width: 100%;
}
</style>
src/components/projectManagement/project/projectAdd.vue
浏览文件 @ b9ec06d3
......@@ -235,7 +235,7 @@
align="center">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.time"
v-model="scope.row.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
......@@ -268,7 +268,7 @@
</div>
<p class="search">
<span class="search-input" style="width: 100%">
<span style="text-align: left">备注:</span>
<span style="text-align: left;width: 55px">备注:</span>
<el-input type="textarea" :rows="2" v-model="textarea" placeholder="请输入"></el-input>
</span>
</p>
......@@ -464,20 +464,24 @@ export default {
techId: techId,
techName: this.techVal,
thirdId: thirdId,
thirdName: this.supervisor
thirdName: this.supervisor,
des: this.textarea
};
console.log(data)
this.$server.postProjectAdd(data).then(res => {
console.log(res)
if (res.data.code === 200) {
this.$message.success('项目新增成功！');
this.$router.push({name: 'projectManagement'});
} else {
if (this.supervisor && this.endTime && this.startTime && this.develop && this.integrate && this.build) {
this.$server.postProjectAdd(data).then(res => {
console.log(res)
if (res.data.code === 200) {
this.$message.success('项目新增成功！');
this.$router.push({name: 'projectManagement'});
} else {
this.$message.error('项目新增失败！');
}
}).catch(err => {
this.$message.error('项目新增失败！');
}
}).catch(err => {
this.$message.error('项目新增失败！');
})
})
} else {
this.$message.error('基本信息项不可为空！');
}
},
// 技术路线查询产品信息
search () {
......
src/services/server.js
浏览文件 @ b9ec06d3
......@@ -239,6 +239,19 @@ const server = {
method: 'post',
data: data
})
},
postFileSearch(data) { // 项目管理文件清单分页查询
return axios('/file/search', {
method: 'post',
data: data
})
},
postFileUpload(data) { // 项目管理文件清单文件上传
return axios('/file/upload/' + data.id, {
method: 'post',
data: data.value,
headers: {'Content-Type': 'multipart/form-data'}
});
}
}
export default server;
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论