update code

src/pages/components/ProblemmodifyDetail.vue

@@ -47,7 +47,7 @@
                     :class="it.timeout ? 'time-out' : ''">
                     <div class="item-left">
                         <el-image ref="preview" style="width: 400px; " :preview-src-list="[it.marksPicture]"
-                            :src="it.marksPicture + '.min.jpg'">
+                            :src="it.marksPicture + '.1000.jpg'">
                         </el-image>
                     </div>
                     <div class="item-right">

src/pages/detail/projectInfoDlg.vue

@@ -85,60 +85,51 @@
             </el-row>
 
             <el-row class="data-item">
-                <el-col :span="6" class="data-row">
+                <el-col :span="8" class="data-row">
                     <img src="images/title_icon.png"><span class="sp-lbl">责任主体:</span>
                     <div class="div-text">{{ prj.deptName }}</div>
                 </el-col>
-                <el-col :span="6" class="data-row">
+                <el-col :span="8" class="data-row">
-                    <img src="images/title_icon.png"><span class="sp-lbl">重要等级:</span>
-                    <div class="div-text">{{ getProjectWeight(prj.weightType) }}</div>
-                </el-col>
-                <el-col :span="6" class="data-row">
-                    <img src="images/title_icon.png"><span class="sp-lbl">甲方代表:</span>
-                    <div class="div-text">{{ getPrjDeptName('甲方代表') }}</div>
-                </el-col>
-                <el-col :span="6" class="data-row">
-                    <img src="images/title_icon.png"><span class="sp-lbl">项目分类:</span>
-                    <div class="div-text">{{ getProjectCategory(prj.projectType) }}</div>
-                </el-col>
-            </el-row>
-
-            <el-row class="data-item">
-                <el-col :span="6" class="data-row">
                     <img src="images/title_icon.png"><span class="sp-lbl">项目等级:</span>
                     <div class="div-text">{{ getProjectLevel(prj.projiectLevel) }}</div>
                 </el-col>
-                <el-col :span="6" class="data-row">
+                <el-col :span="8" class="data-row">
+                    <img src="images/title_icon.png"><span class="sp-lbl">项目分类:</span>
+                    <div class="div-text">{{ getProjectCategory(prj.projectType) }}</div>
+                </el-col>               
+            </el-row>
+            <el-row class="data-item">
+                <el-col :span="8" class="data-row">
+                    <img src="images/title_icon.png"><span class="sp-lbl">项目总投资:</span>
+                    <div class="div-text">{{ prj.totalInvestment }}万元</div>
+                </el-col>
+
+                <el-col :span="8" class="data-row">
                     <img src="images/title_icon.png"><span class="sp-lbl">建筑面积:</span>
                     <div class="div-text">{{ prj.floorArea ? prj.floorArea + '平方米' : '' }}</div>
                 </el-col>
-                <el-col :span="6" class="data-row">
+
+                <el-col :span="8" class="data-row">
                     <img src="images/title_icon.png"><span class="sp-lbl">工程期限:</span>
                     <div class="div-text">{{ prj.projectTimeLimit ? prj.projectTimeLimit + '天' : '' }}</div>
                 </el-col>
-                <el-col :span="6" class="data-row">
-                    <img src="images/title_icon.png"><span class="sp-lbl">项目建设类型:</span>
-                    <div class="div-text">{{ getProjectBuildType(prj.projectNature) }}</div>
-                </el-col>
             </el-row>
 
+          
+
             <el-row class="data-item">
-                <el-col :span="6" class="data-row">
+                <el-col :span="8" class="data-row">
                     <img src="images/title_icon.png"><span class="sp-lbl">计划开工时间:</span>
                     <div class="div-text">{{ prj.scheduledStartTime }}</div>
                 </el-col>
-                <el-col :span="6" class="data-row">
+                <el-col :span="8" class="data-row">
                     <img src="images/title_icon.png"><span class="sp-lbl">计划完成时间:</span>
                     <div class="div-text">{{ prj.plannedCompletionTime }}</div>
                 </el-col>
