刘洋 1 năm trước cách đây
mục cha
commit
e8aac89ec7

+ 1 - 0
src/views/report/device-analysis/index.vue

@@ -180,6 +180,7 @@ const tableData2 = computed(() => {
 });
 
 const columns = [
+  { colKey: 'MODEL', title: '设备型号' },
   { colKey: 'ISIN', title: '空闲' },
   { colKey: 'BREAK_DOWN', title: '故障' },
   { colKey: 'ISOUT', title: '占用' },

+ 9 - 2
src/views/resource-guard/person-guard/person-allocate/person-deploy-dialog.vue

@@ -126,7 +126,7 @@
   </my-dialog>
 </template>
 <script setup name="PersonDeployDialog">
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { MessagePlugin } from 'tdesign-vue-next';
 import { MinusCircleFilledIcon } from 'tdesign-icons-vue-next';
 import useClearDialog from '@/hooks/useClearDialog';
@@ -143,7 +143,14 @@ const props = defineProps({
   curRow: Object,
 });
 const regionUseManage = ref(false);
-
+watch(
+  () => props.visible,
+  (val) => {
+    if (!val) {
+      regionUseManage.value = false;
+    }
+  }
+);
 const regionUseManageChange = () => {
   let allData = JSON.parse(JSON.stringify(roleConfigInfoAllData.value));