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

fix some bugs

Browse Source
This commit is contained in:
g7hoo 2022-10-09 10:36:18 +08:00
parent d0f113513c
commit 5a08d8c1dd
53 changed files with 367 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/base-dialog/addOrUpdate/index.vue
View File

@ -147,13 +147,6 @@ export default {
components: { AttrForm },
props: {
configs: {
/**
* TODO: 定义及使用方式，应改用README.md文件记录
* type: 'dialog' | 'drawer' | 'page'
* fields: Array<string|object>
* - fields.object: { name, type: 'number'|'textarea'|'select'|'date'|.., required: boolean, validator: boolean(是否需要验证), [options]: any[], api: string(自动获取数据的接口，一般为getcode接口)}
* operations: Array[object], 操作名和对应的接口地址，还有permission(如，sys:dict:update)
*/
type: Object,
default: () => ({}) // 此处省去类型检查，使用者自行注意就好
}
@ -533,7 +526,7 @@ export default {
}
break
case 'cancel':
this.visible = false
this.handleClose()
// add more..
}
},

79
src/views/main-navbar.vue
View File

@ -1,36 +1,20 @@
<template>
<nav
class="aui-navbar"
:class="`aui-navbar--${$store.state.navbarLayoutType}`"
>
<nav class="aui-navbar" :class="`aui-navbar--${$store.state.navbarLayoutType}`">
<div class="aui-navbar__header">
<h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
<a class="aui-navbar__brand-lg" href="javascript:;">{{
$t('brand.lg')
}}</a>
<a class="aui-navbar__brand-mini" href="javascript:;">{{
$t('brand.mini')
}}</a>
<a class="aui-navbar__brand-lg" href="javascript:;">{{ $t('brand.lg') }}</a>
<a class="aui-navbar__brand-mini" href="javascript:;">{{ $t('brand.mini') }}</a>
</h1>
</div>
<div class="aui-navbar__body">
<el-menu class="aui-navbar__menu mr-auto" mode="horizontal">
<el-menu-item
index="1"
@click="$store.state.sidebarFold = !$store.state.sidebarFold"
>
<svg
class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch"
aria-hidden="true"
>
<el-menu-item index="1" @click="$store.state.sidebarFold = !$store.state.sidebarFold">
<svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch" aria-hidden="true">
<use xlink:href="#icon-outdent"></use>
</svg>
</el-menu-item>
<el-menu-item index="2" @click="refresh()">
<svg
class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--refresh"
aria-hidden="true"
>
<svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--refresh" aria-hidden="true">
<use xlink:href="#icon-sync"></use>
</svg>
</el-menu-item>
@ -47,11 +31,7 @@
</a>
</el-menu-item> -->
<el-menu-item index="3">
<el-dropdown
placement="bottom"
:show-timeout="0"
@command="handleCommand"
>
<el-dropdown placement="bottom" :show-timeout="0" @command="handleCommand">
<span class="el-dropdown-link">
<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
<use xlink:href="#icon-earth"></use>
@ -59,12 +39,8 @@
<!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :disabled="getLang() === 'zh-CN'" command="toCN"
>中文</el-dropdown-item
>
<el-dropdown-item :disabled="getLang() === 'en'" command="toEN"
>En</el-dropdown-item
>
<el-dropdown-item :disabled="getLang() === 'zh-CN'" command="toCN">中文</el-dropdown-item>
<el-dropdown-item :disabled="getLang() === 'en'" command="toEN">En</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-menu-item>
@ -81,22 +57,15 @@
<i class="el-icon-arrow-down"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="updatePasswordHandle()">{{
$t('updatePassword.title')
}}</el-dropdown-item>
<el-dropdown-item @click.native="logoutHandle()">{{
$t('logout')
}}</el-dropdown-item>
<el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item>
<el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-menu-item>
</el-menu>
</div>
<!-- 弹窗, 修改密码 -->
<update-password
v-if="updatePasswordVisible"
ref="updatePassword"
></update-password>
<update-password v-if="updatePasswordVisible" ref="updatePassword"></update-password>
</nav>
</template>
<script>
@ -128,11 +97,11 @@ export default {
this.$root.$i18n.locale = 'zh-CN'
window.navigator.language = 'zh-cn'
break
case 'toEN':
console.log('root', this.$root.$i18n.locale)
this.$root.$i18n.locale = 'en'
location.reload()
window.navigator.language = 'en-US'
case 'toEN':
console.log('root', this.$root.$i18n.locale)
this.$root.$i18n.locale = 'en'
location.reload()
window.navigator.language = 'en-US'
break
}
},
@ -156,15 +125,11 @@ export default {
},
// 退出
logoutHandle() {
this.$confirm(
this.$t('prompt.info', { handle: this.$t('logout') }),
this.$t('prompt.title'),
{
confirmButtonText: this.$t('confirm'),
cancelButtonText: this.$t('cancel'),
type: 'warning'
}
)
this.$confirm(this.$t('prompt.info', { handle: this.$t('logout') }), this.$t('prompt.title'), {
confirmButtonText: this.$t('confirm'),
cancelButtonText: this.$t('cancel'),
type: 'warning'
})
.then(() => {
this.$http
.post(this.$http.adornUrl('/logout'))

6
src/views/modules/job/schedule-add-or-update.vue
View File

@ -58,6 +58,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init () {
this.visible = true
this.$nextTick(() => {

6
src/views/modules/job/schedule-log.vue
View File

@ -56,6 +56,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init () {
this.visible = true
this.getDataList()

6
src/views/modules/job/schedule.vue
View File

@ -97,6 +97,12 @@ export default {
Log
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 暂停
pauseHandle (id) {
if (!id && this.dataListSelections.length <= 0) {

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

@ -30,7 +30,14 @@
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @select-change="handleDialogSelectChange" />
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
:configs="addOrUpdateConfigs"
@refreshDataList="getDataList"
@select-change="handleDialogSelectChange"
@destory-dialog="handleDestroyDialog"
/>
</div>
</template>
@ -297,6 +304,12 @@ export default {
this.getTypeList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取产线列表，用于刷新工段列表
getPlList() {
this.$http({

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

@ -77,6 +77,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

8
src/views/modules/monitoring/equipmentCurrentState.vue
View File

@ -29,7 +29,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -128,6 +128,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 设备
getEqList() {
this.$http({

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

@ -80,6 +80,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -22,7 +22,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -86,6 +86,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.addOrUpdateVisible = false

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

@ -44,7 +44,7 @@
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -125,6 +125,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取字典数据
getDictData() {
this.initDictList(Object.entries(dictEntries).map(([_, item]) => item.value))

6
src/views/modules/monitoring/equipmentHistoricalParameters.vue
View File

@ -40,6 +40,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -22,7 +22,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -106,6 +106,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
//handleOperations
handleOperations({ type, data: id }) {
switch (type) {

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

@ -23,7 +23,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -141,6 +141,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 设备列表
getEqList() {
this.$http({

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

@ -79,6 +79,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -85,6 +85,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -81,6 +81,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -22,7 +22,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -106,6 +106,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取设备类型树形数据
getTreeEquipmentType() {
this.$http({

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

@ -81,6 +81,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -79,6 +79,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -22,7 +22,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -99,6 +99,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.addOrUpdateVisible = false

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

@ -12,7 +12,15 @@
</el-form-item>
</el-form>
<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
<base-table
:page="pageIndex"
:size="pageSize"
:data="dataList"
:table-head-configs="tableConfigs"
:max-height="calcMaxHeight(8)"
@operate-event="handleOperations"
@refreshDataList="getDataList"
/>
<el-pagination
@size-change="sizeChangeHandle"
@ -25,7 +33,7 @@
></el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
<base-dialog v-if="showbasedialog" ref="basedialog" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" />
<base-dialog v-if="showbasedialog" ref="basedialog" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -171,7 +179,12 @@ export default {
this.getDataList()
},
methods: {
//
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.showbasedialog = false
}, /** after dialog animated */ 200);
},
addOrEdit(id) {
this.showbasedialog = true
this.$nextTick(() => {

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

@ -22,7 +22,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" :configs="addOrUpdateConfigs" ref="addOrUpdate" @refreshDataList="getDataList" @destroy-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" :configs="addOrUpdateConfigs" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -111,6 +111,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible = false
}, /** after dialog animated */ 200)
},
// 获取产品列表
getProductList() {
this.$http({

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

@ -22,7 +22,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -111,6 +111,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取工厂列表
getFactoryList() {
this.$http.get(this.$http.adornUrl('/monitoring/factory/list')).then(({ data: res }) => {

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

@ -72,6 +72,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -22,7 +22,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -53,8 +53,8 @@ const addOrUpdateConfigs = {
type: 'dialog',
infoUrl: '/monitoring/qualityInspectionDet',
fields: [
{ name: 'typeId', label: i18n.t('inspect.type'), type: 'select', options: [] },
{ name: 'content', label: i18n.t('inspect.det') },
{ name: 'typeId', label: i18n.t('inspect.type'), required: true, type: 'select', options: [] },
{ name: 'content', label: i18n.t('inspect.det'), required: true },
{ name: 'code', label: i18n.t('inspect.detcode'), api: '/monitoring/qualityInspectionDet/getCode' },
'remark'
],
@ -92,6 +92,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取产检测类型列表
getInspectionTypeList() {
this.$http({

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

@ -29,7 +29,7 @@
ref="addOrUpdate"
:configs="addOrUpdateConfigs"
@refreshDataList="getDataList"
@destory-dialog="addOrUpdateVisible = false"
@destory-dialog="handleDestroyDialog"
@select-change="handleSelectChange"
/>
</div>
@ -124,6 +124,12 @@ export default {
this.getProductLines()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// handle
async handleSelectChange({ name, id }) {
if (name === 'productionId') {

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

@ -10,7 +10,15 @@
</el-form-item>
</el-form>
<base-table :page="pageIndex" :size="pageSize" :data="dataList" :table-head-configs="tableConfigs" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
<base-table
:page="pageIndex"
:size="pageSize"
:data="dataList"
:table-head-configs="tableConfigs"
:max-height="calcMaxHeight(8)"
@operate-event="handleOperations"
@refreshDataList="getDataList"
/>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
@ -22,7 +30,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -42,7 +50,7 @@ const tableConfigs = [
},
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: i18n.t('inspect.typename') },
{ prop: 'code', name: i18n.t('inspect.typename') },
{ prop: 'code', name: i18n.t('inspect.typecode') },
{ prop: 'remark', name: i18n.t('remark') },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
@ -50,7 +58,11 @@ const tableConfigs = [
const addOrUpdateConfigs = {
type: 'dialog',
infoUrl: '/monitoring/qualityInspectionType',
fields: [{ name: 'name', label: i18n.t('inspect.type') }, { name: 'code', label: i18n.t('inspect.typename'), api: '/monitoring/qualityInspectionType/getCode' }, 'remark'],
fields: [
{ name: 'name', label: i18n.t('inspect.type'), required: true },
{ name: 'code', label: i18n.t('inspect.typecode'), api: '/monitoring/qualityInspectionType/getCode' },
'remark'
],
operations: [
{ name: 'cancel', showAlways: true },
{ name: 'save', url: '/monitoring/qualityInspectionType', permission: 'monitoring:qualityinspectiontype:save', showOnEdit: false },
@ -84,6 +96,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible = false
}, /** after dialog animated */ 200)
},
// 获取数据列表
getDataList() {
this.addOrUpdateVisible = false

8
src/views/modules/monitoring/reportCategory.vue
View File

@ -23,7 +23,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -83,6 +83,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
handleOperations({ type, data: id }) {
switch (type) {
case 'edit':

14
src/views/modules/monitoring/reportDetail.vue
View File

@ -24,7 +24,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :configs="addOrUpdateConfigs" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -55,6 +55,12 @@ const CategoryList = {
this.pickedId = this.injectData[this.injectData.head.prop]
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
handleChange(id) {
this.pickedId = id
this.$emit('emit-data', {
@ -112,6 +118,12 @@ export default {
},
computed: {},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
getAllCategories() {
axios.get(axios.adornUrl('/monitoring/reportSheetCategory/page')).then(({ data: res }) => {
if (res.data && res.data.list) {

2
src/views/modules/monitoring/reportSheet-add-or-update.vue
View File

@ -106,7 +106,7 @@ export default {
}
}
},
methods: {
methods: {
init(id) {
this.dataForm.id = id || 0
this.visible = true

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

@ -73,6 +73,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

2
src/views/modules/monitoring/reportSheetCategory-add-or-update.vue
View File

@ -91,7 +91,7 @@ export default {
}
}
},
methods: {
methods: {
init(id) {
this.dataForm.id = id || 0
this.visible = true

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

@ -67,6 +67,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -78,6 +78,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -75,6 +75,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -22,7 +22,7 @@
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="addOrUpdateVisible = false" />
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @destory-dialog="handleDestroyDialog" />
</div>
</template>
@ -96,6 +96,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取产线列表
getProductLine() {
this.$http.get(this.$http.adornUrl('/monitoring/productionLine/list')).then(({ data: res }) => {

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

@ -68,6 +68,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 获取数据列表
getDataList() {
this.dataListLoading = true

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

@ -123,7 +123,7 @@ export default {
mounted() {
this.getLineList()
},
methods: {
methods: {
init(id) {
this.dataForm = {
id: null,

6
src/views/modules/oss/oss-config.vue
View File

@ -152,6 +152,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
this.$nextTick(() => {

6
src/views/modules/oss/oss-upload.vue
View File

@ -20,6 +20,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
// this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`

6
src/views/modules/oss/oss.vue
View File

@ -64,6 +64,12 @@ export default {
Upload
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 云存储配置
configHandle() {
this.configVisible = true

6
src/views/modules/sys/dept-add-or-update.vue
View File

@ -65,6 +65,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
this.$nextTick(() => {

6
src/views/modules/sys/dict-data-add-or-update.vue
View File

@ -47,6 +47,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
this.$nextTick(() => {

6
src/views/modules/sys/dict-data.vue
View File

@ -77,6 +77,12 @@ export default {
this.getDataList()
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 新增 / 修改
addOrUpdateHandle(id) {
this.addOrUpdateVisible = true

6
src/views/modules/sys/dict-type-add-or-update.vue
View File

@ -46,6 +46,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
this.$nextTick(() => {

6
src/views/modules/sys/dict-type.vue
View File

@ -87,6 +87,12 @@ export default {
IconsDialog
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
//
showIcons() {
this.displayIcon = true

6
src/views/modules/sys/log-error.vue
View File

@ -54,6 +54,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
// 异常信息
infoHandle(info) {
this.$alert(info, this.$t('logError.errorInfo'), {

6
src/views/modules/sys/menu-add-or-update.vue
View File

@ -95,6 +95,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
this.$nextTick(() => {

6
src/views/modules/sys/params-add-or-update.vue
View File

@ -41,6 +41,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
this.$nextTick(() => {

6
src/views/modules/sys/role-add-or-update.vue
View File

@ -52,6 +52,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
this.$nextTick(() => {

6
src/views/modules/sys/user-add-or-update.vue
View File

@ -111,6 +111,12 @@ export default {
}
},
methods: {
// destroy dialog
handleDestroyDialog() {
setTimeout(() => {
this.addOrUpdateVisible= false
}, /** after dialog animated */ 200);
},
init() {
this.visible = true
this.dataForm.deptId = ''

6
src/views/pages/login.vue
View File

@ -93,9 +93,9 @@ export default {
this.$root.$i18n.locale = 'zh-CN'
// location.reload()
break
case 'en':
this.$root.$i18n.locale = 'en'
location.reload()
case 'en':
this.$root.$i18n.locale = 'en'
location.reload()
break
}
},