Skip to content

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

nwe

上级 dff9fba1
隐藏空白字符变更
内嵌 并排
正在显示 包含 222 行增加 和 55 行删除
src/components/admittance/technical/addTechnical.vue
浏览文件 @ c181e730
...@@ -203,8 +203,6 @@ export default { ...@@ -203,8 +203,6 @@ export default {
dele(index) { dele(index) {
if (this.allProduct.length !== 1) { if (this.allProduct.length !== 1) {
this.allProduct.splice(index,1) this.allProduct.splice(index,1)
} else {
console.log('111111111111111111')
} }
} }
}, },
......
src/components/projectManagement/hardware/hardware.vue
浏览文件 @ c181e730
...@@ -19,24 +19,19 @@ ...@@ -19,24 +19,19 @@
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
prop="name" prop="name"
label="厂商" label="产品名称"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="roleName" prop="model"
label="型号" label="型号"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unitName" prop="form"
label="类型" label="类型"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="number"
label="计划数量/到货"
align="center">
</el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
...@@ -60,17 +55,52 @@ ...@@ -60,17 +55,52 @@
<script> <script>
export default { export default {
name: 'hardware', props: ['value'],
data () { data () {
return { return {
searchVal: '', searchVal: '',
allData: [], allData: [],
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 7, // 每页个数 pagesize: 8, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
} }
}, },
mounted(){
this.init();
},
methods: { methods: {
init() {
let val;
if (this.searchVal === '') {
val = {
'page': this.currentPage,
'pageSize': this.pagesize,
't': {
'projectId': this.value.id
}
}
} else {
val = {
'page': this.currentPage,
'pageSize': this.pagesize,
't': {
'projectId': this.value.id
}
}
}
this.$server.PostHardwareSearch(val).then((res) => { // 数据请求
console.log(res.data)
if (res.data.code === 200) {
this.allData = res.data.data.rows;
this.totleLength = res.data.data.total;
for (let item of this.allData) {
item.form === 1 ? item.form = '服务器' : item.form === 2 ? item.form = 'CPU' : item.form === 3 ? item.form = '操作系统' : item.form === 4 ? item.form = '数据库' : item.form === 5 ? item.form = '中间件' : item.form = '其他';
}
}
}).catch(err => {
this.$message.error('数据请求失败！');
})
},
// 点击分页 // 点击分页
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
......
src/components/projectManagement/journal/journal.vue
浏览文件 @ c181e730
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
searchVal: '', searchVal: '',
allData: [], allData: [],
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 7, // 每页个数 pagesize: 8, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
} }
}, },
......
src/components/projectManagement/project/projectManagement.vue
浏览文件 @ c181e730
...@@ -26,37 +26,39 @@ ...@@ -26,37 +26,39 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="roleName" prop="schedule"
label="当前进度" label="当前进度"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unitName" prop="startTime"
label="开始时间" label="开始时间"
:show-overflow-tooltip="true"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="endTime"
label="结束时间" label="结束时间"
:show-overflow-tooltip="true"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="unit"
label="建设单位" label="建设单位"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="gratorName"
label="集成商" label="集成商"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="devName"
label="开发商" label="开发商"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="thirdName"
label="监理方" label="监理方"
align="center"> align="center">
</el-table-column> </el-table-column>
...@@ -86,15 +88,11 @@ export default { ...@@ -86,15 +88,11 @@ export default {
data () { data () {
return { return {
searchVal: '', searchVal: '',
allData: [ allData: [],
{
number: 1
}
],
pageName: '', pageName: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 8, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0 // 获取后台传的所有数据的长度
} }
}, },
mounted() { mounted() {
...@@ -104,12 +102,29 @@ export default { ...@@ -104,12 +102,29 @@ export default {
methods: { methods: {
// 初始请求 // 初始请求
init() { init() {
this.$server.postProjectPage(this.pagesize, this.currentPage).then((res) => { // 数据请求 let val;
if (this.searchVal === '') {
val = {
'page': this.currentPage,
'pageSize': this.pagesize
}
} else {
val = {
'page': this.currentPage,
'pageSize': this.pagesize
}
}
this.$server.PostProjectSearch(val).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);
this.allData = res.data.data.rows; this.allData = res.data.data.rows;
this.totleLength = res.data.data.total; this.totleLength = res.data.data.total;
for (let item of this.allData) {
item.startTime = this.timeC(item.startTime);
item.endTime = this.timeC(item.endTime);
item.schedule = '需求确认中'
}
} }
}).catch(err => { }).catch(err => {
this.$message.error('数据请求失败！'); this.$message.error('数据请求失败！');
...@@ -124,8 +139,8 @@ export default { ...@@ -124,8 +139,8 @@ export default {
this.$router.push({name: 'projectAdd'}); this.$router.push({name: 'projectAdd'});
}, },
// 项目详情 // 项目详情
jump() { jump(row) {
this.$router.push({name: 'projectDetails'}); this.$router.push({name: 'projectDetails',params:{'nowVal': row}});
}, },
// 点击分页 // 点击分页
handleSizeChange(val) { handleSizeChange(val) {
...@@ -136,6 +151,17 @@ export default { ...@@ -136,6 +151,17 @@ export default {
// console.log(`当前页: ${val}`); // console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.init(); this.init();
},
// 时间换算
timeC(value) {
let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
let s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
return Y + M + D + ' ' + h + m + s;
} }
} }
} }
......
src/components/projectManagement/projectDetails/projectDetails.vue
浏览文件 @ c181e730
<!--项目管理切换页-->
<template> <template>
<div class="projectDetails"> <div class="projectDetails">
<el-row> <el-row>
...@@ -9,12 +10,12 @@ ...@@ -9,12 +10,12 @@
<p class="titleList"> <p class="titleList">
<span class="titleListClick" @click="changeMenu('projectInformation',1)">项目信息</span> <span class="titleListClick" @click="changeMenu('projectInformation',1)">项目信息</span>
<span @click="changeMenu('software',2)">软件清单</span> <span @click="changeMenu('software',2)">软件清单</span>
<span @click="changeMenu('hardware',3)">硬件清单</span> <span @click="changeMenu('hardware',3)">产品清单</span>
<span @click="changeMenu('technicalRoute',4)">技术路线</span> <span @click="changeMenu('technicalRoute',4)">技术路线</span>
<span @click="changeMenu('document',5)">文件管理</span> <span @click="changeMenu('document',5)">文件管理</span>
<span @click="changeMenu('journal',6)">操作日志</span> <span @click="changeMenu('journal',6)">操作日志</span>
</p> </p>
<component :is="components"></component> <component :is="components" :value="nowVal"></component>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -32,12 +33,17 @@ import $ from 'jquery'; ...@@ -32,12 +33,17 @@ import $ from 'jquery';
export default { export default {
data () { data () {
return { return {
components: 'projectInformation' components: 'projectInformation',
nowVal: ''
} }
}, },
created() { created() {
}, },
mounted(){ mounted(){
if (this.$route.params.nowVal !== undefined) {
this.nowVal = this.$route.params.nowVal;
console.log(this.nowVal);
}
}, },
methods: { methods: {
// 返回 // 返回
......
src/components/projectManagement/projectInformation/projectInformation.vue
浏览文件 @ c181e730
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</p> </p>
<p class="informationList"> <p class="informationList">
<span class="value"> <span class="value">
<span>基础商：</span> <span>集成商：</span>
<el-input v-model="allVal.basis" size="medium" :disabled="true"></el-input> <el-input v-model="allVal.basis" size="medium" :disabled="true"></el-input>
</span> </span>
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
<script> <script>
import $ from 'jquery'; import $ from 'jquery';
export default { export default {
props: ['value'],
data () { data () {
return { return {
allVal: { allVal: {
...@@ -115,7 +116,7 @@ export default { ...@@ -115,7 +116,7 @@ export default {
technical: '龙芯+达梦+金蝶+曙光服务器', // 技术路线 technical: '龙芯+达梦+金蝶+曙光服务器', // 技术路线
now: 'XX阶段', // 当前阶段 now: 'XX阶段', // 当前阶段
build: 'XX局', // 建设方 build: 'XX局', // 建设方
basis: 'XXX公司', // 基础商 basis: 'XXX公司', // 集成商
develop: 'XXX公司', // 开发商 develop: 'XXX公司', // 开发商
supervision: 'XX公司' // 监理方 supervision: 'XX公司' // 监理方
}, },
...@@ -156,6 +157,7 @@ export default { ...@@ -156,6 +157,7 @@ export default {
created() { created() {
}, },
mounted(){ mounted(){
this.init();
if (this.now >= 93) { if (this.now >= 93) {
$('.blueLine').css('width', '') $('.blueLine').css('width', '')
} else { } else {
...@@ -179,6 +181,29 @@ export default { ...@@ -179,6 +181,29 @@ export default {
} }
}, },
methods: { methods: {
init() {
console.log(this.value)
this.$server.GetProjectGet(this.value.id).then((res) => { // 数据请求
console.log(res.data)
if (res.data.code === 200) {
console.log(res.data.data)
}
}).catch(err => {
this.$message.error('数据请求失败！');
})
let that = this;
setTimeout(()=>{
that.allVal.name = that.value.name, // 项目名称
that.allVal.startTime = that.value.startTime, // 开始时间
that.allVal.endTime = that.value.endTime, // 结束时间
that.allVal.technical = that.value.techName, // 技术路线
that.allVal.now = that.value.schedule, // 当前阶段
that.allVal.build = that.value.consName, // 建设方
that.allVal.basis = that.value.gratorName, // 集成商
that.allVal.develop = that.value.devName, // 开发商
that.allVal.supervision = that.value.thirdName // 监理方
},30)
}
}, },
components: { components: {
}, },
......
src/components/projectManagement/software/software.vue
浏览文件 @ c181e730
...@@ -23,22 +23,17 @@ ...@@ -23,22 +23,17 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="roleName" prop="des"
label="当前进度"
align="center">
</el-table-column>
<el-table-column
prop="unitName"
label="功能简介" label="功能简介"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="startTime"
label="开始时间" label="开始时间"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="endTime"
label="预计时间" label="预计时间"
align="center"> align="center">
</el-table-column> </el-table-column>
...@@ -65,17 +60,54 @@ ...@@ -65,17 +60,54 @@
<script> <script>
export default { export default {
name: 'software', props: ['value'],
data () { data () {
return { return {
searchVal: '', searchVal: '',
allData: [], allData: [],
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 7, // 每页个数 pagesize: 8, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
} }
}, },
mounted(){
this.init();
},
methods: { methods: {
init() {
let val;
if (this.searchVal === '') {
val = {
'page': this.currentPage,
'pageSize': this.pagesize,
't': {
'projectId': this.value.id
}
}
} else {
val = {
'page': this.currentPage,
'pageSize': this.pagesize,
't': {
'projectId': this.value.id
}
}
}
this.$server.PostSoftSearch(val).then((res) => { // 数据请求
console.log(res.data)
if (res.data.code === 200) {
this.allData = res.data.data.rows;
for (let item of this.allData) {
item.startTime = this.timeC(item.startTime);
item.endTime = this.timeC(item.endTime);
item.des = item.des === null ? '暂无' : item.des;
}
this.totleLength = res.data.data.total
}
}).catch(err => {
this.$message.error('数据请求失败！');
})
},
// 点击分页 // 点击分页
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
...@@ -84,6 +116,17 @@ export default { ...@@ -84,6 +116,17 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
// console.log(`当前页: ${val}`); // console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
},
// 时间换算
timeC(value) {
let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
let s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
return Y + M + D + ' ' + h + m + s;
} }
} }
} }
......
src/components/projectManagement/technicalRoute/technicalRoute.vue
浏览文件 @ c181e730
<!--技术路线-->
<template> <template>
<div class="technicalRoute"> <div class="technicalRoute">
<el-row> <el-row>
...@@ -49,23 +50,38 @@ ...@@ -49,23 +50,38 @@
<script> <script>
export default { export default {
props: ['value'],
data () { data () {
return { return {
allVal: { allVal: {
middleware: '金蝶', middleware: '',
system: 'centos', system: '',
cpu: '龙芯cpu', cpu: '',
database: '瀚高数据库', database: '',
server: 'XXX服务器', server: '',
computer: 'XXX笔记本' computer: ''
} }
} }
}, },
created() { created() {
}, },
mounted(){ mounted(){
console.log(this.value)
this.init();
}, },
methods: { methods: {
init() {
this.$server.getProjectGetTech(1).then((res) => { // 数据请求
console.log(res.data)
if (res.data.code === 200) {
for (let item of res.data.data.producies) {
item.form === 1 ? this.allVal.server = item.name : item.form === 2 ? this.allVal.cpu = item.name : item.form === 3 ? this.allVal.system = item.name : item.form === 4 ? this.allVal.database = item.name : item.form === 5 ? this.allVal.middleware = item.name : this.allVal.computer = '暂无';
}
}
}).catch(err => {
this.$message.error('数据请求失败！');
})
}
}, },
components: { components: {
}, },
......
src/services/server.js
浏览文件 @ c181e730
...@@ -189,11 +189,6 @@ const server = { ...@@ -189,11 +189,6 @@ const server = {
data: data data: data
}); });
}, },
postProjectPage(size, page) { // 获取项目管理列表
return axios('/project/page/' + size + '/' + page, {
method: 'post'
});
},
putProduceUpdate(data) { // 修改产品信息 putProduceUpdate(data) { // 修改产品信息
return axios('/produce/update', { return axios('/produce/update', {
method: 'put', method: 'put',
...@@ -210,6 +205,34 @@ const server = { ...@@ -210,6 +205,34 @@ const server = {
method: 'post', method: 'post',
data: data data: data
}) })
},
getProjectGetTech(id) { // 根据项目id获取技术路线
return axios('/project/getTech/' + id, {
method: 'get'
})
},
PostSoftSearch(data) { // 软件替换分页查询
return axios('/soft/search', {
method: 'post',
data: data
})
},
PostHardwareSearch(data) { // 产品清单分页查询
return axios('/hardware/search', {
method: 'post',
data: data
})
},
PostProjectSearch(data) { // 获取项目管理分页
return axios('/project/search', {
method: 'post',
data: data
})
},
GetProjectGet(id) { // 获取项目信息
return axios('/project/get/' + id, {
method: 'get'
})
} }
} }
export default server; export default server;
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论