diff --git a/src/api/checkDetection/index.js b/src/api/checkDetection/index.js
index 1508128..e97e28c 100644
--- a/src/api/checkDetection/index.js
+++ b/src/api/checkDetection/index.js
@@ -6,8 +6,17 @@ const groupByCheckType=(data)=> {
       method: 'post',
       data:data
     })
-  }
+}
+
+const getList=data=>{
+  return request({
+    url: `bgscreen/checkDetection/getList`,
+    method: 'post',
+    data:data
+  })
+}
 
 export default{
-    groupByCheckType
+    groupByCheckType,
+    getList
 }
\ No newline at end of file
diff --git a/src/api/measure/index.js b/src/api/measure/index.js
index 436e6f0..8120937 100644
--- a/src/api/measure/index.js
+++ b/src/api/measure/index.js
@@ -7,7 +7,14 @@ const groupMeasureInfo=(data)=> {
       data:data
     })
   }
-
+const getList=data=>{
+  return request({
+    url: `bgscreen/measure/getList`,
+    method: 'post',
+    data:data
+  })
+}
 export default{
-    groupMeasureInfo
+    groupMeasureInfo,
+    getList
 }
\ No newline at end of file
diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue
index f47e9ec..3c1338c 100644
--- a/src/pages/projectQuality.vue
+++ b/src/pages/projectQuality.vue
@@ -225,6 +225,8 @@
     <ProblemmodifyDetail ref="probDlg"></ProblemmodifyDetail>
     <showCheckingDlg ref="checkDlg"></showCheckingDlg>
     <materialSealDetialDlg ref="msDlg"></materialSealDetialDlg>
+    <checkDetectionDlg ref="chkDetectionDlg"></checkDetectionDlg>
+    <measuredDlg ref="measuredDlg"></measuredDlg>
     </div>
 </template>
 
@@ -241,12 +243,15 @@ import '../components/people-number'
 import ProblemmodifyDetail from './components/ProblemmodifyDetail.vue'
 import showCheckingDlg from './quality/showCheckingDlg.vue'
 import materialSealDetialDlg from './quality/materialSealDetialDlg.vue'
