Skip to content

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

合并分支 'ningbo' 到 'thy'

Ningbo 查看合并请求 !151
上级 1d300a9f 58d3afdf
隐藏空白字符变更
内嵌 并排
正在显示 包含 77 行增加 和 87 行删除
src/components/evaluationReport/evaluationReport.vue
浏览文件 @ bb80dc3c
...@@ -113,11 +113,14 @@ export default { ...@@ -113,11 +113,14 @@ export default {
} }
this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{ this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{
console.log(res.data) console.log(res.data)
this.allData = res.data.rows; if (res.data.code === 200) {
this.totleLength = res.data.total; this.allData = res.data.data.rows;
for (let item of this.allData) { this.totleLength = res.data.data.total;
item.createDate = item.createDate === '' ? '暂无' : this.time(item.createDate); for (let item of this.allData) {
item.createDate = item.createDate === '' ? '暂无' : this.time(item.createDate);
}
} }
}).catch(err => { }).catch(err => {
console.log(err.message); console.log(err.message);
}) })
......
src/components/otherPdf/otherPdf.vue
浏览文件 @ bb80dc3c
...@@ -900,76 +900,76 @@ export default { ...@@ -900,76 +900,76 @@ export default {
id: this.$route.query.id id: this.$route.query.id
} }
this.$server.getTechnology(val).then(res => { this.$server.getTechnology(val).then(res => {
// console.log('数据请求结果', res.data) // console.log('数据请求结果', res.data.data)
console.log(this.$route.query.agree) console.log(this.$route.query.agree)
if (res.data !== 500) { if (res.data.code === 200) {
this.title = res.data.localContact; this.title = res.data.data.localContact;
this.systemName = res.data.sysName; this.systemName = res.data.data.sysName;
this.reportName =res.data.type === 2 ? '适配' : '改造' + '工作评估报告'; this.reportName =res.data.data.type === 2 ? '适配' : '改造' + '工作评估报告';
this.reportName = '在国产化安全自主可控环境下的' + this.reportName; this.reportName = '在国产化安全自主可控环境下的' + this.reportName;
this.htmlTitle = this.reportName; this.htmlTitle = this.reportName;
console.log(res.data.sysScale) console.log(res.data.data.sysScale)
this.sysScale.codeNum = res.data.sysScale.code.num === -1 ? '-' : res.data.sysScale.code.num; this.sysScale.codeNum = res.data.data.sysScale.code.num === -1 ? '-' : res.data.data.sysScale.code.num;
this.sysScale.modelNum = res.data.sysScale.mode.num === -1 ? '-' : res.data.sysScale.mode.num; this.sysScale.modelNum = res.data.data.sysScale.mode.num === -1 ? '-' : res.data.data.sysScale.mode.num;
this.sysScale.fileNum = res.data.sysScale.file.num === -1 ? '-' : res.data.sysScale.file.num; this.sysScale.fileNum = res.data.data.sysScale.file.num === -1 ? '-' : res.data.data.sysScale.file.num;
this.technologyDependence = res.data.technologyList.des; this.technologyDependence = res.data.data.technologyList.des;
this.systemStructure.push(res.data.difficultyAssessment.frameDifficulty.systemEvaluation); this.systemStructure.push(res.data.data.difficultyAssessment.frameDifficulty.systemEvaluation);
this.systemStructure.push(res.data.difficultyAssessment.frameDifficulty.message); this.systemStructure.push(res.data.data.difficultyAssessment.frameDifficulty.message);
this.systemStructure.push(res.data.difficultyAssessment.frameDifficulty.difficulty); this.systemStructure.push(res.data.data.difficultyAssessment.frameDifficulty.difficulty);
this.systemStructure.push(res.data.difficultyAssessment.frameDifficulty.load); this.systemStructure.push(res.data.data.difficultyAssessment.frameDifficulty.load);
this.middleware.push(res.data.difficultyAssessment.middlewareDifficulty.systemEvaluation); this.middleware.push(res.data.data.difficultyAssessment.middlewareDifficulty.systemEvaluation);
this.middleware.push(res.data.difficultyAssessment.middlewareDifficulty.message); this.middleware.push(res.data.data.difficultyAssessment.middlewareDifficulty.message);
this.middleware.push(res.data.difficultyAssessment.middlewareDifficulty.difficulty); this.middleware.push(res.data.data.difficultyAssessment.middlewareDifficulty.difficulty);
this.middleware.push(res.data.difficultyAssessment.middlewareDifficulty.load); this.middleware.push(res.data.data.difficultyAssessment.middlewareDifficulty.load);
this.dataBase.push('/'); this.dataBase.push('/');
this.dataBase.push('/'); this.dataBase.push('/');
this.dataBase.push(res.data.difficultyAssessment.databaseDifficulty.difficulty); this.dataBase.push(res.data.data.difficultyAssessment.databaseDifficulty.difficulty);
this.dataBase.push(res.data.difficultyAssessment.databaseDifficulty.load); this.dataBase.push(res.data.data.difficultyAssessment.databaseDifficulty.load);
this.localProgram.push('/'); this.localProgram.push('/');
this.localProgram.push('/'); this.localProgram.push('/');
this.localProgram.push(res.data.difficultyAssessment.programDifficulty.difficulty); this.localProgram.push(res.data.data.difficultyAssessment.programDifficulty.difficulty);
this.localProgram.push(res.data.difficultyAssessment.programDifficulty.load); this.localProgram.push(res.data.data.difficultyAssessment.programDifficulty.load);
this.monthlyEstimate.development.developmentVolume = res.data.workload.development ? res.data.workload.development.developmentVolume : ''; this.monthlyEstimate.development.developmentVolume = res.data.data.workload.development ? res.data.data.workload.development.developmentVolume : '';
this.monthlyEstimate.development.correctionFactor = res.data.workload.development ? res.data.workload.development.correctionFactor : ''; this.monthlyEstimate.development.correctionFactor = res.data.data.workload.development ? res.data.data.workload.development.correctionFactor : '';
this.monthlyEstimate.test.developmentVolume = res.data.workload.test ? res.data.workload.test.developmentVolume : ''; this.monthlyEstimate.test.developmentVolume = res.data.data.workload.test ? res.data.data.workload.test.developmentVolume : '';
this.monthlyEstimate.test.correctionFactor = res.data.workload.test ? res.data.workload.test.correctionFactor : ''; this.monthlyEstimate.test.correctionFactor = res.data.data.workload.test ? res.data.data.workload.test.correctionFactor : '';
this.monthlyEstimate.deploy.developmentVolume = res.data.workload.deploy ? res.data.workload.deploy.developmentVolume : ''; this.monthlyEstimate.deploy.developmentVolume = res.data.data.workload.deploy ? res.data.data.workload.deploy.developmentVolume : '';
this.monthlyEstimate.deploy.correctionFactor = res.data.workload.deploy ? res.data.workload.deploy.correctionFactor : ''; this.monthlyEstimate.deploy.correctionFactor = res.data.data.workload.deploy ? res.data.data.workload.deploy.correctionFactor : '';
this.monthlyEstimate.total.developmentVolume = res.data.workload.total ? res.data.workload.total.developmentVolume : ''; this.monthlyEstimate.total.developmentVolume = res.data.data.workload.total ? res.data.data.workload.total.developmentVolume : '';
this.monthlyEstimate.total.correctionFactor = res.data.workload.total ? res.data.workload.total.correctionFactor : ''; this.monthlyEstimate.total.correctionFactor = res.data.data.workload.total ? res.data.data.workload.total.correctionFactor : '';
this.newApply = res.data.apply; this.newApply = res.data.data.apply;
this.newCost.person.normal = res.data.manufacturingCost === '' ? 0 : res.data.manufacturingCost.artificial.calculation; this.newCost.person.normal = res.data.data.manufacturingCost === '' ? 0 : res.data.data.manufacturingCost.artificial.calculation;
this.newCost.person.operating = this.$route.query.popp; this.newCost.person.operating = this.$route.query.popp;
this.newCost.person.now = Number(this.newCost.person.normal) + Number(this.newCost.person.operating); this.newCost.person.now = Number(this.newCost.person.normal) + Number(this.newCost.person.operating);
this.newCost.work.normal = res.data.manufacturingCost === '' ? 0 : res.data.manufacturingCost.workLoad.calculation; this.newCost.work.normal = res.data.data.manufacturingCost === '' ? 0 : res.data.data.manufacturingCost.workLoad.calculation;
this.newCost.work.now = res.data.manufacturingCost === '' ? 0 : res.data.manufacturingCost.workLoad.calculation; this.newCost.work.now = res.data.data.manufacturingCost === '' ? 0 : res.data.data.manufacturingCost.workLoad.calculation;
this.newCost.other.normal = res.data.manufacturingCost === '' ? 0 : res.data.manufacturingCost.apply.calculation; this.newCost.other.normal = res.data.data.manufacturingCost === '' ? 0 : res.data.data.manufacturingCost.apply.calculation;
this.newCost.other.operating = this.$route.query.agree === 'true' ? '同意' : 0; this.newCost.other.operating = this.$route.query.agree === 'true' ? '同意' : 0;
this.newCost.other.now = this.$route.query.agree === 'true' ? res.data.manufacturingCost.apply.calculation : 0; this.newCost.other.now = this.$route.query.agree === 'true' ? res.data.data.manufacturingCost.apply.calculation : 0;
this.newCost.cost.now = res.data.manufacturingCost === '' ? 0 : ( ( (Number(this.newCost.person.normal) + Number(this.newCost.person.operating)) * Number(this.newCost.work.now) ) + Number(this.newCost.other.now) ).toFixed(3) this.newCost.cost.now = res.data.data.manufacturingCost === '' ? 0 : ( ( (Number(this.newCost.person.normal) + Number(this.newCost.person.operating)) * Number(this.newCost.work.now) ) + Number(this.newCost.other.now) ).toFixed(3)
this.degreeOfDifficulty = res.data.manufacturingCost.degreeOfDifficulty.calculation; this.degreeOfDifficulty = res.data.data.manufacturingCost.degreeOfDifficulty.calculation;
this.tableTitle[0].val = this.title; // 单位名称 this.tableTitle[0].val = this.title; // 单位名称
this.tableTitle[1].val = this.systemName; // 原系统名称 this.tableTitle[1].val = this.systemName; // 原系统名称
console.log(res.data.language) console.log(res.data.data.language)
this.tableTitle[3].val = res.data.language === 1? 'C' : res.data.language === 2 ? 'VB' : res.data.language === 3 ? 'DELPHI' : res.data.language === 4 ? 'PHP' : res.data.language === 5 ? 'JAVA' : res.data.language === 6 ? 'PYTHON' : res.data.language === 7 ? 'GO' : res.data.language === 8 ? 'RUST': res.data.language === 9 ? 'RUBY' : res.data.language === 10 ? 'PERL' : res.data.language === 11 ? 'MATLAB' : res.data.language === 12 ? 'QITA' : res.data.language === 13 ? 'HTML' : '-' this.tableTitle[3].val = res.data.data.language === 1? 'C' : res.data.data.language === 2 ? 'VB' : res.data.data.language === 3 ? 'DELPHI' : res.data.data.language === 4 ? 'PHP' : res.data.data.language === 5 ? 'JAVA' : res.data.data.language === 6 ? 'PYTHON' : res.data.data.language === 7 ? 'GO' : res.data.data.language === 8 ? 'RUST': res.data.data.language === 9 ? 'RUBY' : res.data.data.language === 10 ? 'PERL' : res.data.data.language === 11 ? 'MATLAB' : res.data.data.language === 12 ? 'QITA' : res.data.data.language === 13 ? 'HTML' : '-'
this.tableTitle[4].val = res.data.framework === 1 ? '前后端分离' : res.data.framework === 2 ? '混合' : res.data.framework === -1 ? '-':''; // 架构 this.tableTitle[4].val = res.data.data.framework === 1 ? '前后端分离' : res.data.data.framework === 2 ? '混合' : res.data.data.framework === -1 ? '-':''; // 架构
this.tableTitle[5].val = this.sysScale.codeNum; // 代码行 this.tableTitle[5].val = this.sysScale.codeNum; // 代码行
this.tableTitle[6].val = this.sysScale.fileNum + '/' + this.sysScale.modelNum; // 文件/模块 this.tableTitle[6].val = this.sysScale.fileNum + '/' + this.sysScale.modelNum; // 文件/模块
this.tableTitle[7].val = this.degreeOfDifficulty; // 综合难度系数 this.tableTitle[7].val = this.degreeOfDifficulty; // 综合难度系数
this.tableTitle[8].val = res.data.type === 1 ? '修改' : (res.data.type === 2 && res.data.language ===1 && res.data.framework ===1) ? '修改': '重构'; // 建议 this.tableTitle[8].val = res.data.data.type === 1 ? '修改' : (res.data.data.type === 2 && res.data.data.language ===1 && res.data.data.framework ===1) ? '修改': '重构'; // 建议
this.tableTitle[9].val = this.newCost.work.now + '人工月'; // 总工作量 this.tableTitle[9].val = this.newCost.work.now + '人工月'; // 总工作量
this.tableTitle[10].val = this.newCost.other.now + '万元'; // 额外申请费用 this.tableTitle[10].val = this.newCost.other.now + '万元'; // 额外申请费用
this.tableTitle[11].val = this.newCost.cost.now + '万元'; // 评估预算总费用 this.tableTitle[11].val = this.newCost.cost.now + '万元'; // 评估预算总费用
if (res.data.technologyList.technologyReports.length !== 0) { // 轮询 3.2 if (res.data.data.technologyList.technologyReports.length !== 0) { // 轮询 3.2
for (let i = 0; i < res.data.technologyList.technologyReports.length; i++) { // 轮询出所有的表 for (let i = 0; i < res.data.data.technologyList.technologyReports.length; i++) { // 轮询出所有的表
let name = { let name = {
name: res.data.technologyList.technologyReports[i].technology, name: res.data.data.technologyList.technologyReports[i].technology,
val: [[]] val: [[]]
} }
this.optimizedItemsList.push(name); // 把名称拿出来新增到变量中 this.optimizedItemsList.push(name); // 把名称拿出来新增到变量中
let page = 0; // 当前页为0 let page = 0; // 当前页为0
for (let a = 0; a < res.data.technologyList.technologyReports[i].technologyContents.length; a++) { for (let a = 0; a < res.data.data.technologyList.technologyReports[i].technologyContents.length; a++) {
if (a % 7 === 0) { // 每隔七条分一页 if (a % 7 === 0) { // 每隔七条分一页
this.optimizedItemsList[i].val.push([[]]); // 当到了七条就新增一个数组 this.optimizedItemsList[i].val.push([[]]); // 当到了七条就新增一个数组
if (a !== 0) { if (a !== 0) {
...@@ -977,9 +977,9 @@ export default { ...@@ -977,9 +977,9 @@ export default {
} }
} }
let value = { let value = {
'file': res.data.technologyList.technologyReports[i].technologyContents[a].file, 'file': res.data.data.technologyList.technologyReports[i].technologyContents[a].file,
'keyWord': res.data.technologyList.technologyReports[i].technologyContents[a].keyWord, 'keyWord': res.data.data.technologyList.technologyReports[i].technologyContents[a].keyWord,
'position': res.data.technologyList.technologyReports[i].technologyContents[a].position 'position': res.data.data.technologyList.technologyReports[i].technologyContents[a].position
} }
this.optimizedItemsList[i].val[page].push(value) // 把对应的值放到对应表和对应的页中 this.optimizedItemsList[i].val[page].push(value) // 把对应的值放到对应表和对应的页中
} }
...@@ -1007,8 +1007,8 @@ export default { ...@@ -1007,8 +1007,8 @@ export default {
}, },
init2() { init2() {
this.$server.getExcel(this.$route.query.id).then(res =>{ this.$server.getExcel(this.$route.query.id).then(res =>{
this.messageAll = res.data; this.messageAll = res.data.data;
this.tableTitle[2].val = res.data[0].arrayList[8].value + '万元'; // 适配预算 this.tableTitle[2].val = res.data.data[0].arrayList[8].value + '万元'; // 适配预算
let array = []; let array = [];
for (let item of this.messageAll) { for (let item of this.messageAll) {
if (item.arrayList.length !== 0) { if (item.arrayList.length !== 0) {
......
src/components/reportAssess/reportAssess.vue
浏览文件 @ bb80dc3c
...@@ -1030,7 +1030,7 @@ export default { ...@@ -1030,7 +1030,7 @@ export default {
console.log(name) console.log(name)
this.$server.getTechnology(name).then(res=>{ this.$server.getTechnology(name).then(res=>{
console.log('数据请求结果',res) console.log('数据请求结果',res)
if (res.data === 500) { if (res.data.code === 500) {
this.picture = true this.picture = true
// this.orgName = res.data.orgName // this.orgName = res.data.orgName
...@@ -1040,51 +1040,50 @@ export default { ...@@ -1040,51 +1040,50 @@ export default {
// this.type = res.data.type // this.type = res.data.type
} else { } else {
this.orgName = res.data.data.orgName
this.orgName = res.data.orgName this.sysName = res.data.data.sysName
this.sysName = res.data.sysName this.time = res.data.data.time
this.time = res.data.time this.difficulty = res.data.data.difficulty
this.difficulty = res.data.difficulty this.type = res.data.data.type
this.type = res.data.type
// this.type === 1 ? this.type = '改造' : this.type = '适配' // this.type === 1 ? this.type = '改造' : this.type = '适配'
this.framework = res.data.framework this.framework = res.data.data.framework
this.language = res.data.language this.language = res.data.data.language
this.budget = res.data.budget this.budget = res.data.data.budget
// firstTable // firstTable
this.tableData = res.data.sysScale this.tableData = res.data.data.sysScale
console.log( 'pic', res.data) console.log( 'pic', res.data.data)
// console.log( '3333',this.tableData) // console.log( '3333',this.tableData)
// console.log( 'type',this.type) // console.log( 'type',this.type)
// technologyReports 技术和替换策略建议 // technologyReports 技术和替换策略建议
// 循环表格 // 循环表格
this.table1Data = res.data.technologyList.technologyReports this.table1Data = res.data.data.technologyList.technologyReports
console.log('9090',this.tableData) console.log('9090',this.tableData)
console.log(this.table1Data,'替换策略') console.log(this.table1Data,'替换策略')
let firstDetial; let firstDetial;
this.firstDetial = res.data.technologyList this.firstDetial = res.data.data.technologyList
// 技术和替换策略建议 // 技术和替换策略建议
// //
this.opper = res.data.technologyList.technologyReports this.opper = res.data.data.technologyList.technologyReports
console.log('oooo',this.opper) console.log('oooo',this.opper)
// 工作量评估 // 工作量评估
// let newWork; // let newWork;
this.newWork = res.data.workload; this.newWork = res.data.data.workload;
// console.log('wordLoad2222',this.newWork) // console.log('wordLoad2222',this.newWork)
// 额外费用申请 // 额外费用申请
this.newApply = res.data.apply this.newApply = res.data.data.apply
// console.log('额外费用申请',this.newApply) // console.log('额外费用申请',this.newApply)
// 适配难度评估 // 适配难度评估
// 系统部署架构难度 // 系统部署架构难度
this.newDifficuty = res.data.difficultyAssessment this.newDifficuty = res.data.data.difficultyAssessment
// 中间件 // 中间件
...@@ -1166,7 +1165,7 @@ export default { ...@@ -1166,7 +1165,7 @@ export default {
// 适配难度评估 // 适配难度评估
// 造价估算 manufacturingCost // 造价估算 manufacturingCost
this.newCost = res.data.manufacturingCost this.newCost = res.data.data.manufacturingCost
console.log('造价估算',this.newCost) console.log('造价估算',this.newCost)
// 造价估算 // 造价估算
......
src/services/axios.js
浏览文件 @ bb80dc3c
...@@ -42,18 +42,6 @@ axios.interceptors.response.use(function (response) { ...@@ -42,18 +42,6 @@ axios.interceptors.response.use(function (response) {
} }
}, function (error) { }, function (error) {
// 预处理响应错误（error) // 预处理响应错误（error)
console.log(error.request.status);
if (error.request.status === 403) {
v.$message.error('您没有访问权限！');
setTimeout(function () {
router.push({name: 'login'})
}, 500)
} else if (error.request.status === 400) {
v.$message.error('登录已超时，请重新登陆！');
setTimeout(function () {
router.push({name: 'login'})
}, 500)
}
// console.log(error.splice(error.length - 4,error.length - 1)) // console.log(error.splice(error.length - 4,error.length - 1))
return Promise.reject(error); return Promise.reject(error);
}); });
......
src/services/server.js
浏览文件 @ bb80dc3c
...@@ -375,7 +375,7 @@ const server = { ...@@ -375,7 +375,7 @@ const server = {
method:'get', method:'get',
}) })
}, },
upExcel(data){ //excel upExcel(data){ // excel
return axios( assessma + '/inspect/importExcelToRapidAssessment',{ return axios( assessma + '/inspect/importExcelToRapidAssessment',{
method:'post', method:'post',
data:data data:data
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论