Skip to content

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

new

上级 e06f060e
隐藏空白字符变更
内嵌 并排
正在显示 包含 44 行增加 和 22 行删除
src/assets/changeElementStyle.css
浏览文件 @ 166624cc
...@@ -200,6 +200,3 @@ ...@@ -200,6 +200,3 @@
.el-upload-list{ .el-upload-list{
display: none; display: none;
} }
.el-scrollbar__wrap{
margin-bottom: 0px !important;
}
\ No newline at end of file
src/components/admittance/technical/addTechnical.vue
浏览文件 @ 166624cc
...@@ -136,7 +136,9 @@ export default { ...@@ -136,7 +136,9 @@ export default {
save() { save() {
let va = []; let va = [];
for (let item of this.allProduct) { for (let item of this.allProduct) {
va.push(item.product2) if (item.product2 !== '') {
va.push(item.product2)
}
} }
let val = { let val = {
'name': this.addVal, 'name': this.addVal,
......
src/components/projectManagement/project/projectManagement.vue
浏览文件 @ 166624cc
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unit" prop="consName"
label="建设单位" label="建设单位"
align="center"> align="center">
</el-table-column> </el-table-column>
......
src/components/projectManagement/projectInformation/projectInformation.vue
浏览文件 @ 166624cc
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
that.marker[0].time = that.time(res.data.data.goals[0].startTime); that.marker[0].time = that.time(res.data.data.goals[0].startTime);
that.marker[1].time = that.time(res.data.data.goals[1].startTime); that.marker[1].time = that.time(res.data.data.goals[1].startTime);
that.marker[2].time = that.time(res.data.data.goals[2].startTime); that.marker[2].time = that.time(res.data.data.goals[2].startTime);
that.marker[3].time = that.time(res.data.data.endTime); that.marker[3].time = that.time(res.data.data.goals[2].endTime);
if (res.data.data.processMap !== null) { if (res.data.data.processMap !== null) {
that.now = res.data.data.processMap.actual; that.now = res.data.data.processMap.actual;
that.forecase = res.data.data.processMap.expect; that.forecase = res.data.data.processMap.expect;
......
src/components/projectManagement/technicalRoute/technicalRoute.vue
浏览文件 @ 166624cc
...@@ -9,35 +9,43 @@ ...@@ -9,35 +9,43 @@
<p class="search"> <p class="search">
<span class="value"> <span class="value">
<span>中间件：</span> <span>中间件：</span>
<el-input v-model="allVal.middleware" size="medium" :disabled="true"></el-input> <el-input v-for="item of allVal.middleware" :value="item" :key="item" size="medium" :disabled="true" v-show="allVal.middleware.length !== 0"></el-input>
<el-input v-if="allVal.middleware.length === 0" value="暂无" size="medium" :disabled="true"></el-input>
</span> </span>
<span class="value"> <span class="value">
<span>操作系统：</span> <span>操作系统：</span>
<el-input v-model="allVal.system" size="medium" :disabled="true"></el-input> <el-input v-for="item of allVal.system" :value="item" :key="item" size="medium" :disabled="true" v-show="allVal.system.length !== 0"></el-input>
<el-input v-if="allVal.system.length === 0" value="暂无" size="medium" :disabled="true"></el-input>
</span> </span>
</p> </p>
<p class="search"> <p class="search">
<span class="value"> <span class="value">
<span>CPU型号：</span> <span>CPU型号：</span>
<el-input v-model="allVal.cpu" size="medium" :disabled="true"></el-input> <el-input v-for="item of allVal.cpu" :value="item" :key="item" size="medium" :disabled="true" v-show="allVal.cpu.length !== 0"></el-input>
<el-input v-if="allVal.cpu.length === 0" value="暂无" size="medium" :disabled="true"></el-input>
</span> </span>
<span class="value"> <span class="value">
<span>数据库：</span> <span>数据库：</span>
<el-input v-model="allVal.database" size="medium" :disabled="true"></el-input> <el-input v-for="item of allVal.database" :value="item" :key="item" size="medium" :disabled="true" v-show="allVal.database.length !== 0"></el-input>
<el-input v-if="allVal.database.length === 0" value="暂无" size="medium" :disabled="true"></el-input>
</span> </span>
</p> </p>
<p class="search"> <p class="search">
<span class="value"> <span class="value">
<span>服务器：</span> <span>服务器：</span>
<el-input v-model="allVal.server" size="medium" :disabled="true"></el-input> <span>
<el-input v-for="item of allVal.server" :value="item" :key="item" size="medium" :disabled="true" v-show="allVal.server.length !== 0"></el-input>
<el-input v-if="allVal.server.length === 0" value="暂无" size="medium" :disabled="true"></el-input>
</span>
</span> </span>
<span class="value"> <span class="value">
<span>笔记本：</span> <span>笔记本：</span>
<el-input v-model="allVal.computer" size="medium" :disabled="true"></el-input> <el-input v-for="item of allVal.computer" :value="item" :key="item" size="medium" :disabled="true" v-show="allVal.computer.length !== 0"></el-input>
<el-input v-if="allVal.computer.length === 0" value="暂无" size="medium" :disabled="true"></el-input>
</span> </span>
</p> </p>
</el-col> </el-col>
...@@ -54,12 +62,12 @@ export default { ...@@ -54,12 +62,12 @@ export default {
data () { data () {
return { return {
allVal: { allVal: {
middleware: '', middleware: [],
system: '', system: [],
cpu: '', cpu: [],
database: '', database: [],
server: '', server: [],
computer: '' computer: []
} }
} }
}, },
...@@ -71,11 +79,21 @@ export default { ...@@ -71,11 +79,21 @@ export default {
}, },
methods: { methods: {
init() { init() {
this.$server.getProjectGetTech(1).then((res) => { // 数据请求 this.$server.getProjectGetTech(this.value.id).then((res) => { // 数据请求
console.log(res.data) console.log(res.data)
if (res.data.code === 200) { if (res.data.code === 200) {
for (let item of res.data.data.producies) { 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 = '暂无'; if (item.form === 1) {
this.allVal.server.push(item.name)
} else if (item.form === 2) {
this.allVal.cpu.push(item.name)
} else if (item.form === 3) {
this.allVal.system.push(item.name)
} else if (item.form === 4) {
this.allVal.database.push(item.name)
} else if (item.form === 5) {
this.allVal.middleware.push(item.name)
}
} }
} }
}).catch(err => { }).catch(err => {
...@@ -106,15 +124,21 @@ export default { ...@@ -106,15 +124,21 @@ export default {
font-size: 18px; font-size: 18px;
color: #666; color: #666;
} }
.technicalRoute .content .value>span{ .technicalRoute .content .value>span:nth-child(1){
width: 150px; width: 150px;
display: inline-block; display: inline-block;
line-height: 34px; line-height: 34px;
text-align: right; text-align: right;
} }
.technicalRoute .content .value>span:nth-child(2){
display: flex;
width: 410px;
flex-flow: wrap;
}
.technicalRoute>>>.el-input--medium .el-input__inner{ .technicalRoute>>>.el-input--medium .el-input__inner{
font-size: 18px; font-size: 18px;
color: #333; color: #333;
margin-bottom: 10px;
font-family: 'Regular'; font-family: 'Regular';
} }
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论