Skip to content

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

修改请求回执

上级 58d3afdf
隐藏空白字符变更
内嵌 并排
正在显示 包含 87 行增加 和 64 行删除
package-lock.json
浏览文件 @ 8c4a72ba
...@@ -1729,7 +1729,7 @@ ...@@ -1729,7 +1729,7 @@
}, },
"abab": { "abab": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/abab/download/abab-1.0.4.tgz", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
"integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=" "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4="
}, },
"abbrev": { "abbrev": {
...@@ -1755,7 +1755,7 @@ ...@@ -1755,7 +1755,7 @@
}, },
"acorn-globals": { "acorn-globals": {
"version": "1.0.9", "version": "1.0.9",
"resolved": "https://registry.npm.taobao.org/acorn-globals/download/acorn-globals-1.0.9.tgz", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
"integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
"requires": { "requires": {
"acorn": "^2.1.0" "acorn": "^2.1.0"
...@@ -1763,7 +1763,7 @@ ...@@ -1763,7 +1763,7 @@
"dependencies": { "dependencies": {
"acorn": { "acorn": {
"version": "2.7.0", "version": "2.7.0",
"resolved": "https://registry.npm.taobao.org/acorn/download/acorn-2.7.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-2.7.0.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
"integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc="
} }
} }
...@@ -1939,7 +1939,7 @@ ...@@ -1939,7 +1939,7 @@
}, },
"array-equal": { "array-equal": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/array-equal/download/array-equal-1.0.0.tgz", "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
"integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
}, },
"array-find-index": { "array-find-index": {
...@@ -3704,7 +3704,7 @@ ...@@ -3704,7 +3704,7 @@
}, },
"cssstyle": { "cssstyle": {
"version": "0.2.37", "version": "0.2.37",
"resolved": "https://registry.npm.taobao.org/cssstyle/download/cssstyle-0.2.37.tgz", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
"integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
"requires": { "requires": {
"cssom": "0.3.x" "cssom": "0.3.x"
...@@ -7099,7 +7099,7 @@ ...@@ -7099,7 +7099,7 @@
}, },
"jsdom": { "jsdom": {
"version": "8.5.0", "version": "8.5.0",
"resolved": "https://registry.npm.taobao.org/jsdom/download/jsdom-8.5.0.tgz?cache=0&sync_timestamp=1585532008781&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsdom%2Fdownload%2Fjsdom-8.5.0.tgz", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-8.5.0.tgz",
"integrity": "sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=", "integrity": "sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=",
"requires": { "requires": {
"abab": "^1.0.0", "abab": "^1.0.0",
...@@ -7123,12 +7123,12 @@ ...@@ -7123,12 +7123,12 @@
"dependencies": { "dependencies": {
"acorn": { "acorn": {
"version": "2.7.0", "version": "2.7.0",
"resolved": "https://registry.npm.taobao.org/acorn/download/acorn-2.7.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-2.7.0.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
"integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc="
}, },
"parse5": { "parse5": {
"version": "1.5.1", "version": "1.5.1",
"resolved": "https://registry.npm.taobao.org/parse5/download/parse5-1.5.1.tgz", "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
"integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=" "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ="
} }
} }
...@@ -8452,7 +8452,7 @@ ...@@ -8452,7 +8452,7 @@
}, },
"omggif": { "omggif": {
"version": "1.0.7", "version": "1.0.7",
"resolved": "https://registry.npm.taobao.org/omggif/download/omggif-1.0.7.tgz", "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.7.tgz",
"integrity": "sha1-WdLuywJj3oRjWz/riHwMmXPx5J0=" "integrity": "sha1-WdLuywJj3oRjWz/riHwMmXPx5J0="
}, },
"on-finished": { "on-finished": {
...@@ -10139,7 +10139,7 @@ ...@@ -10139,7 +10139,7 @@
}, },
"rgbcolor": { "rgbcolor": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/rgbcolor/download/rgbcolor-1.0.1.tgz", "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
"integrity": "sha1-1lBezbMEplldom+ktDMHMGd1lF0=" "integrity": "sha1-1lBezbMEplldom+ktDMHMGd1lF0="
}, },
"rimraf": { "rimraf": {
...@@ -10648,8 +10648,8 @@ ...@@ -10648,8 +10648,8 @@
}, },
"simple-uploader.js": { "simple-uploader.js": {
"version": "0.5.4", "version": "0.5.4",
"resolved": "https://registry.npm.taobao.org/simple-uploader.js/download/simple-uploader.js-0.5.4.tgz", "resolved": "https://registry.npmjs.org/simple-uploader.js/-/simple-uploader.js-0.5.4.tgz",
"integrity": "sha1-+FjtH+/t3FjUanJNWmx3BAsLKbs=" "integrity": "sha512-Dmysgp0wyKqGdnZ9qnxS7QTg/Hfr25GxKM2XlrEnmzSPFmKroFqzW4Qaq/AbJDBvXv4YPGqS3S5YfVI3UxAU0A=="
}, },
"slash": { "slash": {
"version": "2.0.0", "version": "2.0.0",
...@@ -11543,7 +11543,7 @@ ...@@ -11543,7 +11543,7 @@
}, },
"tr46": { "tr46": {
"version": "0.0.3", "version": "0.0.3",
"resolved": "https://registry.npm.taobao.org/tr46/download/tr46-0.0.3.tgz", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
}, },
"trim-newlines": { "trim-newlines": {
...@@ -12008,8 +12008,8 @@ ...@@ -12008,8 +12008,8 @@
}, },
"vue-simple-uploader": { "vue-simple-uploader": {
"version": "0.7.4", "version": "0.7.4",
"resolved": "https://registry.npm.taobao.org/vue-simple-uploader/download/vue-simple-uploader-0.7.4.tgz", "resolved": "https://registry.npmjs.org/vue-simple-uploader/-/vue-simple-uploader-0.7.4.tgz",
"integrity": "sha1-jPYDP9rgWzn4mBRsyWEhOjhgYlk=", "integrity": "sha512-33uv07lkVj7m9gI7IIrQHAUcZkvl70g55lxnfnO/MZ8icwqiemW9Ah4ZexGWNrEfL1p6fV54PlOGICU17aBPFQ==",
"requires": { "requires": {
"simple-uploader.js": "^0.5.4" "simple-uploader.js": "^0.5.4"
} }
...@@ -12084,7 +12084,7 @@ ...@@ -12084,7 +12084,7 @@
}, },
"webidl-conversions": { "webidl-conversions": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/webidl-conversions/download/webidl-conversions-3.0.1.tgz?cache=0&sync_timestamp=1584995749925&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebidl-conversions%2Fdownload%2Fwebidl-conversions-3.0.1.tgz", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
}, },
"webpack": { "webpack": {
...@@ -12431,7 +12431,7 @@ ...@@ -12431,7 +12431,7 @@
}, },
"whatwg-url": { "whatwg-url": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/whatwg-url/download/whatwg-url-2.0.1.tgz", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-2.0.1.tgz",
"integrity": "sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=", "integrity": "sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=",
"requires": { "requires": {
"tr46": "~0.0.3", "tr46": "~0.0.3",
...@@ -12554,7 +12554,7 @@ ...@@ -12554,7 +12554,7 @@
}, },
"xml-name-validator": { "xml-name-validator": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/xml-name-validator/download/xml-name-validator-2.0.1.tgz", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
"integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=" "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU="
}, },
"xmldom": { "xmldom": {
......
src/components/UnDependenceDispose/UnDependence.vue
浏览文件 @ 8c4a72ba
...@@ -90,8 +90,11 @@ export default { ...@@ -90,8 +90,11 @@ export default {
} }
this.$server.getConfigPageList(this.myPage, this.pageSize, obj).then(res => { this.$server.getConfigPageList(this.myPage, this.pageSize, obj).then(res => {
console.log(res); console.log(res);
this.tableData = res.data.rows; if (res.data.code === 200) {
this.tablePageSize = res.data.total; this.tableData = res.data.data.rows;
this.tablePageSize = res.data.data.total;
}
}) })
}, },
// 数据 // 数据
...@@ -100,8 +103,10 @@ export default { ...@@ -100,8 +103,10 @@ export default {
technologyName:this.technologyId technologyName:this.technologyId
} }
this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => { this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
this.tableData = res.data.rows; if (res.data.code === 200) {
this.tablePageSize = res.data.total; this.tableData = res.data.data.rows;
this.tablePageSize = res.data.data.total;
}
}); });
}, },
// 点击分页 // 点击分页
......
src/components/keyTechnology/keyTechnology.vue
浏览文件 @ 8c4a72ba
...@@ -113,8 +113,10 @@ export default { ...@@ -113,8 +113,10 @@ export default {
} }
this.$server.getAllPageList(this.currentPage,this.pagesize,val).then(res=>{ this.$server.getAllPageList(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;
this.totleLength = res.data.data.total;
}
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
}) })
......
src/components/keyTechnology/keyTechnologyAdd.vue
浏览文件 @ 8c4a72ba
...@@ -111,7 +111,10 @@ export default { ...@@ -111,7 +111,10 @@ export default {
} }
this.$server.getAllKeySelect().then(res => { this.$server.getAllKeySelect().then(res => {
console.log(res); console.log(res);
this.tableDataAdd = res.data; if (res.data.code === 200) {
this.tableDataAdd = res.data.data;
}
}); });
}, },
methods: { methods: {
...@@ -124,7 +127,7 @@ export default { ...@@ -124,7 +127,7 @@ export default {
this.form.backOrFront = parseInt(this.form.backOrFront); this.form.backOrFront = parseInt(this.form.backOrFront);
if (this.value === '') { if (this.value === '') {
this.$server.addTec(this.form).then(res => { this.$server.addTec(this.form).then(res => {
if (res.data === 200) { if (res.data.code === 200) {
this.$message.success('新增成功！') this.$message.success('新增成功！')
this.$emit('on-cancel') this.$emit('on-cancel')
} else { } else {
...@@ -133,7 +136,7 @@ export default { ...@@ -133,7 +136,7 @@ export default {
}); });
} else { } else {
this.$server.editKey(this.value.id,this.form).then(res=>{ this.$server.editKey(this.value.id,this.form).then(res=>{
if (res.data === 200) { if (res.data.code === 200) {
this.$message.success('修改成功！') this.$message.success('修改成功！')
this.$emit('on-cancel') this.$emit('on-cancel')
} else { } else {
......
src/components/parameterConfiguration/parameterConfiguration.vue
浏览文件 @ 8c4a72ba
...@@ -84,34 +84,37 @@ export default { ...@@ -84,34 +84,37 @@ export default {
mounted(){ mounted(){
this.$server.getConfigValue().then(res=>{ this.$server.getConfigValue().then(res=>{
console.log(res) console.log(res)
for (let item of res.data) { if (res.data.code === 200) {
switch (item.name) { for (let item of res.data.data) {
case 'moneyRate': switch (item.name) {
this.allVal.moneyRate.value = item.value; case 'moneyRate':
this.allVal.moneyRate.id = item.id; this.allVal.moneyRate.value = item.value;
break; this.allVal.moneyRate.id = item.id;
case 'proportion': break;
this.allVal.proportion.value = item.value; case 'proportion':
this.allVal.proportion.id = item.id; this.allVal.proportion.value = item.value;
break; this.allVal.proportion.id = item.id;
case 'adaptivepro': break;
this.allVal.adaptivepro.value = item.value; case 'adaptivepro':
this.allVal.adaptivepro.id = item.id; this.allVal.adaptivepro.value = item.value;
break; this.allVal.adaptivepro.id = item.id;
case 'updatepro': break;
this.allVal.updatepro.value = item.value; case 'updatepro':
this.allVal.updatepro.id = item.id; this.allVal.updatepro.value = item.value;
break; this.allVal.updatepro.id = item.id;
case 'personMoney': break;
this.allVal.personMoney.value = item.value; case 'personMoney':
this.allVal.personMoney.id = item.id; this.allVal.personMoney.value = item.value;
break; this.allVal.personMoney.id = item.id;
case 'admin': break;
this.allVal.admin.value = item.value; case 'admin':
this.allVal.admin.id = item.id; this.allVal.admin.value = item.value;
break; this.allVal.admin.id = item.id;
break;
}
} }
} }
}) })
}, },
methods: { methods: {
...@@ -130,7 +133,7 @@ export default { ...@@ -130,7 +133,7 @@ export default {
val.push(this.allVal.personMoney); val.push(this.allVal.personMoney);
val.push(this.allVal.admin); val.push(this.allVal.admin);
this.$server.editConfigValue(val).then(res=>{ this.$server.editConfigValue(val).then(res=>{
if (res.data === 200) { if (res.data.code === 200) {
this.$message.success('修改成功！') this.$message.success('修改成功！')
} else { } else {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
......
src/components/reportAssess/reportAssess.vue
浏览文件 @ 8c4a72ba
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div>适配预算：<span class="nmmsl">{{sumAmount1}} <i style="color:#333;">万</i></span> </div> <div><span style="display: inline-block;width: 88.5px;text-align: right;">预算：</span><span class="nmmsl">{{sumAmount1}} <i style="color:#333;">万</i></span> </div>
</el-col> </el-col>
</el-row> </el-row>
......
src/components/roleDispose/addRole.vue
浏览文件 @ 8c4a72ba
...@@ -86,7 +86,9 @@ export default { ...@@ -86,7 +86,9 @@ export default {
getAll() { getAll() {
this.$server.getAllList().then(res => { this.$server.getAllList().then(res => {
console.log(res); console.log(res);
this.tableDataAdd = res.data; if (res.data.code === 200) {
this.tableDataAdd = res.data.data;
}
}); });
}, },
cancel() { cancel() {
......
src/components/roleDispose/roleDispose.vue
浏览文件 @ 8c4a72ba
...@@ -108,7 +108,9 @@ export default { ...@@ -108,7 +108,9 @@ export default {
mounted() { mounted() {
this.$server.getAllList().then(res => { // 获取所有关键技术 this.$server.getAllList().then(res => { // 获取所有关键技术
console.log(res) console.log(res)
this.allList = res.data if (res.data.code === 200) {
this.allList = res.data.data;
}
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
}) })
...@@ -118,11 +120,13 @@ export default { ...@@ -118,11 +120,13 @@ export default {
methods: { methods: {
// 搜索 // 搜索
keyName(){ keyName(){
this.$server.getAllList().then(res => { this.$server.getAllList().then(res => {
console.log(res); console.log(res);
this.keyNameList = res.data; if (res.data.code === 200) {
this.keyNameList = res.data.data;
}
}); });
}, },
search () { search () {
let obj = { let obj = {
...@@ -132,8 +136,11 @@ export default { ...@@ -132,8 +136,11 @@ export default {
} }
this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => { this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
console.log(res) console.log(res)
this.tableData = res.data.rows; if (res.data.code === 200) {
this.tablePageSize = res.data.total; this.tableData = res.data.data.rows;
this.tablePageSize = res.data.data.total;
}
}) })
}, },
// 修改 // 修改
......
src/services/axios.js
浏览文件 @ 8c4a72ba
...@@ -40,6 +40,7 @@ axios.interceptors.response.use(function (response) { ...@@ -40,6 +40,7 @@ axios.interceptors.response.use(function (response) {
} else { } else {
return response; return response;
} }
// return response;
}, function (error) { }, function (error) {
// 预处理响应错误（error) // 预处理响应错误（error)
// console.log(error.splice(error.length - 4,error.length - 1)) // console.log(error.splice(error.length - 4,error.length - 1))
......
src/services/server.js
浏览文件 @ 8c4a72ba
...@@ -396,12 +396,12 @@ const server = { ...@@ -396,12 +396,12 @@ const server = {
data:qs.stringify(data) data:qs.stringify(data)
}) })
}, },
getExcel(id){ getExcel(id){ // 转pdf
return axios( assessma + '/evaluation/in/excel/' + id,{ return axios( assessma + '/evaluation/in/excel/' + id,{
method:'get' method:'get'
}) })
}, },
getEvaDownload(data){ getEvaDownload(data){ // 下载wps
return axios( assessma + '/evaluation/downloadWps',{ return axios( assessma + '/evaluation/downloadWps',{
method:'post', method:'post',
data: data data: data
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论