Skip to content

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

项目新增

上级 13a6472b
隐藏空白字符变更
内嵌 并排
正在显示 包含 237 行增加 和 107 行删除
src/assets/changeElementStyle.css
浏览文件 @ 480a9aa7
...@@ -158,3 +158,36 @@ ...@@ -158,3 +158,36 @@
font-size: 18px; font-size: 18px;
font-family: 'Regular'; font-family: 'Regular';
} }
/*checkbox选择款*/
.el-checkbox__input.is-disabled .el-checkbox__inner,.el-checkbox__input.is-checked .el-checkbox__inner{
width: 21px;
height: 21px;
background-image: url("../assets/img/click.png");
background-repeat: no-repeat;
background-size: 100% 100%;
-moz-background-size: 100% 100%;
background-color: rgba(0,0,0,0);
border-color: rgba(0,0,0,0);
}
.el-checkbox__inner{
width: 21px;
height: 21px;
background-image: url("../assets/img/clickN.png");
background-repeat: no-repeat;
background-size: 100% 100%;
-moz-background-size: 100% 100%;
background-color: rgba(0,0,0,0);
border-color: rgba(0,0,0,0);
}
.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner,.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
background-color: rgba(0,0,0,0);
border-color: rgba(0,0,0,0);
}
.el-checkbox__input.is-checked .el-checkbox__inner::after{
display: none;
}
.el-checkbox__label,.el-checkbox__input.is-checked + .el-checkbox__label,.el-checkbox__input.is-disabled + span.el-checkbox__label{
color: #333333;
font-size: 18px;
vertical-align: middle;
}
src/components/projectManagement/document/document.vue
浏览文件 @ 480a9aa7
...@@ -41,7 +41,17 @@ ...@@ -41,7 +41,17 @@
label="操作" label="操作"
align="center"> align="center">
<template > <template >
<span class="change">下载</span> <span class="button buttonSave buttonHandle">下载</span>
<span class="button buttonSave buttonHandle">
上传
<el-upload
style="margin-top: -43px;"
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:before-upload="uploadFile">
<el-button size="small" type="primary"></el-button>
</el-upload>
</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -52,7 +62,7 @@ ...@@ -52,7 +62,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size="pagesize" :page-size="pageSize"
background background
layout="prev, pager, next" layout="prev, pager, next"
:total="totleLength"> :total="totleLength">
...@@ -71,13 +81,27 @@ export default { ...@@ -71,13 +81,27 @@ export default {
data () { data () {
return { return {
searchVal: '', searchVal: '',
allData: [], allData: [{name:'1',roleName: '123',unitName: '1',number: '1'}],
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 7, // 每页个数 pageSize: 8, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
} }
}, },
mounted() {
this.search();
},
methods: { methods: {
// 查询
search () {
let data = {
page: this.currentPage,
pageSize: this.pageSize,
t: {}
}
this.$server.postFileSearch(data).then(res => {
console.log(res)
})
},
// 点击分页 // 点击分页
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
...@@ -86,12 +110,13 @@ export default { ...@@ -86,12 +110,13 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
// console.log(`当前页: ${val}`); // console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
} },
uploadFile(file) {}
} }
} }
</script> </script>
<style scoped> <style>
.document{ .document{
width: 100%; width: 100%;
height: 841px; height: 841px;
...@@ -111,4 +136,28 @@ export default { ...@@ -111,4 +136,28 @@ export default {
.document .content .button { .document .content .button {
margin-left: 12px; margin-left: 12px;
} }
.document .content .buttonHandle{
width: 50px;
display: initial;
}
/*上传按钮*/
.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;
}
</style> </style>
src/components/projectManagement/project/projectAdd.vue
浏览文件 @ 480a9aa7
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
label="类型" label="类型"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.form" @change="typeVal($event)" placeholder="请选择" clearable> <el-select v-model="scope.row.form" placeholder="请选择" clearable>
<el-option <el-option
v-for="item in formList" v-for="item in formList"
:key="item.id" :key="item.id"
...@@ -222,17 +222,12 @@ ...@@ -222,17 +222,12 @@
prop="name" prop="name"
label="里程碑编号" label="里程碑编号"
align="center"> align="center">
<template slot-scope="scope">
<span>{{scope.row.name}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
:formatter="typeChange"
prop="type" prop="type"
label="里程碑名称" label="里程碑名称"
align="center"> align="center">
<template slot-scope="scope">
<span>{{scope.row.type}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="startTime" prop="startTime"
...@@ -252,14 +247,17 @@ ...@@ -252,14 +247,17 @@
label="文件列表" label="文件列表"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox-group v-if="scope.row.type === '需求确认'" v-model="scope.row.files"> <el-checkbox-group v-if="scope.row.name === '里程碑1'" v-model="checkVal1">
<el-checkbox v-for="item in globalOne" :label="item"></el-checkbox> <el-checkbox label="需求文档"></el-checkbox>
<el-checkbox label="详细设计"></el-checkbox>
<el-checkbox label="开工令" disabled></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<el-checkbox-group v-if="scope.row.type === '初验'" v-model="scope.row.files"> <el-checkbox-group v-if="scope.row.name === '里程碑2'" v-model="checkVal2">
<el-checkbox v-for="item in globalTwo" :label="item"></el-checkbox> <el-checkbox label="初验报告" disabled></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<el-checkbox-group v-if="scope.row.type === '终验'" v-model="scope.row.files"> <el-checkbox-group v-if="scope.row.name === '里程碑3'" v-model="checkVal3">
<el-checkbox v-for="item in globalThree" :label="item"></el-checkbox> <el-checkbox label="试运行报告"></el-checkbox>
<el-checkbox label="终验报告" disabled></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</template> </template>
</el-table-column> </el-table-column>
...@@ -299,13 +297,15 @@ export default { ...@@ -299,13 +297,15 @@ export default {
softwareData: [{name: '',des: '',startTime: '',endTime: ''}], softwareData: [{name: '',des: '',startTime: '',endTime: ''}],
productData: [{name: '',model: '',form: '',expect: '1'}], productData: [{name: '',model: '',form: '',expect: '1'}],
milepostData: [ milepostData: [
{name: '里程碑1',type: '需求确认',time: '', files: []}, {name: '里程碑1',type: 1,endTime: '', files: []},
{name: '里程碑2',type: '初验',time: '', files: []}, {name: '里程碑2',type: 2,endTime: '', files: []},
{name: '里程碑3',type: '终验',time: '', files: []}, {name: '里程碑3',type: 3,endTime: '', files: []},
], ],
globalOne: ['需求文档', '详细设计', '开工令'], typeVal: {
globalTwo: ['初验报告'], '1': '需求确认',
globalThree: ['试运行报告','终验报告'], '2': '初验',
'3': '终验',
},
textarea: '', textarea: '',
addImg: require('./img/add.png'), addImg: require('./img/add.png'),
addSelect: require('./img/add-select.png'), addSelect: require('./img/add-select.png'),
...@@ -331,7 +331,10 @@ export default { ...@@ -331,7 +331,10 @@ export default {
build: '', build: '',
integrate: '', integrate: '',
develop: '', develop: '',
supervisor: '' supervisor: '',
checkVal1: ['开工令'],
checkVal2: ['初验报告'],
checkVal3: ['终验报告']
} }
}, },
mounted() { mounted() {
...@@ -364,8 +367,39 @@ export default { ...@@ -364,8 +367,39 @@ export default {
}); });
}) })
}, },
// 里程碑文件列表转换
milepostChange() {
this.milepostData.map(item => { // 里程碑文件列表
let arr = [];
let data = {
name: ''
};
if (item.type === 1) {
this.checkVal1.forEach(res => {
data.name = res;
arr.push(data);
})
}
if (item.type === 2) {
this.checkVal2.forEach(res => {
data.name = res;
arr.push(data);
})
}
if (item.type === 3) {
this.checkVal3.forEach(res => {
data.name = res;
arr.push(data);
})
}
arr.map(data => {
item.files.push(data);
})
})
},
// 确定新增项目 // 确定新增项目
save () { save () {
this.milepostChange(); // 里程碑数据
let changeProduct = { let changeProduct = {
'服务器': 1, '服务器': 1,
'CPU': 2, 'CPU': 2,
...@@ -377,15 +411,6 @@ export default { ...@@ -377,15 +411,6 @@ export default {
this.productData.map(item => { // 产品类型转换 this.productData.map(item => { // 产品类型转换
item.form = changeProduct[item.form] item.form = changeProduct[item.form]
}) })
let changeGoals = {
'需求确认': 1,
'初验': 2,
'终验': 3,
}
this.milepostData.map(item => { // 里程碑编号转换
item.type = changeGoals[item.type]
})
console.log(this.milepostData)
let techId = ''; let techId = '';
this.techList.map(item => { // 技术路线id this.techList.map(item => { // 技术路线id
if (item.name === this.techVal) { if (item.name === this.techVal) {
...@@ -416,19 +441,26 @@ export default { ...@@ -416,19 +441,26 @@ export default {
thirdId = item.id thirdId = item.id
} }
}) })
this.softwareData.map(item => { // 软件信息时间转换
item.startTime = new Date(item.startTime).getTime();
item.endTime = new Date(item.endTime).getTime();
})
this.milepostData.map(item => { // 里程碑时间转换
item.endTime = new Date(item.endTime).getTime();
})
let data = { let data = {
consId: consId, consId: consId,
consName: this.build, consName: this.build,
devId: devId, devId: devId,
devName: this.develop, devName: this.develop,
endTime: this.endTime, endTime: new Date(this.endTime).getTime(),
goals: this.milepostData, goals: this.milepostData,
gratorId: gratorId, gratorId: gratorId,
gratorName: this.integrate, gratorName: this.integrate,
hardwares: this.productData, hardwares: this.productData,
name: this.name, name: this.name,
softWorks: this.softwareData, softWorks: this.softwareData,
startTime: this.startTime, startTime: new Date(this.startTime).getTime(),
techId: techId, techId: techId,
techName: this.techVal, techName: this.techVal,
thirdId: thirdId, thirdId: thirdId,
...@@ -437,6 +469,14 @@ export default { ...@@ -437,6 +469,14 @@ export default {
console.log(data) console.log(data)
this.$server.postProjectAdd(data).then(res => { this.$server.postProjectAdd(data).then(res => {
console.log(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('项目新增失败！');
}) })
}, },
// 技术路线查询产品信息 // 技术路线查询产品信息
...@@ -452,9 +492,6 @@ export default { ...@@ -452,9 +492,6 @@ export default {
}) })
} }
}, },
typeVal(e) {
this.type = e.target.value
},
// 软件信息新增 // 软件信息新增
addSoftware() { addSoftware() {
let data = {name: '',des: '',startTime: '',endTime: ''}; let data = {name: '',des: '',startTime: '',endTime: ''};
...@@ -468,6 +505,10 @@ export default { ...@@ -468,6 +505,10 @@ export default {
addProduct() { addProduct() {
let data = {name: '',model: '',form: '',expect: '1'}; let data = {name: '',model: '',form: '',expect: '1'};
this.productData.push(data); this.productData.push(data);
},
// 里程碑名称转换
typeChange(val) {
return this.typeVal[val.type];
} }
} }
} }
......
src/components/projectManagement/project/projectManagement.vue
浏览文件 @ 480a9aa7
...@@ -38,73 +38,73 @@ ...@@ -38,73 +38,73 @@
<el-table-column <el-table-column
prop="number" prop="number"
label="结束时间" label="结束时间"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="number"
label="建设单位" label="建设单位"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="number"
label="集成商" label="集成商"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="number"
label="开发商" label="开发商"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="number"
label="监理方" label="监理方"
align="center"> align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<div class="block"> <div class="block">
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size="pagesize" :page-size="pagesize"
background background
layout="prev, pager, next" layout="prev, pager, next"
:total="totleLength"> :total="totleLength">
</el-pagination> </el-pagination>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data () { data () {
return { return {
searchVal: '', searchVal: '',
allData: [ allData: [
{ {
number: 1 number: 1
} }
], ],
pageName: '', pageName: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 8, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
} }
}, },
mounted() { mounted() {
this.pageName = this.$store.getters.getSidebar.name; this.pageName = this.$store.getters.getSidebar.name;
this.init(); this.init();
}, },
methods: { methods: {
// 初始请求 // 初始请求
init() { init() {
this.$server.postProjectPage(this.pagesize, this.currentPage).then((res) => { // 数据请求 this.$server.postProjectPage(this.pagesize, this.currentPage).then((res) => { // 数据请求
console.log(res.data.data) console.log(res.data.data)
if (res.data.code === 200) { if (res.data.code === 200) {
console.log(res.data.data); console.log(res.data.data);
......
src/services/server.js
浏览文件 @ 480a9aa7
...@@ -210,6 +210,12 @@ const server = { ...@@ -210,6 +210,12 @@ const server = {
method: 'post', method: 'post',
data: data data: data
}) })
},
postFileSearch(data) { // 项目管理文件清单分页查询
return axios('/file/search', {
method: 'post',
data: data
})
} }
} }
export default server; export default server;
src/tools/element.js
浏览文件 @ 480a9aa7
import Vue from 'vue' import Vue from 'vue'
import { Row, Col, Carousel, CarouselItem, Scrollbar, Input, Button, Table, TableColumn, Pagination, Dialog, import { Row, Col, Carousel, CarouselItem, Scrollbar, Input, Button, Table, TableColumn, Pagination, Dialog,
Message,Select, Option, Form, FormItem, Radio, RadioGroup, Upload, DatePicker,Checkbox} from 'element-ui' Message,Select, Option, Form, FormItem, Radio, RadioGroup, Upload, DatePicker,Checkbox,CheckboxGroup} from 'element-ui'
import './element-variables.scss' import './element-variables.scss'
Vue.use(Row); Vue.use(Row);
Vue.use(Col); Vue.use(Col);
...@@ -27,3 +27,4 @@ Vue.use(RadioGroup); ...@@ -27,3 +27,4 @@ Vue.use(RadioGroup);
Vue.use(Upload); Vue.use(Upload);
Vue.use(DatePicker); Vue.use(DatePicker);
Vue.use(Checkbox); Vue.use(Checkbox);
Vue.use(CheckboxGroup);
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论