Commit 748949a6 by lichengming

修改了工程项目查询

parent cadab1ea
...@@ -56,7 +56,9 @@ ...@@ -56,7 +56,9 @@
<span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span> <span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
</div> </div>
<span v-else-if="item.key==='backReasons'" style="color: red">{{scope.row[item.key]}}</span> <span v-else-if="item.key==='backReasons'" style="color: red">{{scope.row[item.key]}}</span>
<span v-else>{{scope.row[item.key]}}</span> <span v-else-if="item.key==='projectType'">{{scope.row[item.key]}}</span>
<span v-else-if="item.key==='projectName'">{{scope.row[item.key]}}</span>
<span v-else>{{scope.row[item.key]?scope.row[item.key]:0}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -88,16 +90,14 @@ export default { ...@@ -88,16 +90,14 @@ export default {
tester: '', tester: '',
testerId: '', testerId: '',
pageColumns: [ pageColumns: [
{ title: '工程类型', key: 'projectType', detail: true, width: 140 }, { title: '工程类型', key: 'projectType', detail: true, width: 150 },
{ title: '工程名称', key: 'projectName', width: 100 }, { title: '工程名称', key: 'projectName', width: 150 },
{ title: '检测项目', key: 'itemNames', width: 110 },
{ title: '数量', key: 'num', width: 110 },
{ title: '比重', key: '比重', width: 110 }, { title: '比重', key: '比重', width: 110 },
{ title: '导热系数', key: '导热系数', width: 110 }, { title: '导热系数', key: '导热系数', width: 110 },
{ title: '电导率', key: '电导率', width: 110 }, { title: '电导率', key: '电导率', width: 110 },
{ title: '界限含水率', key: '界限含水率', width: 110 }, { title: '界限含水率', key: '界限含水率', width: 110 },
{ title: '颗粒分析-Hyd', key: '颗粒分析-Hyd', width: 110 }, { title: '颗粒分析-Hyd', key: '颗粒分析-Hyd', width: 150 },
{ title: '颗粒分析-Sieve', key: '颗粒分析-Sieve', width: 110 }, { title: '颗粒分析-Sieve', key: '颗粒分析-Sieve', width: 150 },
{ title: '密度', key: '密度', width: 110 }, { title: '密度', key: '密度', width: 110 },
{ title: '渗透', key: '渗透', width: 110 }, { title: '渗透', key: '渗透', width: 110 },
{ title: '碳酸盐含量', key: '碳酸盐含量', width: 110 }, { title: '碳酸盐含量', key: '碳酸盐含量', width: 110 },
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
{ title: '固结', key: '固结', width: 110 }, { title: '固结', key: '固结', width: 110 },
{ title: '落锥', key: '落锥', width: 110 }, { title: '落锥', key: '落锥', width: 110 },
{ title: '落锥-重塑', key: '落锥-重塑', width: 110 }, { title: '落锥-重塑', key: '落锥-重塑', width: 110 },
{ title: '三轴压缩-CD', key: '三轴压缩-CD', width: 110 }, { title: '三轴压缩-CD', key: '三轴压缩-CD', width: 150 },
{ title: '三轴压缩-CU', key: '三轴压缩-CU', width: 110 }, { title: '三轴压缩-CU', key: '三轴压缩-CU', width: 150 },
{ title: '三轴压缩-UU', key: '三轴压缩-UU', width: 110 }, { title: '三轴压缩-UU', key: '三轴压缩-UU', width: 150 },
{ title: '三轴压缩-UU-重塑', key: '三轴压缩-UU-重塑', width: 110 }, { title: '三轴压缩-UU-重塑', key: '三轴压缩-UU-重塑', width: 150 },
{ title: '手动十字板剪切', key: '手动十字板剪切', width: 110 }, { title: '手动十字板剪切', key: '手动十字板剪切', width: 150 },
{ title: '无侧限抗压强度', key: '无侧限抗压强度', width: 110 }, { title: '无侧限抗压强度', key: '无侧限抗压强度', width: 150 },
{ title: '休止角', key: '休止角', width: 110 }, { title: '休止角', key: '休止角', width: 110 },
{ title: '袖珍贯入仪', key: '袖珍贯入仪', width: 110 }, { title: '袖珍贯入仪', key: '袖珍贯入仪', width: 110 },
{ title: '直接剪切', key: '直接剪切', width: 110 }, { title: '直接剪切', key: '直接剪切', width: 110 },
...@@ -124,18 +124,18 @@ export default { ...@@ -124,18 +124,18 @@ export default {
{ {
title: '实验室微型十字板剪切-重塑', title: '实验室微型十字板剪切-重塑',
key: '实验室微型十字板剪切-重塑', key: '实验室微型十字板剪切-重塑',
width: 110 width: 200
}, },
{ title: '蠕变', key: '蠕变', width: 110 }, { title: '蠕变', key: '蠕变', width: 110 },
{ title: '应变控制加荷固结', key: '应变控制加荷固结', width: 110 }, { title: '应变控制加荷固结', key: '应变控制加荷固结', width: 180 },
{ {
title: '实验室微型十字板剪切', title: '实验室微型十字板剪切',
key: '实验室微型十字板剪切', key: '实验室微型十字板剪切',
width: 110 width: 180
}, },
{ title: '含水率', key: '含水率', width: 110 }, { title: '含水率', key: '含水率', width: 110 },
{ title: '颗粒分析-200', key: '颗粒分析-200', width: 110 }, { title: '颗粒分析-200', key: '颗粒分析-200', width: 150 },
{ title: '无侧限抗压强度-重塑', key: '无侧限抗压强度-重塑', width: 110 } { title: '无侧限抗压强度-重塑', key: '无侧限抗压强度-重塑', width: 180 }
], ],
groupData: [], groupData: [],
getPage: {}, getPage: {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment