From 83162b5ee617d3dce779d027f4f172f85517fea8 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 27 Apr 2026 11:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/default/header/index.vue          | 11 +++++++-
 src/views/biz/nuBaseInfo/EwmImage.vue         | 27 ++++++++++++++++---
 src/views/biz/nuBaseInfo/QyxxList.vue         |  2 +-
 .../components/NuBaseInfoAddModal.vue         | 14 +++++-----
 .../nuBaseInfo/components/QyghListForm.vue    |  2 +-
 .../components/RolePermissionDrawer.vue       |  2 +-
 .../iotDevices/IotDevicesTyModal.vue          | 20 +++++++++++++-
 .../components/ConfigMaterialInfoForm.vue     |  6 +++--
 8 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index d43e1d0..1c71496 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -75,6 +75,7 @@
   import { useUserStore } from '/@/store/modules/user';
   import { useI18n } from '/@/hooks/web/useI18n';
   import Aide from "@/views/dashboard/ai/components/aide/index.vue"
+import { defHttp } from '/@/utils/http/axios';
   const { t } = useI18n();
 
   export default defineComponent({
@@ -106,7 +107,8 @@
       const userStore = useUserStore();
       const { getShowTopMenu, getShowHeaderTrigger, getSplit, getIsMixMode, getMenuWidth, getIsMixSidebar } = useMenuSetting();
       const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } = useRootSetting();
-      const { title } = useGlobSetting();
+      // const { title } = useGlobSetting();
+      const title = ref<string>('');
 
       const {
         getHeaderTheme,
@@ -180,8 +182,15 @@
         //update-end---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
       }
 
+      console.log('登录进来。。。。。');
+      defHttp.get({ url: '/sys/sysDepart/getDepartInfo' }).then((res) => {
+        console.log('登录进来。。。。。', res);
+        title.value = res.title;
+      });
+
       function loginSelectOk() {
         console.log('成功。。。。。');
+
       }
 
       onMounted(() => {
diff --git a/src/views/biz/nuBaseInfo/EwmImage.vue b/src/views/biz/nuBaseInfo/EwmImage.vue
index bdbe566..5be67ed 100644
--- a/src/views/biz/nuBaseInfo/EwmImage.vue
+++ b/src/views/biz/nuBaseInfo/EwmImage.vue
@@ -110,20 +110,39 @@ const downloadQR = () => {
 };
 </script>
 
-<style scoped>
+<style scoped lang="less"> 
 .qr-code-container {
   display: flex;
   flex-direction: column;
   gap: 10px;
+  align-items: center; /* 可选：让二维码和按钮居中对齐 */
 }
-.noDisabled{
+
+.qr-code-container a.noDisabled {
   pointer-events: auto !important;
   cursor: pointer !important;
-  background: #eee;
+  background: linear-gradient(to right, #1ea0fa, #017de9);
+  color: white !important;
   border-radius: 8px;
   padding: 4px 8px;
-  width:100px;
+  width: 100px;
   margin-left: 28px;
   text-align: center;
+  text-decoration: none; /* 移除下划线 */
+  display: inline-block; /* 确保正确显示 */
+}
+
+.qr-code-container a.noDisabled:hover{
+  pointer-events: auto !important;
+  cursor: pointer !important;
+  background: linear-gradient(to right, #1ea0fa, #017de9);
+  color: white !important;
+  border-radius: 8px;
+  padding: 4px 8px;
+  width: 100px;
+  margin-left: 28px;
+  text-align: center;
+  text-decoration: none; /* 移除下划线 */
+  display: inline-block; /* 确保正确显示 */
 }
 </style>
\ No newline at end of file
diff --git a/src/views/biz/nuBaseInfo/QyxxList.vue b/src/views/biz/nuBaseInfo/QyxxList.vue
index 2626dc8..6d1e010 100644
--- a/src/views/biz/nuBaseInfo/QyxxList.vue
+++ b/src/views/biz/nuBaseInfo/QyxxList.vue
@@ -56,7 +56,7 @@
                 <a-button type="dashed" size="small" @click="handleEwm(item)" style="margin-right:10px;width:71px;">二维码</a-button>
                 <a-button type="dashed" size="small" @click="handleEdit(item)" style="margin-right:10px">区域名称</a-button>
                 <a-button type="dashed" size="small" @click="handleWlsb(item)" style="margin-right:10px" >设备管理</a-button>
-                <a-button type="dashed" size="small" @click="handlePerssion(item)" style=" margin-right:10px" >区域功能</a-button>
+                <a-button type="dashed" size="small" @click="handlePerssion(item)" style=" margin-right:10px" >基础功能</a-button>
                 <a-button type="dashed" size="small" @click="handleJcfy(item)" style=" margin-right:10px" >基础费用</a-button>
                 <!-- <a-button type="dashed" size="small" @click="handleKgxx(item)" style="margin-right:10px" v-if="item.areaFlag=='3'">库管信息</a-button>
                 <a-button type="dashed" size="small" @click="handleWlgl(item)" style=" margin-right:10px" v-if="item.areaFlag=='3'">物料管理</a-button> -->
diff --git a/src/views/biz/nuBaseInfo/components/NuBaseInfoAddModal.vue b/src/views/biz/nuBaseInfo/components/NuBaseInfoAddModal.vue
index c25f061..2b9be8f 100644
--- a/src/views/biz/nuBaseInfo/components/NuBaseInfoAddModal.vue
+++ b/src/views/biz/nuBaseInfo/components/NuBaseInfoAddModal.vue
@@ -1,14 +1,14 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-  <!-- <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true" bodyStyle="padding:14px;"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel"> -->
+  <!-- <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true" bodyStyle="padding:14px;"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <NuBaseInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuBaseInfoForm>
-    <!-- <template #footer>
+    <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
       <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
-    </template> -->
-  <!-- </a-drawer> -->
-  </j-modal>
+    </template>
+  </a-drawer>
+  <!-- </j-modal> -->
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/biz/nuBaseInfo/components/QyghListForm.vue b/src/views/biz/nuBaseInfo/components/QyghListForm.vue
index 7f3ac60..560a40f 100644
--- a/src/views/biz/nuBaseInfo/components/QyghListForm.vue
+++ b/src/views/biz/nuBaseInfo/components/QyghListForm.vue
@@ -6,7 +6,7 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="NuBaseInfoForm">
           <a-row>
-            <a-col :span="24" style="text-align: right;">
+            <a-col :span="24" style="text-align: right;margin-bottom: 10px;">
               <a-button style=" margin-right:10px" @click="handleQypz" >区域配置</a-button>
             </a-col>
             <a-col :span="24" >
diff --git a/src/views/biz/nuBaseInfo/components/RolePermissionDrawer.vue b/src/views/biz/nuBaseInfo/components/RolePermissionDrawer.vue
index 7a528c0..b21e0d4 100644
--- a/src/views/biz/nuBaseInfo/components/RolePermissionDrawer.vue
+++ b/src/views/biz/nuBaseInfo/components/RolePermissionDrawer.vue
@@ -4,7 +4,7 @@
 
   <BasicDrawer v-bind="$attrs" @register="registerDrawer" width="650px" destroyOnClose showFooter>
     <template #title>
-      区域功能配置
+      基础功能配置
     </template>
 
     <div>
diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue
index 9f0d82e..78504ff 100644
--- a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue
+++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue
@@ -14,6 +14,9 @@
   import IotDevicesList from './IotDevicesTyList.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
   const title = ref<string>('');
   const buttonText = ref<string>('停用');
   const width = ref<number>(1200);
@@ -45,7 +48,22 @@
    * 确定按钮点击事件
    */
    function handleOk() {
-    registerForm.value.tyFun();
+    if(buttonText.value == '停用'){
+
+      createConfirm({
+        iconType: 'warning',
+        title: '确认停用',
+        content: '是否停用此区域，停用后将释放所有设备，请慎重操作！',
+        okText: '确认',
+        cancelText: '取消',
+        onOk: () => {
+          registerForm.value.tyFun();
+        }
+      });
+    }else{
+      registerForm.value.tyFun();
+    }
+    
   }
   /**
    * form保存回调事件
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
index b87c6be..17e2f19 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
@@ -50,12 +50,12 @@
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="物料图片" v-bind="validateInfos.materialImg" id="ConfigMaterialInfoForm-materialImg" name="materialImg">
-								<j-image-upload :fileMax="1" bizPath="wlpicPath" :value="formData.materialImg?formData.materialImg:(opeMediaAddress + defaultPrePic)" ></j-image-upload>
+								<j-image-upload :fileMax="1" bizPath="materialImg" v-model:value="formData.materialImg" ></j-image-upload>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="物料标识" v-bind="validateInfos.materialIdent" id="ConfigMaterialInfoForm-materialIdent" name="materialIdent">
-								<j-image-upload :fileMax="1" bizPath="wlbsPath" :value="formData.materialIdent?formData.materialIdent:(opeMediaAddress + defaultPrePic)" ></j-image-upload>
+								<j-image-upload :fileMax="1" bizPath="materialIdent" v-model:value="formData.materialIdent" ></j-image-upload>
 							</a-form-item>
 						</a-col>
           </a-row>
@@ -158,6 +158,8 @@ function getRemark(){
    * 新增
    */
   function add(record) {
+    record.materialImg = opeMediaAddress + defaultPrePic
+    record.materialIdent = opeMediaAddress + defaultPrePic
     edit(record);
   }