yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
jiyufei 2 months ago
parent 8373c1c223 a0630f5508
commit 8d6004afda
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

8
jnpf-java-boot/jnpf-web/src/views/yys/yysdevicedata/index.vue
Unescape View File

@ -23,8 +23,8 @@
</el-form> </el-form>
</el-row> </el-row>
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<!-- <div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> --> <!-- <div> -->
<!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增 <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button> --> </el-button> -->
<!-- </div> <!-- </div>
@ -37,8 +37,8 @@
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" /> @click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>-->
</div> --> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border> :span-method="arraySpanMethod" border>
<el-table-column prop="productionLine" label="产线" align="center" width="200"> <el-table-column prop="productionLine" label="产线" align="center" width="200">

4
jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarn/index.vue
Unescape View File

@ -23,7 +23,7 @@
</el-form> </el-form>
</el-row> </el-row>
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<!-- <div class="JNPF-common-head"> --> <div class="JNPF-common-head">
<!-- <div> --> <!-- <div> -->
<!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增 <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button> --> </el-button> -->
@ -38,7 +38,7 @@
@click="initData()" /> @click="initData()" />
</el-tooltip> </el-tooltip>
</div> --> </div> -->
<!-- </div> --> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border> :span-method="arraySpanMethod" border>
<el-table-column prop="productionLine" label="产线" align="center"> <el-table-column prop="productionLine" label="产线" align="center">

4
jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarnstatistics/index.vue
Unescape View File

@ -24,7 +24,7 @@
</el-form> </el-form>
</el-row> </el-row>
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<!-- <div class="JNPF-common-head"> --> <div class="JNPF-common-head">
<!-- <div> <!-- <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增 <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button> </el-button>
@ -39,7 +39,7 @@
@click="initData()" /> @click="initData()" />
</el-tooltip> --> </el-tooltip> -->
<!-- </div> --> <!-- </div> -->
<!-- </div> --> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border> :span-method="arraySpanMethod" border>
<el-table-column prop="classes" label="班次" align="center"> <el-table-column prop="classes" label="班次" align="center">

Write Preview
Loading…
Cancel
Save