new

src/assets/changeElementStyle.css

@@ -200,6 +200,3 @@
 .el-upload-list{
     display: none;
 }
-.el-scrollbar__wrap{
-    margin-bottom: 0px !important;
-}
\ No newline at end of file

src/components/admittance/technical/addTechnical.vue

@@ -136,8 +136,10 @@ export default {
         save() {
             let va = [];
             for (let item of this.allProduct) {
+                if (item.product2 !== '') {
                     va.push(item.product2)
                 }
+            }
             let val = {
                 'name': this.addVal,
                 'produceList': va

src/components/projectManagement/project/projectManagement.vue

@@ -43,7 +43,7 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="unit"
+                prop="consName"
                 label="建设单位"
                 align="center">
               </el-table-column>

src/components/projectManagement/projectInformation/projectInformation.vue

@@ -178,7 +178,7 @@ export default {
                         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[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) {
                             that.now = res.data.data.processMap.actual;
                             that.forecase = res.data.data.processMap.expect;

src/components/projectManagement/technicalRoute/technicalRoute.vue

@@ -9,35 +9,43 @@
                             <p class="search">
                                 <span class="value">
                                     <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 class="value">
                                     <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>
 
                             </p>
                             <p class="search">
                                 <span class="value">
                                     <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 class="value">
                                     <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>
                             </p>
                             <p class="search">
                                 <span class="value">
                                     <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 class="value">
                                     <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>
                             </p>
                         </el-col>
@@ -54,12 +62,12 @@ export default {
     data () {
         return {
             allVal: {
-                middleware: '',
-                system: '',
-                cpu: '',
-                database: '',
-                server: '',
-                computer: ''
+                middleware: [],
+                system: [],
+                cpu: [],
+                database: [],
+                server: [],
+                computer: []
             }
         }
     },
@@ -71,11 +79,21 @@ export default {
     },
     methods: {
         init() {
-            this.$server.getProjectGetTech(1).then((res) => { // 数据请求
+            this.$server.getProjectGetTech(this.value.id).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 = '暂无';
+                        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 => {
@@ -106,15 +124,21 @@ export default {
         font-size: 18px;
         color: #666;
     }
-    .technicalRoute .content .value>span{
+    .technicalRoute .content .value>span:nth-child(1){
         width: 150px;
         display: inline-block;
         line-height: 34px;
         text-align: right;
     }
+    .technicalRoute .content .value>span:nth-child(2){
+        display: flex;
+        width: 410px;
+        flex-flow: wrap;
+    }
     .technicalRoute>>>.el-input--medium .el-input__inner{
         font-size: 18px;
         color: #333;
+        margin-bottom: 10px;
         font-family: 'Regular';
     }
 </style>