+import checkDetectionDlg from './quality/checkDetectionDlg.vue'
+import measuredDlg from './quality/measuredDlg.vue'
 export default {
     components:{
-        ProblemmodifyDetail,showCheckingDlg,materialSealDetialDlg
+        ProblemmodifyDetail,showCheckingDlg,materialSealDetialDlg,checkDetectionDlg,measuredDlg
     },
     data() {
             return {
+                materialSealList:[],
                 selDate:'',
                 elKey:0,
                 materialSealEl:0,
@@ -357,10 +362,19 @@ export default {
         },
         methods: { 
             doShowCheckDetectionDlg(){
-
+                this.$refs.chkDetectionDlg.showDialog({
+                    deptId:this.dept?.id||0,
+                    projectId:this.projectInfo.id,
+                    checkType:this.samplingNav
+                });
             },
             doShowMeasuredDlg(){
-
+                /*
+                this.$refs.measuredDlg.showDialog({
+                    deptId:this.dept?.id||0,
+                    projectId:this.projectInfo.id,
+                    measureType:this.measuredNav
+                });*/
             },
             showMaterialSeal(it){
                 this.$refs.msDlg.showDialog(it);
@@ -368,7 +382,7 @@ export default {
             selectTop20materialSeal(){
                 let postData={};
                 postData.deptId=this.dept?.id||0;
-                postData.projectId=this.projectInfo.id;
+                postData.projectId=this.projectInfo?.id||0;
                 this.$api.materialSeal.selectTop20(postData).then(d=>{
                     this.materialSealList=d.data||[];
                     this.materialSealEl++;
diff --git a/src/pages/quality/checkDetectionDlg.vue b/src/pages/quality/checkDetectionDlg.vue
index 600d4fb..73f4d13 100644
--- a/src/pages/quality/checkDetectionDlg.vue
+++ b/src/pages/quality/checkDetectionDlg.vue
@@ -1,49 +1,127 @@
 <template>
-    <MyDialog v-if="show" v-model="show" width="880px" ref="dlg">
+    <MyDialog v-if="show" v-model="show" width="1600px" height="850px" :class="'font-size-' + fontSize"
+    class="check-detection-dlg">
         <template slot="title">
-            <div class="warning-info-title" style="padding-left: 20px;">
-                <div :class="nav == 0 ? 'active' : ''" class="nav-item" @click="toggleNav(0)">安全管理</div>
-                <div :class="nav == 1 ? 'active' : ''" class="nav-item" @click="toggleNav(1)">质量管理</div>
-            </div>
+            {{ title }}
         </template>
-        <el-table v-if="nav == 0" :data="tableData" class="mytable" height="500" style="width: 100%;background: transparent;"
-            ref="fbsubordinateUnit">
-
-            <el-table-column prop="prj" label="项目名称"> </el-table-column>
-            <el-table-column prop="node" label="节点名称" width="150" class-name="text-left">
-                <template slot-scope="scope">
-                    <span style="color:#01A9FF;font-size: 12px;">{{ scope.row.node }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="days" label="逾期天数">
-                <template slot-scope="scope">
-                    <span style="color:red">{{ scope.row.days }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="计划完成时间">
-
-            </el-table-column>
-        </el-table>
-
-        <el-table v-else :data="tableData" class="mytable" style="width: 100%;background: transparent;"
-            ref="fbsubordinateUnit">
-
-            <el-table-column prop="prj" label="项目名称2"> </el-table-column>
-            <el-table-column prop="node" label="节点名称2" width="150" class-name="text-left">
-                <template slot-scope="scope">
-                    <span style="color:#01A9FF;font-size: 12px;">{{ scope.row.node }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="days" label="逾期天数2">
-                <template slot-scope="scope">
-                    <span style="color:red">{{ scope.row.days }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="计划完成时间2">
-
-            </el-table-column>
-        </el-table>
-
+        <div>
+            <div class="font-size-tools">
+                <i class="set-font-size font-size2" @click="fontSize = 2" :class="fontSize == 2 ? 'active' : ''">
+                    <svg class="icon  svg-icon"
+                        style="width: 32px !important;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+                        viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3686">
+                        <path
+                            d="M839 875H735.3l-74.1-198.7H358.6L288.7 875H185l276.8-726h100.4L839 875zM632.1 594.3L522.3 292.4c-3.4-9.7-7.2-26.6-11.3-50.6h-2.3c-3.4 21.9-7.4 38.7-11.7 50.6L388.1 594.3h244z"
+                            fill="#fff" p-id="3687"></path>
+                    </svg>
+                </i>
+                <i class="set-font-size font-size1" @click="fontSize = 1" :class="fontSize == 1 ? 'active' : ''">
+                    <svg class="icon  svg-icon"
+                        style="width: 32px !important;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+                        viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3686">
+                        <path
+                            d="M839 875H735.3l-74.1-198.7H358.6L288.7 875H185l276.8-726h100.4L839 875zM632.1 594.3L522.3 292.4c-3.4-9.7-7.2-26.6-11.3-50.6h-2.3c-3.4 21.9-7.4 38.7-11.7 50.6L388.1 594.3h244z"
+                            fill="#fff" p-id="3687"></path>
+                    </svg>
+                </i>
+                <i class="set-font-size font-size0" @click="fontSize = 0" :class="fontSize == 0 ? 'active' : ''">
+                    <svg class="icon  svg-icon"
+                        style="width: 32px !important;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+                        viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3686">
+                        <path
+                            d="M839 875H735.3l-74.1-198.7H358.6L288.7 875H185l276.8-726h100.4L839 875zM632.1 594.3L522.3 292.4c-3.4-9.7-7.2-26.6-11.3-50.6h-2.3c-3.4 21.9-7.4 38.7-11.7 50.6L388.1 594.3h244z"
+                            fill="#fff" p-id="3687"></path>
+                    </svg>
+                </i>
+            </div>
+            <div class="data-list scroll" style="max-height:770px;overflow-y: auto;margin:12px 0px;overflow-x: hidden;" v-if="dataTable.length>0">
+                <div v-for="(it, idx) in dataTable" :key="idx" class="data-item"
+                    :class="it.timeout ? 'time-out' : ''">
+                    <div class="item-left">
+                        <el-image ref="preview" style="width: 400px; " :preview-src-list="[it.detectionFile]" v-if="it.detectionFile"
+                            :src="it.detectionFile + '.1000.jpg'">
+                        </el-image>
+                        <div v-else style="text-align: center;">
+                            <img src="images/nodata.png" style="width: 240px;">
+                            <div style="text-align: center;">暂无图片</div>
+                        </div>
+                        
+                    </div>
+                    <div class="item-right">
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">项目名称:</span>
+                            <div class="div-text">{{ it.projectName }}</div>
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">单位名称:</span>
+                            <div class="div-text">{{ it.deptName }}</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.checkTypeName }}</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.materialName }}</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.usePosition }}</div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">取样数量:</span>
+                            <div class="div-text">{{ it.sampleNum }}</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.qualifiedFlag == 'Y'" 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>
+                            </div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
+                            <div class="div-text">{{it.createByName}}({{ it.createBy  }})</div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交时间:</span>
+                            <div class="div-text">{{ it.createTime|dateFormat }}</div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data" v-if="it.updateBy">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">登记结果用户:</span>
+                            <div class="div-text">{{it.updateByName}}({{ it.updateBy  }})</div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data" v-if="it.updateTime">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">登记结果时间:</span>
+                            <div class="div-text">{{ it.updateTime|dateFormat }}</div>                            
+                        </el-col>
+                    </div>
+                </div>                
+            </div>
+            <div v-else style="text-align: center;margin-top: 200px;">
+                <img src="images/nodata.png" style="width: 240px;">
+                <div style="text-align: center;">暂无数据</div>
+            </div>
+        </div>        
     </MyDialog>
 </template>
 
@@ -56,43 +134,183 @@ export default {
     },
     data() {
         return {
-            nav: 0,
+            fontSize: 0,
+            title:'',
             show: false,
-            tableData: []
+            dataTable: []
         };
     },
 
     mounted() {
-        window.dlg2 = this
-        this.tableData = [
-           
-        ]
     },
-
     methods: {
         toggleNav(n) {
             this.nav = n;
         },
-        showDialog() {
-            this.show = true
+        showDialog(opt) {           
+            
+            this.show = true           
+            this.$api.checkDetection.getList(opt).then(d=>{
+                this.dataTable=d.data||[];
+                this.title="材料进场取样复试-"+['汇总','钢筋原材料','钢筋试拉件','混凝土试件','其他'][opt.checkType||0]+`[${this.dataTable.length}]`;
+            });
         }
     },
 };
 </script>
 
-<style lang="less" scoped>
-.mytable {
-    /deep/ th .cell {
-        color: aquamarine;
+<style lang="less" >
+.check-detection-dlg {
+    .popup-project-introduction-min {
+        transform: translateY(100px);
+        position: relative;
     }
-}
 
-.warning-info-title {
-    .nav-item {
-        color: #fff;
+    .popup-project-introduction-details {
+        padding: 0px !important;       
 
-        &.active {
-            color: #6de9f7;
+        .quality-table {
+            padding: 0px !important;
+        }
+
+        .font-size-tools {
+            position: absolute;
+            top: 20px;
+            right: 100px;
+        }
+    }
+
+    &.font-size-2 {
+        .head-title-tab {
+            .head-nav {
+                font-size: 32px;
+                height: 48px;
+                line-height: 48px;
+                padding: 0px 48px;
+            }
+        }
+
+        .item-data {
+            line-height: 64px;
+            font-size: 32px;
+            line-height: 64px;
+
+            .div-text {
+                line-height: 64px;
+            }
+
+        }
+    }
+
+    &.font-size-1 {
+        .head-title-tab {
+            .head-nav {
+                font-size: 24px;
+                height: 30px;
+                line-height: 30px;
+                padding: 0px 30px;
+            }
+        }
+
+        .item-data {
+            line-height: 48px;
+            font-size: 24px;
+            line-height: 48px;
+
+            .div-text {
+                line-height: 48px;
+            }
+        }
+    }
+
+    .head-title-tab {
+        padding-top: 12px;
+        display: block;
+        width: 100%;
+
+        .head-nav {
+            background-size: 100% 100%;
+            display: inline-block;
+            width: auto;
+            padding: 0px 24px;
+        }
+    }
+
+    .data-list {
+        .data-item {
+            border-bottom: solid 1px #fff;
+            box-shadow: inset 7px 0px 11px 5px rgb(36 131 167 / 70%);
+            display: flex;
+            padding-left: 8px;
+
+            &.time-out {
+                box-shadow: inset 7px 0px 11px 5px rgb(167, 36, 36);
+                .text-state {
+                    color: rgba(167, 36, 36,0.6) !important;
+                }
+            }
+
+            .item-left {
+                display: inline-flex;
+                width: 400px;
+                min-height: 220px;
+                align-items: center;
+            }
+
+            .text-state {
+                font-size: 32px;
+                position: absolute;
+                color: rgba(200, 200, 200, 0.2);
+                transform: rotate(45deg);
+                top: 60px;
+                left: calc(50% - 100px);
+                &.state4{
+                    color: rgba(5, 248, 5, 0.5);
+                }
+            }
+
+            .item-right {
+                display: inline-block;
+                margin-left: 10px;
+                width: calc(100% - 414px);
+                position: relative;
+                .el-tag{
+                    font-size: unset;
+                    height: unset;
+                    line-height: unset;
+                }
+                .sp-lbl {
+                    display: inline-block;
+                    color: aquamarine;
+                    white-space: nowrap;
+
+                }
+
+                .text-timeout {
+                    position: absolute;
+                    right: 0px;
+                    font-size: 64px;
+                    color: red;
+                    transform: rotate(45deg);
+                    top: 27px;
+                }
+
+                .item-data {
+                    display: flex;
+                    align-items: center;
+                    border-bottom: solid 1px rgba(255, 255, 255, 0.1);
+                    line-height: 36px;
+
+                    .div-text {
+                        display: inline-block;
+                        width: calc(100% - 200px);
+                        vertical-align: top;
+                        white-space: break-spaces;
+                        word-break: break-word;
+
+                    }
+                }
+            }
         }
     }
 }</style>
\ No newline at end of file
diff --git a/src/pages/quality/measuredDlg.vue b/src/pages/quality/measuredDlg.vue
index afee935..3c5db8f 100644
--- a/src/pages/quality/measuredDlg.vue
+++ b/src/pages/quality/measuredDlg.vue
@@ -1,49 +1,127 @@
 <template>
-    <MyDialog v-if="show" v-model="show" width="880px" ref="dlg">
+    <MyDialog v-if="show" v-model="show" width="1600px" height="850px" :class="'font-size-' + fontSize"
+    class="measured-dlg">
         <template slot="title">
-            <div class="warning-info-title" style="padding-left: 20px;">
-                <div :class="nav == 0 ? 'active' : ''" class="nav-item" @click="toggleNav(0)">安全管理</div>
-                <div :class="nav == 1 ? 'active' : ''" class="nav-item" @click="toggleNav(1)">质量管理</div>
-            </div>
+            {{ title }}
         </template>
-        <el-table v-if="nav == 0" :data="tableData" class="mytable" height="500" style="width: 100%;background: transparent;"
-            ref="fbsubordinateUnit">
-
-            <el-table-column prop="prj" label="项目名称"> </el-table-column>
-            <el-table-column prop="node" label="节点名称" width="150" class-name="text-left">
-                <template slot-scope="scope">
-                    <span style="color:#01A9FF;font-size: 12px;">{{ scope.row.node }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="days" label="逾期天数">
-                <template slot-scope="scope">
-                    <span style="color:red">{{ scope.row.days }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="计划完成时间">
-
-            </el-table-column>
-        </el-table>
-
-        <el-table v-else :data="tableData" class="mytable" style="width: 100%;background: transparent;"
-            ref="fbsubordinateUnit">
-
-            <el-table-column prop="prj" label="项目名称2"> </el-table-column>
-            <el-table-column prop="node" label="节点名称2" width="150" class-name="text-left">
-                <template slot-scope="scope">
-                    <span style="color:#01A9FF;font-size: 12px;">{{ scope.row.node }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="days" label="逾期天数2">
-                <template slot-scope="scope">
-                    <span style="color:red">{{ scope.row.days }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="计划完成时间2">
-
-            </el-table-column>
-        </el-table>
-
+        <div>
+            <div class="font-size-tools">
+                <i class="set-font-size font-size2" @click="fontSize = 2" :class="fontSize == 2 ? 'active' : ''">
+                    <svg class="icon  svg-icon"
+                        style="width: 32px !important;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+                        viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3686">
+                        <path
+                            d="M839 875H735.3l-74.1-198.7H358.6L288.7 875H185l276.8-726h100.4L839 875zM632.1 594.3L522.3 292.4c-3.4-9.7-7.2-26.6-11.3-50.6h-2.3c-3.4 21.9-7.4 38.7-11.7 50.6L388.1 594.3h244z"
+                            fill="#fff" p-id="3687"></path>
+                    </svg>
+                </i>
+                <i class="set-font-size font-size1" @click="fontSize = 1" :class="fontSize == 1 ? 'active' : ''">
+                    <svg class="icon  svg-icon"
+                        style="width: 32px !important;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+                        viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3686">
+                        <path
+                            d="M839 875H735.3l-74.1-198.7H358.6L288.7 875H185l276.8-726h100.4L839 875zM632.1 594.3L522.3 292.4c-3.4-9.7-7.2-26.6-11.3-50.6h-2.3c-3.4 21.9-7.4 38.7-11.7 50.6L388.1 594.3h244z"
+                            fill="#fff" p-id="3687"></path>
+                    </svg>
+                </i>
+                <i class="set-font-size font-size0" @click="fontSize = 0" :class="fontSize == 0 ? 'active' : ''">
+                    <svg class="icon  svg-icon"
+                        style="width: 32px !important;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+                        viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3686">
+                        <path
+                            d="M839 875H735.3l-74.1-198.7H358.6L288.7 875H185l276.8-726h100.4L839 875zM632.1 594.3L522.3 292.4c-3.4-9.7-7.2-26.6-11.3-50.6h-2.3c-3.4 21.9-7.4 38.7-11.7 50.6L388.1 594.3h244z"
+                            fill="#fff" p-id="3687"></path>
+                    </svg>
+                </i>
+            </div>
+            <div class="data-list scroll" style="max-height:770px;overflow-y: auto;margin:12px 0px;overflow-x: hidden;" v-if="dataTable.length>0">
+                <div v-for="(it, idx) in dataTable" :key="idx" class="data-item"
+                    :class="it.timeout ? 'time-out' : ''">
+                    <div class="item-left">
+                        <el-image ref="preview" style="width: 400px; " :preview-src-list="[it.detectionFile]" v-if="it.detectionFile"
+                            :src="it.detectionFile + '.1000.jpg'">
+                        </el-image>
+                        <div v-else style="text-align: center;">
+                            <img src="images/nodata.png" style="width: 240px;">
+                            <div style="text-align: center;">暂无图片</div>
+                        </div>
+                        
+                    </div>
+                    <div class="item-right">
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">项目名称:</span>
+                            <div class="div-text">{{ it.projectName }}</div>
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">单位名称:</span>
+                            <div class="div-text">{{ it.deptName }}</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.checkTypeName }}</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.materialName }}</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.usePosition }}</div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">取样数量:</span>
+                            <div class="div-text">{{ it.sampleNum }}</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.qualifiedFlag == 'Y'" 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>
+                            </div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
+                            <div class="div-text">{{it.createByName}}({{ it.createBy  }})</div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交时间:</span>
+                            <div class="div-text">{{ it.createTime|dateFormat }}</div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data" v-if="it.updateBy">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">登记结果用户:</span>
+                            <div class="div-text">{{it.updateByName}}({{ it.updateBy  }})</div>                            
+                        </el-col>
+                        <el-col :span="fontSize==2?24:12" class="item-data" v-if="it.updateTime">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">登记结果时间:</span>
+                            <div class="div-text">{{ it.updateTime|dateFormat }}</div>                            
+                        </el-col>
+                    </div>
+                </div>                
+            </div>
+            <div v-else style="text-align: center;margin-top: 200px;">
+                <img src="images/nodata.png" style="width: 240px;">
+                <div style="text-align: center;">暂无数据</div>
+            </div>
+        </div>        
     </MyDialog>
 </template>
 
@@ -56,43 +134,183 @@ export default {
     },
     data() {
         return {
-            nav: 0,
+            fontSize: 0,
+            title:'',
             show: false,
-            tableData: []
+            dataTable: []
         };
     },
 
     mounted() {
-        window.dlg2 = this
-        this.tableData = [
-          
-        ]
     },
-
     methods: {
         toggleNav(n) {
             this.nav = n;
         },
-        showDialog() {
-            this.show = true
+        showDialog(opt) {           
+            
+            this.show = true           
+            this.$api.measure.getList(opt).then(d=>{
+                this.dataTable=d.data||[];
+                this.title="实测实量-"+['汇总','混泥土工程','二次构建','房间尺寸','抹灰工程','其它'][opt.checkType||0]+`[${this.dataTable.length}]`;
+            });
         }
     },
 };
 </script>
 
-<style lang="less" scoped>
-.mytable {
-    /deep/ th .cell {
-        color: aquamarine;
+<style lang="less" >
+.measured-dlg {
+    .popup-project-introduction-min {
+        transform: translateY(100px);
+        position: relative;
     }
-}
 
-.warning-info-title {
-    .nav-item {
-        color: #fff;
+    .popup-project-introduction-details {
+        padding: 0px !important;       
 
-        &.active {
-            color: #6de9f7;
+        .quality-table {
+            padding: 0px !important;
+        }
+
+        .font-size-tools {
+            position: absolute;
+            top: 20px;
+            right: 100px;
+        }
+    }
+
+    &.font-size-2 {
+        .head-title-tab {
+            .head-nav {
+                font-size: 32px;
+                height: 48px;
+                line-height: 48px;
+                padding: 0px 48px;
+            }
+        }
+
+        .item-data {
+            line-height: 64px;
+            font-size: 32px;
+            line-height: 64px;
+
+            .div-text {
+                line-height: 64px;
+            }
+
+        }
+    }
+
+    &.font-size-1 {
+        .head-title-tab {
+            .head-nav {
+                font-size: 24px;
+                height: 30px;
+                line-height: 30px;
+                padding: 0px 30px;
+            }
+        }
+
+        .item-data {
+            line-height: 48px;
+            font-size: 24px;
+            line-height: 48px;
+
+            .div-text {
+                line-height: 48px;
+            }
+        }
+    }
+
+    .head-title-tab {
+        padding-top: 12px;
+        display: block;
+        width: 100%;
+
+        .head-nav {
+            background-size: 100% 100%;
+            display: inline-block;
+            width: auto;
+            padding: 0px 24px;
+        }
+    }
+
+    .data-list {
+        .data-item {
+            border-bottom: solid 1px #fff;
+            box-shadow: inset 7px 0px 11px 5px rgb(36 131 167 / 70%);
+            display: flex;
+            padding-left: 8px;
+
+            &.time-out {
+                box-shadow: inset 7px 0px 11px 5px rgb(167, 36, 36);
+                .text-state {
+                    color: rgba(167, 36, 36,0.6) !important;
+                }
+            }
+
+            .item-left {
+                display: inline-flex;
+                width: 400px;
+                min-height: 220px;
+                align-items: center;
+            }
+
+            .text-state {
+                font-size: 32px;
+                position: absolute;
+                color: rgba(200, 200, 200, 0.2);
+                transform: rotate(45deg);
+                top: 60px;
+                left: calc(50% - 100px);
+                &.state4{
+                    color: rgba(5, 248, 5, 0.5);
+                }
+            }
+
+            .item-right {
+                display: inline-block;
+                margin-left: 10px;
+                width: calc(100% - 414px);
+                position: relative;
+                .el-tag{
+                    font-size: unset;
+                    height: unset;
+                    line-height: unset;
+                }
+                .sp-lbl {
+                    display: inline-block;
+                    color: aquamarine;
+                    white-space: nowrap;
+
+                }
+
+                .text-timeout {
+                    position: absolute;
+                    right: 0px;
+                    font-size: 64px;
+                    color: red;
+                    transform: rotate(45deg);
+                    top: 27px;
+                }
+
+                .item-data {
+                    display: flex;
+                    align-items: center;
+                    border-bottom: solid 1px rgba(255, 255, 255, 0.1);
+                    line-height: 36px;
+
+                    .div-text {
+                        display: inline-block;
+                        width: calc(100% - 200px);
+                        vertical-align: top;
+                        white-space: break-spaces;
+                        word-break: break-word;
+
+                    }
+                }
+            }
         }
     }
 }</style>
\ No newline at end of file