sxyanzhu
/
jhbigscreen
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

update code

dev-login
haha 2023-09-16 17:03:58 +08:00
parent 845aa70278
commit 4661b3c733
3 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pages/projectQuality.vue
View File

@ -368,13 +368,12 @@ export default {
checkType:this.samplingNav checkType:this.samplingNav
}); });
}, },
doShowMeasuredDlg(){ doShowMeasuredDlg(){
/*
this.$refs.measuredDlg.showDialog({ this.$refs.measuredDlg.showDialog({
deptId:this.dept?.id||0, deptId:this.dept?.id||0,
projectId:this.projectInfo.id, projectId:this.projectInfo.id,
measureType:this.measuredNav measureType:this.measuredNav
});*/ });
}, },
showMaterialSeal(it){ showMaterialSeal(it){
this.$refs.msDlg.showDialog(it); this.$refs.msDlg.showDialog(it);

60
src/pages/quality/measuredDlg.vue
View File

@ -38,8 +38,8 @@
<div v-for="(it, idx) in dataTable" :key="idx" class="data-item" <div v-for="(it, idx) in dataTable" :key="idx" class="data-item"
:class="it.timeout ? 'time-out' : ''"> :class="it.timeout ? 'time-out' : ''">
<div class="item-left"> <div class="item-left">
<el-image ref="preview" style="width: 400px; " :preview-src-list="[it.detectionFile]" v-if="it.detectionFile" <el-image ref="preview" style="width: 400px; " :preview-src-list="it.images" v-if="it.mainImage"
:src="it.detectionFile + '.1000.jpg'"> :src="it.mainImage + '.1000.jpg'">
</el-image> </el-image>
<div v-else style="text-align: center;"> <div v-else style="text-align: center;">
<img src="images/nodata.png" style="width: 240px;"> <img src="images/nodata.png" style="width: 240px;">
@ -57,47 +57,40 @@
<div class="div-text">{{ it.deptName }}</div> <div class="div-text">{{ it.deptName }}</div>
</el-col> </el-col>
<el-col :span="fontSize==2?12:12" class="item-data"> <el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">送检类型:</span> <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">测量类型:</span>
<div class="div-text">{{ it.checkTypeName }}</div> <div class="div-text">{{ it.measureTypeName }}</div>
</el-col> </el-col>
<el-col :span="fontSize==2?12:12" class="item-data"> <el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">材料名称:</span> <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">测量内容:</span>
<div class="div-text">{{ it.materialName }}</div> <div class="div-text">{{ it.measureInfo }}</div>
</el-col> </el-col>
<el-col :span="fontSize==2?12:12" class="item-data"> <el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">使用部位:</span> <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">测量部位:</span>
<div class="div-text">{{ it.usePosition }}</div> <div class="div-text">{{ it.measurePosition }}</div>
</el-col> </el-col>
<el-col :span="fontSize==2?24:12" class="item-data"> <el-col :span="fontSize==2?24:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">取样数量:</span> <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">测量时间:</span>
<div class="div-text">{{ it.sampleNum }}</div> <div class="div-text">{{ it.measureTime|dateFormat }}</div>
</el-col> </el-col>
<el-col :span="fontSize==2?12:12" class="item-data"> <el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">合格证:</span> <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">测量点位:</span>
<div class="div-text">{{ it.measurePointPosition }}</div>
</el-col>
<el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">测量结果:</span>
<div class="div-text"> <div class="div-text">
<el-tag v-if="it.qualifiedFlag == 'Y'" type="success">已提供</el-tag> <el-tag v-if="it.measureResult == '1'" type="success">合格</el-tag>
<el-tag v-else type="danger">未提供</el-tag>
</div>
</el-col>
<el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">见证人:</span>
<div class="div-text">{{ it.witnessUser }}</div>
</el-col>
<el-col :span="fontSize==2?24:24" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">实验室名称:</span>
<div class="div-text">{{ it.laboratoryName }}</div>
</el-col>
<el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">送检时间:</span>
<div class="div-text">{{ it.checkTime|dateFormat }}</div>
</el-col>
<el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">检测结果:</span>
<div class="div-text">
<el-tag v-if="it.detectionResult == '1'" type="success">合格</el-tag>
<el-tag v-else type="danger">不合格</el-tag> <el-tag v-else type="danger">不合格</el-tag>
</div> </div>
</el-col> </el-col>
<el-col :span="fontSize==2?12:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">质量专员:</span>
<div class="div-text">{{ it.qualityUserName }}{{ it.qualityUser }}</div>
</el-col>
<el-col :span="fontSize==2?24:24" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">监理专员:</span>
<div class="div-text">{{ it.superviseUserName }}{{ it.superviseUser}}</div>
</el-col>
<el-col :span="fontSize==2?24:12" class="item-data"> <el-col :span="fontSize==2?24:12" class="item-data">
<img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span> <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
<div class="div-text">{{it.createByName}}({{ it.createBy }})</div> <div class="div-text">{{it.createByName}}({{ it.createBy }})</div>
@ -151,7 +144,10 @@ export default {
this.show = true this.show = true
this.$api.measure.getList(opt).then(d=>{ this.$api.measure.getList(opt).then(d=>{
this.dataTable=d.data||[]; this.dataTable=(d.data||[]).map(it=>{
it.images=(it.imageUrls||"").split(",").filter(it=>it);
return it;
});
this.title="实测实量-"+['汇总','混泥土工程','二次构建','房间尺寸','抹灰工程','其它'][opt.checkType||0]+`[${this.dataTable.length}]`; this.title="实测实量-"+['汇总','混泥土工程','二次构建','房间尺寸','抹灰工程','其它'][opt.checkType||0]+`[${this.dataTable.length}]`;
}); });
} }

4
vue.config.js
View File

@ -23,8 +23,8 @@ module.exports = defineConfig({
} }
}, },
'/jhapi':{ '/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, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/jhapi':'/' '^/jhapi':'/'