From b70dab217e5ebcab6d98196cc2d4b2ffb842c3a1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期日, 08 十月 2023 17:33:34 +0800
Subject: [PATCH] 1、优化车间看板四色灯状态展示以及限制拖拽区域 2、部分页面右侧区域元素位置离顶过高，调整布局 3、增加设备日志页面增加点击表格行数据展示当前行工作曲线功能 4、优化设备日志页面切换时间，工作曲线弹窗中的时间随之切换 5、优化设备日志页面加载后首次点击工作曲线后无法查询到数据问题（同时发送异步请求，先后顺序影响）
---
src/views/system/modules/UserModal.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 2abe65b..ce46390 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -58,7 +58,7 @@
</a-form-model-item>
<!--閮ㄩ棬鍒嗛厤-->
- <a-form-model-item label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+ <a-form-model-item v-if="isDepartType== 0" label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
</a-form-model-item>
@@ -134,6 +134,7 @@
import { disabledAuthFilter } from "@/utils/authFilter"
import { duplicateCheck } from '@/api/api'
import JSelectProduction from '../../../components/jeecgbiz/JSelectProduction'
+ import {mapActions} from 'vuex'
export default {
name: "UserModal",
@@ -194,7 +195,9 @@
tenantsOptions: [],
rolesOptions:[],
nextDepartOptions:[],
- nextProductionOptions:[]
+ nextProductionOptions:[],
+ isDepartType:'',
+
}
},
created () {
@@ -202,6 +205,7 @@
this.headers = {"X-Access-Token":token}
this.initRoleList()
this.initTenantList()
+ this.queryTreeData()
},
computed:{
uploadAction:function () {
@@ -209,6 +213,21 @@
}
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() =>{
+ })
+ },
add () {
this.refresh();
this.edit({activitiSync:'1',userIdentity:1});
--
Gitblit v1.9.3