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

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into prv

prv
haha 2024-04-21 00:18:39 +08:00
parent f0894ff154 0f1ad6c83f
commit 9d524325d5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/components/JobWorkerDialog.vue
View File

@ -6,9 +6,9 @@
ref="fbsubordinateUnit" :show-summary="tableData.length > 1">
<el-table-column label="项目名称" align="left" prop="prjName" />
<el-table-column label="部门" align="left" prop="dptName"></el-table-column>
<el-table-column label="劳务人数" align="center" prop="data101" />
<el-table-column label="总包人数" align="center" prop="data101" />
<el-table-column label="监理人数" align="center" prop="data102" />
<el-table-column label="总包人数" align="center" prop="data103" />
<el-table-column label="劳务7人数" align="center" prop="data103" />
<el-table-column label="合计" align="center" prop="total">
<template slot-scope="{row}"><span style="font-size:16px;font-weight: bold;color:#87e3fa;">{{row.total }}</span></template>
</el-table-column>

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

@ -79,8 +79,9 @@
<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.measureResult == null " type="success">进行中</el-tag>
<el-tag v-if="it.measureResult == '1'" type="success">合格</el-tag>
<el-tag v-else type="danger">不合格</el-tag>
<el-tag v-if="it.measureResult == '2'" type="success">不合格</el-tag>
</div>
</el-col>
<el-col :span="fontSize==2?12:12" class="item-data">