-                <el-col :span="6" class="data-row">
+                <el-col :span="8" class="data-row">
                     <img src="images/title_icon.png"><span class="sp-lbl">实际开工时间:</span>
                     <div class="div-text">{{ prj.actualOperatingTime | formatDate }}</div>
-                </el-col>
+                </el-col>              
-                <el-col :span="6" class="data-row">
-                    <img src="images/title_icon.png"><span class="sp-lbl">实际完工时间:</span>
-                    <div class="div-text">{{ prj.actualCompletionTime }}</div>
-                </el-col>
             </el-row>          
 
 
@@ -318,6 +309,7 @@ export default {
 
            
             this.users3=[];
+            this.addUsers(11,users,"建设单位","甲方代表");
             this.addUsers(2,users,"总包单位","项目经理");
             this.addUsers(4,users,"监理单位","总监");
             this.addUsers(1,users,"设计单位","项目负责人");

src/pages/progress/indexDlg3.vue

@@ -102,6 +102,7 @@
                         <div>{{ scheduleInfo.actualNode }}</div>
                     </div>
                 </template>
+            <template v-if="scheduleInfo.dataTemplate!=4">
                 <template v-if="scheduleInfo.purchaseProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">融资、招采进展</span></div>
                     <div class="div-text ">
@@ -126,12 +127,54 @@
                         <div>{{ scheduleInfo.acceptanceProgress }}</div>
                     </div>
                 </template>
+            </template>
+            <template v-if="scheduleInfo.dataTemplate==4">
+                <template v-if="scheduleInfo.constructionProgress">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">施工进展</span></div>
+                    <div class="div-text ">
+                        <div>{{ scheduleInfo.constructionProgress }}</div>
+                    </div>
+                </template>
+                <template v-if="scheduleInfo.acceptanceProgress">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">验收进展</span></div>
+                    <div class="div-text ">
+                        <div>{{ scheduleInfo.acceptanceProgress }}</div>
+                    </div>
+                </template>
+                <template v-if="scheduleInfo.purchaseProgress">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">结算进展</span></div>
+                    <div class="div-text ">
+                        <div>{{ scheduleInfo.purchaseProgress }}</div>
+                    </div>
+                </template>
+                <template v-if="scheduleInfo.designProgress">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">运维进展</span></div>
+                    <div class="div-text ">
+                        <div>{{ scheduleInfo.designProgress }}</div>
+                    </div>
+                </template>
+            </template>
                 <template v-if="scheduleInfo.planForNextWeek">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">下周计划</span></div>
                     <div class="div-text ">
                         <div>{{ scheduleInfo.planForNextWeek }}</div>
                     </div>
                 </template>
+
+                <template v-if="scheduleInfo.existingProblem">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">存在问题</span></div>
+                    <div class="div-text ">
+                        <div>{{ scheduleInfo.existingProblem }}</div>
+                    </div>
+                </template>
+
+                <template v-if="scheduleInfo.problemProgress">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">问题推进情况</span></div>
+                    <div class="div-text ">
+                        <div>{{ scheduleInfo.problemProgress }}</div>
+                    </div>
+                </template>
+
                 </div>
             </div>
         </div>

src/pages/progress/problemProgress.vue

@@ -23,7 +23,7 @@
                 <div class="project-amount project-issue" v-if="scheduleInfo">
                     <div class="issue-title screen-one-1-1">{{ prj.projectName }}</div>
                     <div class="row-1">
-                        <div class="sp-lbl">问题描述:</div>
+                        <div class="sp-lbl">存在问题:</div>
                         <div class="sp-detail" :title="info.existingProblem">{{ info.existingProblem }}</div>
                     </div>
                     <div class="row-1">

src/pages/projectProgress.vue

@@ -208,7 +208,7 @@
                                     </el-carousel>
                                 </div>
                                 <div class="col-2 scroll"
-                                    style="flex-grow: 1;max-height: 270px;overflow: auto;width: calc(100% - 4px);margin-top:8px;">
+                                    style="flex-grow: 1;max-height: 270px;overflow: auto;width: calc(100% - 4px);margin-top:8px;">                                   
                                     <template v-if="scheduleInfo.plannedNode">
                                         <div><img src="images/title_icon.png"><span class="sp-lbl">计划节点</span></div>
                                         <div class="div-text ">
@@ -221,6 +221,7 @@
                                             <div>{{ scheduleInfo.actualNode }}</div>
                                         </div>
                                     </template>
+                                    <template v-if="scheduleInfo.dataTemplate!=4">
                                     <template v-if="scheduleInfo.purchaseProgress">
                                         <div><img src="images/title_icon.png"><span class="sp-lbl">融资、招采进展</span></div>
                                         <div class="div-text ">
@@ -244,6 +245,34 @@
                                         <div class="div-text ">
                                             <div>{{ scheduleInfo.acceptanceProgress }}</div>
                                         </div>
+                                    </template>
+                                    </template>
+                                    <template v-if="scheduleInfo.dataTemplate==4">
+                                    <template v-if="scheduleInfo.constructionProgress">
+                                        <div><img src="images/title_icon.png"><span class="sp-lbl">施工进展</span></div>
+                                        <div class="div-text ">
+                                            <div>{{ scheduleInfo.constructionProgress }}</div>
+                                        </div>
+                                    </template>
+                                    <template v-if="scheduleInfo.acceptanceProgress">
+                                        <div><img src="images/title_icon.png"><span class="sp-lbl">验收进展</span></div>
+                                        <div class="div-text ">
+                                            <div>{{ scheduleInfo.acceptanceProgress }}</div>
+                                        </div>
+                                    </template>
+                                    <template v-if="scheduleInfo.purchaseProgress">
+                                        <div><img src="images/title_icon.png"><span class="sp-lbl">结算进展</span></div>
+                                        <div class="div-text ">
+                                            <div>{{ scheduleInfo.purchaseProgress }}</div>
+                                        </div>
+                                    </template>
+                                    <template v-if="scheduleInfo.designProgress">
+                                        <div><img src="images/title_icon.png"><span class="sp-lbl">运维进展</span></div>
+                                        <div class="div-text ">
+                                            <div>{{ scheduleInfo.designProgress }}</div>
+                                        </div>
+                                    </template>
+
                                     </template>
                                     <template v-if="scheduleInfo.planForNextWeek">
                                         <div><img src="images/title_icon.png"><span class="sp-lbl">下周计划</span></div>

src/pages/projectQuality.vue

@@ -138,8 +138,8 @@
                     <module-one-1-1 label="材料封样">
                         <div class="material-seal-list scroll" :key="'ms'+materialSealEl" style="max-height: 284px;overflow-y: auto;">
                             <div v-for="(it,idx) in materialSealList" :key="idx" class="material-seal-item">
-                                <div class="material-seal-left">
+                                <div class="material-seal-left">                                    
-                                    <el-image :src="it.signFiles+'.min.jpg'" :preview-src-list="[it.signFiles]"></el-image>
+                                    <el-image :src="it.mainImage+'.min.jpg'" :preview-src-list="[it.mainImage]"></el-image>
                                 </div>
                                 <div class="material-seal-right" @click="showMaterialSeal(it)">
                                     <div><img src="images/title_icon.png"><span class="sp-lbl">封样名称</span></div>

vue.config.js

@@ -16,8 +16,8 @@ module.exports = defineConfig({
         }
       },   
       '/jhapi':{
-        target: `http://62.234.3.186/jhapi/`,
+        //target: `http://62.234.3.186/jhapi/`,
-        //target: `http://127.0.0.1:8090/jhapi/`,
+        target: `http://127.0.0.1:8090/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'