Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
This commit is contained in:
commit
a47e184e9f
|
@ -105,7 +105,14 @@
|
||||||
prop="pointTypeLabel"
|
prop="pointTypeLabel"
|
||||||
label="点位类型"
|
label="点位类型"
|
||||||
width="100"
|
width="100"
|
||||||
/>
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-tag size="small" :type="scope.row.pointTypeLabel === '普通点位' ? 'info' : 'warning'">
|
||||||
|
{{ scope.row.pointTypeLabel }}
|
||||||
|
</el-tag>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
prop="stage"
|
prop="stage"
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
type="text"
|
type="text"
|
||||||
tabindex="1"
|
tabindex="1"
|
||||||
auto-complete="on"
|
auto-complete="on"
|
||||||
@blur="getCheck"
|
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue