Merge branch 'sqy_dev' into 'main'

'解决teambition-Bug-问题'

See merge request huang/yun-teng-iot-front!160

@@ -8,12 +8,12 @@ VITE_PUBLIC_PATH = /
 # Please note that no line breaks
 
 # 本地
-# VITE_PROXY = [["/api","http://192.168.10.113:8080/api"]]
+VITE_PROXY = [["/api","http://192.168.10.113:8080/api"]]
 
 # 线上演示环境
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
-VITE_PROXY = [["/api","http://47.99.141.212:8080/api"]]
+# VITE_PROXY = [["/api","http://47.99.141.212:8080/api"]]
 
 # 实时数据的ws地址
 VITE_WEB_SOCKET = ws://47.99.141.212:8080/api/ws/plugins/telemetry?token=

@@ -36,9 +36,7 @@ export const useBatchDelete = (
         await deleteFn([record.id]);
         createMessage.success('删除成功');
         handleSuccess();
-      } catch (e) {
-        createMessage.error('删除失败');
-      }
+      } catch (e) {}
     } else {
       try {
         await deleteFn(selectedRowIds.value);
@@ -46,7 +44,6 @@ export const useBatchDelete = (
         selectedRowIds.value = [];
         handleSuccess();
       } catch (e) {
-        createMessage.error('删除失败');
         selectedRowIds.value = [];
       }
     }

@@ -57,27 +57,22 @@
       });
       // 发布通知
       const handleSend = async () => {
-        await validate();
+        const valid = await validate();
+        if (!valid) return;
         const field = getFieldsValue();
         const pointId = field.receiverType === '1' ? field.organizationId + '' : null;
         // 新增情况
-        if (!unref(isUpdate)) {
-          const addNotice = {
-            ...field,
-            pointId,
-          };
-          await notifyAddLeaseApi(addNotice);
-        } else {
+        try {
           const editNotice = {
             ...field,
             pointId,
-            id: unref(noticeId),
+            id: unref(isUpdate) ? unref(noticeId) : undefined,
           };
           await notifyAddLeaseApi(editNotice);
-        }
-        emit('success');
-        closeDrawer();
-        createMessage.success('发布成功');
+          emit('success');
+          closeDrawer();
+          createMessage.success('发布成功');
+        } catch {}
       };
       // 保存草稿
       const handleSaveDraft = async () => {

@@ -93,8 +93,8 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请选择状态',
       options: [
-        { label: '已启用', value: '1' },
-        { label: '未启用', value: '0' },
+        { label: '启用', value: '1' },
+        { label: '禁用', value: '0' },
       ],
     },
     colProps: { span: 6 },

@@ -5,7 +5,7 @@
       @register="registerDrawer"
       showFooter
       @ok="handleSubmit"
-      width="100vw"
+      width="50vw"
       @close="handleClose"
       :title="title"
     >

@@ -111,8 +111,8 @@ export const columns: BasicColumn[] = [
       }
       return h(Switch, {
         checked: record.status === 1,
-        checkedChildren: '已启用',
-        unCheckedChildren: '已禁用',
+        checkedChildren: '启用',
+        unCheckedChildren: '禁用',
         loading: record.pendingStatus,
         onChange(checked: boolean) {
           record.pendingStatus = true;
@@ -122,9 +122,9 @@ export const columns: BasicColumn[] = [
             .then(() => {
               record.status = newStatus;
               if (record.status == 1) {
-                createMessage.success(`已启用`);
+                createMessage.success(`启用成功`);
               } else {
-                createMessage.success('已禁用');
+                createMessage.success('禁用成功');
               }
             })
             .finally(() => {
@@ -220,8 +220,8 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请选择状态',
       options: [
-        { label: '已启用', value: '1' },
-        { label: '未启用', value: '0' },
+        { label: '启用', value: '1' },
+        { label: '禁用', value: '0' },
       ],
     },
     colProps: { span: 6 },

@@ -91,6 +91,10 @@
             field: 'username',
             dynamicDisabled: unref(isUpdate),
           },
+          {
+            field: 'password',
+            ifShow: !unref(isUpdate),
+          },
         ]);
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增账号' : '编辑账号'));

@@ -43,7 +43,7 @@
         if (unref(isUpdate)) {
           //为表单赋值
           await setFieldsValue(data.record);
-          const organizationId = Reflect.get(data.record, 'id');
+          organizationId = Reflect.get(data.record, 'id');
           // 过滤当前选中的组织，
           (function filterTransFun(treeData: any[]) {
             treeData.forEach((item, index, arr) => {
@@ -73,6 +73,7 @@
           if (isUpdate.value) {
             Reflect.set(values, 'id', organizationId);
           }
+
           await saveOrUpdateOrganization(
             { ...values, parentId: values.parentId ?? null },
             isUpdate.value

@@ -31,7 +31,7 @@
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicTree, TreeItem } from '/@/components/Tree';
-
+  import { useMessage } from '/@/hooks/web/useMessage';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
   import { getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
@@ -111,6 +111,7 @@
       const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
 
       async function handleSubmit() {
+        const { createMessage } = useMessage();
         try {
           const values = await validate();
           setDrawerProps({ confirmLoading: true });
@@ -124,6 +125,7 @@
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
             closeDrawer();
             emit('success');
+            createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
           });
         } finally {
           setDrawerProps({ confirmLoading: false });

@@ -32,14 +32,13 @@
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicTree, TreeItem } from '/@/components/Tree';
   const { t } = useI18n(); //加载国际化
-  // import { getMenuList } from '/@/api/demo/system';
   // 加载菜单数据
   import { getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { RouteItem } from '/@/api/sys/model/menuModel';
   import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
   import { RoleEnum } from '/@/enums/roleEnum';
-  // import useCurrentInstance from '/@/hooks/web/useCurrentInstance';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   export default defineComponent({
     name: 'RoleDrawer',
@@ -112,6 +111,8 @@
       const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
 
       async function handleSubmit() {
+        const { createMessage } = useMessage();
+
         try {
           const values = await validate();
           setDrawerProps({ confirmLoading: true });
@@ -126,6 +127,7 @@
           await saveOrUpdateRoleInfoWithMenu(req);
           closeDrawer();
           emit('success');
+          createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
         } finally {
           setDrawerProps({ confirmLoading: false });
         }