mt-fe-group/mt-yd-ui
12
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
pull from: fzq
merge into: mt-fe-group:test
Conversation 0 Commits 215 Files Changed 195 +3 -1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93912aa193 - Show all commits

2
src/components/base-table/index.vue
View File

@ -23,7 +23,7 @@
filter-placement="top" filter-placement="top"
:align="head.align" :align="head.align"
> >
<template slot-scope="scope"> <template v-if="head.prop" slot-scope="scope">
<component v-if="head.subcomponent" :is="head.subcomponent" :key="idx + 'sub'" :inject-data="{ ...scope.row, head }" @emitData="handleSubEmitData" /> <component v-if="head.subcomponent" :is="head.subcomponent" :key="idx + 'sub'" :inject-data="{ ...scope.row, head }" @emitData="handleSubEmitData" />
<span v-else>{{ scope.row[head.prop] | commonFilter(head.filter) }}</span> <span v-else>{{ scope.row[head.prop] | commonFilter(head.filter) }}</span>
</template> </template>

2
src/views/modules/monitoring/equipment.vue
View File

@ -73,6 +73,8 @@ import BaseTable from '@/components/base-table'
import AddOrUpdate from './equipment-add-or-update' import AddOrUpdate from './equipment-add-or-update'
const tableConfigs = [ const tableConfigs = [
{ type: 'selection' },
{ type: 'index', name: 'No' },
{ prop: 'id', name: 'id' }, { prop: 'id', name: 'id' },
{ prop: 'code', name: '编码' }, { prop: 'code', name: '编码' },
{ prop: 'name', name: '设备名称' }, { prop: 'name', name: '设备名称' },