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 +195 -156
28 changed files with 195 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 56bbc2497a - Show all commits

9
src/components/base-table/components/operationComponent.js
View File

@ -23,11 +23,15 @@ export default {
// add more...
},
colors: {
delete: '#FF5454',
// add more...
},
text: {
// for i18n inject:
add: '添加'
edit: '编辑',
detail: '详情',
delete: '删除',
viewAttr: '查看属性'
// add more...
}
}
@ -38,7 +42,8 @@ export default {
render: function (h) {
let btns = []
for (const optionStr of this.injectData.head?.options) {
btns.push(h('el-button', { props: { type: this.btnTypes[optionStr] } }, optionStr))
// btns.push(h('el-button', { props: { type: this.btnTypes[optionStr] } }, optionStr))
btns.push(h('el-button', { props: { type: 'text' }, style: { color: this.colors[optionStr] || '#0b58ff' } }, this.text[optionStr]))
}
return h('span', null, btns)
}

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

@ -50,7 +50,7 @@ const tableConfigs = [
{ prop: 'enName', name: '英文名称' },
{ prop: 'abbr', name: '缩写' },
{ prop: 'details', name: '详情', subcomponent: TableTextComponent },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['add', 'detail', 'delete'] }
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {

11
src/views/modules/monitoring/equipmentAlarmLog.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmenalarmlog:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="alarmId" header-align="center" align="center" label="报警信息ID，关联T_equipment_group_alarm表"> </el-table-column>
@ -32,7 +32,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -68,12 +69,12 @@ const tableConfigs = [
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'version', name: '版本号' }
{ prop: 'version', name: '版本号' }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -87,7 +88,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentFile.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmenfile:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label=""> </el-table-column>
<el-table-column prop="equipmentId" header-align="center" align="center" label="设备ID"> </el-table-column>
@ -35,7 +35,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -74,12 +75,12 @@ const tableConfigs = [
{ "prop": "version", "name": "版本号" },
{ "prop": "typeCode", "name": "文件类型编号" },
{ "prop": "fileName", "name": "文件名字" },
{ "prop": "fileUrl", "name": "下载地址" }
{ "prop": "fileUrl", "name": "下载地址" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -93,7 +94,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentGroup.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmengroup:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="code" header-align="center" align="center" label="分组编码"> </el-table-column>
@ -32,7 +32,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -68,13 +69,13 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -88,7 +89,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentGroupAlarm.vue
View File

@ -12,7 +12,7 @@
</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
<el-table-column prop="equipmentGroupId" header-align="center" align="center" label="设备分组ID，关联t_equipment_group"></el-table-column>
@ -39,7 +39,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -80,13 +81,13 @@ const tableConfigs = [
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" },
{ "prop": "alarmNotify", "name": "推送方式 0邮箱 1微信" }
{ "prop": "alarmNotify", "name": "推送方式 0邮箱 1微信" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -100,7 +101,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentPlc.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmenplc:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
<el-table-column prop="plcType" header-align="center" align="center" label="plc类型"> </el-table-column>
@ -40,7 +40,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -85,13 +86,13 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -105,7 +106,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentPlcConnect.vue
View File

@ -12,7 +12,7 @@
>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
<el-table-column prop="plcId" header-align="center" align="center" label="plc表iD"> </el-table-column>
@ -33,7 +33,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -68,13 +69,13 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -88,7 +89,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentPlcParam.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmenplcparam:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="plcConId" header-align="center" align="center" label="plc连接表ID"> </el-table-column>
@ -45,7 +45,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -97,13 +98,13 @@ const tableConfigs = [
{ "prop": "collectionCycle", "name": "采集周期（s） 暂不使用" },
{ "prop": "reportingCycle", "name": "上报周期（s） 暂不使用" },
{ "prop": "reportingMethod", "name": "上报方式 暂不使用" },
{ "prop": "reportingCode", "name": "上报编码 暂不使用" }
{ "prop": "reportingCode", "name": "上报编码 暂不使用" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -117,7 +118,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentQuantity.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmenquantity:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
<el-table-column prop="externalCode" header-align="center" align="center" label="设备外部编码"> </el-table-column>
@ -36,7 +36,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -79,13 +80,13 @@ const tableConfigs = [
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" },
{ "prop": "recordTime", "name": "生产数量的记录时间" }
{ "prop": "recordTime", "name": "生产数量的记录时间" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -99,7 +100,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentStatusLog.vue
View File

@ -12,7 +12,7 @@
>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
<el-table-column prop="externalCode" header-align="center" align="center" label="设备外部代码"> </el-table-column>
@ -37,7 +37,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -76,13 +77,13 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -96,7 +97,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentType.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmentype:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
@ -34,7 +34,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -72,13 +73,13 @@ const tableConfigs =[
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -92,7 +93,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentTypeFile.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmentypefile:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="equipmentTypeId" header-align="center" align="center" label="设备类型ID"> </el-table-column>
@ -35,7 +35,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -74,13 +75,13 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -94,7 +95,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/equipmentattr.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:equipmenattr:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="equipmentId" header-align="center" align="center" label="设备ID"> </el-table-column>
@ -31,7 +31,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -66,12 +67,12 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -85,7 +86,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

12
src/views/modules/monitoring/factory.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:factory:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
<el-table-column prop="code" header-align="center" align="center" label="工厂编码"> </el-table-column>
@ -34,7 +34,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -72,13 +73,14 @@ const tableConfigs =[
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" },
{ "prop": "externalCode", "name": "外部系统编码" }
{ "prop": "externalCode", "name": "外部系统编码" },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -92,7 +94,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

64
src/views/modules/monitoring/product.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:product:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
<el-table-column prop="code" header-align="center" align="center" label="编码"></el-table-column>
@ -38,7 +38,10 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -60,35 +63,39 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [
{ "prop": "id", "name": "ID" },
{ "prop": "code", "name": "编码" },
{ "prop": "name", "name": "名称" },
{ "prop": "description", "name": "描述" },
{ "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
{ "prop": "specifications", "name": "规格" },
{ "prop": "unitDictValue", "name": "单位value，对应到数据字典label_value" },
{ "prop": "area", "name": "一单位的面积（平方米）" },
{ "prop": "processTime", "name": "加工一单位产品需要的时间" },
{
"prop": "typeDictValue",
"name": "产品类型value，对应到数据字典label_value"
},
{ "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
{ "prop": "remark", "name": "备注" },
{ "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" },
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ type: 'index', name: '序号' },
{ prop: 'updateTime', name: '添加时间' },
{ prop: 'name', name: '产品名称' },
{ prop: 'code', name: '产品编码' },
{ prop: 'specifications', name: '规格' },
{ prop: 'unitDictValue', name: '单位' },
// { prop: 'unitDictValue', name: '单位value，对应到数据字典label_value' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['viewAttr', 'delete'] }
// { "prop": "id", "name": "ID" },
// { "prop": "description", "name": "描述" },
// { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
// { "prop": "area", "name": "一单位的面积（平方米）" },
// { "prop": "processTime", "name": "加工一单位产品需要的时间" },
// {
// "prop": "typeDictValue",
// "name": "产品类型value，对应到数据字典label_value"
// },
// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
// { "prop": "remark", "name": "备注" },
// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
// { "prop": "creatorId", "name": "创建人" },
// { "prop": "creatorName", "name": "创建人姓名" },
// { "prop": "createTime", "name": "创建时间" },
// { "prop": "updaterId", "name": "更新人" },
// { "prop": "updaterName", "name": "更新人姓名" },
// { "prop": "version", "name": "版本号" }
]
export default {
data() {
return {
return {tableConfigs,
tableConfigs,
dataForm: {
key: ''
},
@ -102,7 +109,8 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,
BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/productArrt.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:producarrt:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
@ -35,7 +35,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -74,12 +75,12 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -93,7 +94,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/productionLine.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:productionline:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
<el-table-column prop="factoryId" header-align="center" align="center" label="工厂表ID"> </el-table-column>
@ -36,7 +36,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -76,12 +77,12 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -95,7 +96,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/productionLineRecSch.vue
View File

@ -12,7 +12,7 @@
>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="productionLineId" header-align="center" align="center" label="产线id"> </el-table-column>
@ -28,7 +28,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -58,12 +59,12 @@ const tableConfigs = [
{ "prop": "recordTime", "name": "记录时间" },
{ "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
{ "prop": "sumInputNum", "name": "该记录时间点的累计上片数量" },
{ "prop": "sumOutputNum", "name": "该记录时间点的累计下片数量" }
{ "prop": "sumOutputNum", "name": "该记录时间点的累计下片数量" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -77,7 +78,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/qualityInspectionDet.vue
View File

@ -12,7 +12,7 @@
>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="typeId" header-align="center" align="center" label="检测类型id"> </el-table-column>
@ -33,7 +33,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -68,12 +69,12 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -87,7 +88,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/qualityInspectionRecord.vue
View File

@ -12,7 +12,7 @@
>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="inspectionDetId" header-align="center" align="center" label="检测内容id"> </el-table-column>
@ -38,7 +38,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -81,12 +82,12 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -100,7 +101,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/qualityInspectionType.vue
View File

@ -12,7 +12,7 @@
>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="检测类型名称"> </el-table-column>
@ -32,7 +32,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -66,12 +67,12 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -85,7 +86,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/reportSheet.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:reporsheet:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="category" header-align="center" align="center" label="分类：关联report_sheet_category"> </el-table-column>
@ -36,7 +36,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -70,13 +71,13 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -90,7 +91,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/reportSheetCategory.vue
View File

@ -12,7 +12,7 @@
>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
@ -35,7 +35,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -72,12 +73,12 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -91,7 +92,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/sysfile.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:sysfile:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="主键，自增"> </el-table-column>
<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编号"> </el-table-column>
@ -32,7 +32,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -68,12 +69,12 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -87,7 +88,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/sysfileType.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:sysfiletype:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="主键，自增"> </el-table-column>
<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编号"> </el-table-column>
@ -30,7 +30,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -64,13 +65,13 @@ const tableConfigs = [
{ "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" }
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -84,7 +85,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/workShopSection.vue
View File

@ -10,7 +10,7 @@
<el-button v-if="$hasPermission('monitoring:workshopsection:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
<el-table-column prop="productionLineId" header-align="center" align="center" label="产线ID"> </el-table-column>
@ -35,7 +35,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -74,12 +75,12 @@ const tableConfigs = [
{ "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" },
{ "prop": "version", "name": "版本号" },
{ "prop": "externalCode", "name": "外部系统编码" }
{ "prop": "externalCode", "name": "外部系统编码" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -93,7 +94,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()

11
src/views/modules/monitoring/workShopSectionEquipment.vue
View File

@ -12,7 +12,7 @@
>
</el-form-item>
</el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
<el-table-column prop="workshopSectionId" header-align="center" align="center" label="工段ID"> </el-table-column>
@ -33,7 +33,8 @@
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -68,12 +69,12 @@ const tableConfigs = [
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'version', name: '版本号' }
{ prop: 'version', name: '版本号' }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {
return {tableConfigs,
dataForm: {
key: ''
},
@ -87,7 +88,7 @@ export default {
}
},
components: {
AddOrUpdate
AddOrUpdate,BaseTable
},
activated() {
this.getDataList()