fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
33 changed files with 57 additions and 58 deletions
Showing only changes of commit 6e06159250 - Show all commits

View File

@ -7,7 +7,6 @@
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenalarmlog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item>
</el-form>
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
@ -69,12 +68,15 @@ const tableConfigs = [
{ prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' },
{ prop: 'version', name: '版本号' }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
{ prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
export default {
data() {
return {tableConfigs,
return {
tableConfigs,
calcMaxHeight,
dataForm: {
key: ''
},
@ -88,7 +90,8 @@ export default {
}
},
components: {
AddOrUpdate,BaseTable
AddOrUpdate,
BaseTable
},
activated() {
this.getDataList()

View File

@ -7,7 +7,6 @@
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button v-if="$hasPermission('monitoring:equipmenfile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item>
</el-form>
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
@ -83,6 +82,7 @@ export default {
data() {
return {
tableConfigs,
calcMaxHeight,
dataForm: {
key: ''
},

View File

@ -58,6 +58,7 @@ export default {
data() {
return {
addOrUpdateConfigs,
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -126,6 +126,7 @@ export default {
data() {
return {
addOrUpdateConfigs,
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -95,6 +95,7 @@ export default {
data() {
return {
tableConfigs,
calcMaxHeight,
addOrUpdateConfigs,
dataForm: {
key: ''

View File

@ -121,6 +121,7 @@ export default {
data() {
return {
addOrUpdateConfigs,
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -63,6 +63,7 @@ export default {
data() {
return {
tableConfigs,
calcMaxHeight,
dataForm: {
key: ''
},

View File

@ -62,6 +62,7 @@ export default {
data() {
return {
tableConfigs,
calcMaxHeight,
dataForm: {
key: ''
},

View File

@ -58,6 +58,7 @@ export default {
data() {
return {
tableConfigs,
calcMaxHeight,
dataForm: {
key: ''
},

View File

@ -77,6 +77,7 @@ export default {
data() {
return {
addOrUpdateConfigs,
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -58,6 +58,7 @@ export default {
data() {
return {
tableConfigs,
calcMaxHeight,
dataForm: {
key: ''
},

View File

@ -1,25 +1,12 @@
<template>
<div class="mod-config">
<el-form
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input
v-model="dataForm.key"
placeholder="参数名"
clearable
></el-input>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button
v-if="$hasPermission('monitoring:equipmenattr:save')"
type="primary"
@click="addOrUpdateHandle()"
>新增</el-button
>
<el-button v-if="$hasPermission('monitoring:equipmenattr:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item>
</el-form>
<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
@ -44,11 +31,7 @@
</template>
</el-table-column>
</el-table> -->
<base-table
:data="dataList"
:table-head-configs="tableConfigs"
:max-height="500"
/>
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -60,11 +43,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"
></add-or-update>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</template>
@ -103,6 +82,7 @@ export default {
data() {
return {
tableConfigs,
calcMaxHeight,
dataForm: {
key: ''
},
@ -174,15 +154,11 @@ export default {
: this.dataListSelections.map(item => {
return item.id
})
this.$confirm(
`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`,
'提示',
{
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
}).then(() => {
this.$http({
url: this.$http.adornUrl('/monitoring/equipmentAttr'),
method: 'delete',

View File

@ -70,6 +70,7 @@ const addOrUpdateConfigs = {
export default {
data() {
return {
calcMaxHeight,
addOrUpdateConfigs,
tableConfigs,
dataForm: {

View File

@ -127,6 +127,7 @@ export default {
mixins: [dictListMixin],
data() {
return {
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -110,6 +110,7 @@ const addOrUpdateConfigs = {
export default {
data() {
return {
calcMaxHeight,
addOrUpdateConfigs,
tableConfigs,
dataForm: {

View File

@ -78,6 +78,7 @@ const addOrUpdateConfigs = {
export default {
data() {
return {
calcMaxHeight,
addOrUpdateConfigs,
tableConfigs,
dataForm: {

View File

@ -64,6 +64,7 @@ const tableConfigs = [
export default {
data() {
return {
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -99,6 +99,7 @@ const FakeChart = {
},
data() {
return {
calcMaxHeight,
chart: null,
defaultOpts: {
title: {

View File

@ -62,6 +62,7 @@ const addOrUpdateConfigs = {
export default {
data() {
return {
calcMaxHeight,
addOrUpdateConfigs,
tableConfigs,
dataForm: {

View File

@ -93,6 +93,7 @@ const addOrUpdateConfigs = {
export default {
data() {
return {
calcMaxHeight,
addOrUpdateConfigs,
tableConfigs,
dataForm: {

View File

@ -55,6 +55,7 @@ const addOrUpdateConfigs = {
export default {
data() {
return {
calcMaxHeight,
addOrUpdateConfigs,
tableConfigs,
dataForm: {

View File

@ -24,6 +24,7 @@ export default {
components: { BaseTable, SmallTitle },
data() {
return {
calcMaxHeight,
loadTable: false,
tableProps: [{ label: 'default', prop: 'default' }],
stepOneArray: [],

View File

@ -24,6 +24,7 @@ export default {
components: { BaseTable, SmallTitle },
data() {
return {
calcMaxHeight,
loadTable: false,
dynamicPropSet: false,
tableProps: [{ label: 'default', prop: 'default' }],

View File

@ -8,8 +8,8 @@
</template>
<script>
// @ts-nocheck
/* eslint-disable */
// @ts-nocheck
/* eslint-disable */
import BaseTable from '@/components/base-table'
import SmallTitle from '@/components/small-title'
import moment from 'moment'
@ -21,6 +21,7 @@ export default {
components: { BaseTable, SmallTitle },
data() {
return {
calcMaxHeight,
loadTable: false,
// dynamicPropSet: false,
tableProps: [{ label: 'default', prop: 'default' }],

View File

@ -62,6 +62,7 @@ const addOrUpdateConfigs = {
export default {
data() {
return {
calcMaxHeight,
tableConfigs,
addOrUpdateConfigs,
dataForm: {

View File

@ -46,9 +46,7 @@ const CategoryList = {
}
},
data() {
return {
pickedId: null
}
return { calcMaxHeight, pickedId: null }
},
mounted() {
console.log(this.injectData)

View File

@ -25,13 +25,7 @@
<script>
export default {
data() {
return {
dataList: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
allNum: 0
}
return { calcMaxHeight, dataList: [], pageIndex: 1, pageSize: 10, totalPage: 0, allNum: 0 }
},
created() {
this.getDataList()

View File

@ -59,6 +59,7 @@ const tableConfigs = [
export default {
data() {
return {
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -78,6 +78,7 @@ const tableConfigs = [
export default {
data() {
return {
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -54,6 +54,7 @@ const tableConfigs = [
export default {
data() {
return {
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -51,6 +51,7 @@ const tableConfigs = [
export default {
data() {
return {
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''

View File

@ -65,6 +65,7 @@ const addOrUpdateConfigs = {
export default {
data() {
return {
calcMaxHeight,
addOrUpdateConfigs,
tableConfigs,
dataForm: {

View File

@ -73,6 +73,7 @@ const tableConfigs = [
export default {
data() {
return {
calcMaxHeight,
tableConfigs,
dataForm: {
key: ''