Merge branch 'main' into ft-dev

@@ -8,12 +8,12 @@ VITE_PUBLIC_PATH = /
 # Please note that no line breaks
 # 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://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地址
 # 实时数据的ws地址
 VITE_WEB_SOCKET = ws://47.99.141.212:8080/api/ws/plugins/telemetry?token=
 VITE_WEB_SOCKET = ws://47.99.141.212:8080/api/ws/plugins/telemetry?token=

@@ -28,6 +28,7 @@ export interface DeviceModel {
   deviceInfo: any;
   deviceInfo: any;
   activeTime: string;
   activeTime: string;
   deviceState: DeviceState;
   deviceState: DeviceState;
+  alarmStatus: number;
   profileId: string;
   profileId: string;
   label: string;
   label: string;
   lastConnectTime: string;
   lastConnectTime: string;

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

@@ -145,11 +145,8 @@ const transform: AxiosTransform = {
     } catch (error: any) {
     } catch (error: any) {
       throw new Error(error);
       throw new Error(error);
     }
     }
-
-    if (!config?.requestOptions?.catchFirst) {
-      checkStatus(error?.response?.status, msg, errorMessageMode);
-    }
-    return Promise.reject(error);
+    checkStatus(error?.response?.status, msg, errorMessageMode);
+    return Promise.reject(response.data);
   },
   },
 };
 };
 
 

@@ -79,18 +79,24 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '名称',
     title: '名称',
     dataIndex: 'name',
     dataIndex: 'name',
-    width: 100,
+    width: 120,
+  },
+  {
+    title: '设备状态',
+    dataIndex: 'deviceState',
+    width: 80,
+    slots: { customRender: 'deviceState' },
   },
   },
   {
   {
     title: '位置',
     title: '位置',
     dataIndex: 'deviceInfo.address',
     dataIndex: 'deviceInfo.address',
-    width: 100,
+    width: 120,
   },
   },
   {
   {
-    title: '状态',
-    dataIndex: 'deviceState',
-    width: 100,
-    slots: { customRender: 'deviceState' },
+    title: '告警状态',
+    dataIndex: 'alarmStatus',
+    width: 80,
+    slots: { customRender: 'alarmStatus' },
   },
   },
 ];
 ];
 
 

@@ -23,6 +23,11 @@
             }}
             }}
           </Tag>
           </Tag>
         </template>
         </template>
+        <template #alarmStatus="{ record }">
+          <Tag :color="record.alarmStatus == 1 ? 'warning' : 'success'" class="ml-2">
+            {{ record.alarmStatus == 1 ? '告警' : '正常' }}
+          </Tag>
+        </template>
       </BasicTable>
       </BasicTable>
     </div>
     </div>
     <BasicModal
     <BasicModal
@@ -223,7 +228,7 @@
           const { longitude, latitude, address } = record.deviceInfo;
           const { longitude, latitude, address } = record.deviceInfo;
           const point = new BMap.Point(longitude, latitude);
           const point = new BMap.Point(longitude, latitude);
           let options = {
           let options = {
-            width: 300, // 信息窗口宽度
+            width: 330, // 信息窗口宽度
             height: 230, // 信息窗口高度
             height: 230, // 信息窗口高度
           };
           };
           map.centerAndZoom(point, 15);
           map.centerAndZoom(point, 15);
@@ -438,7 +443,7 @@
   }
   }
   .right-wrap {
   .right-wrap {
     padding-top: 10px;
     padding-top: 10px;
-    width: 22%;
+    width: 28%;
     height: 95%;
     height: 95%;
     position: absolute;
     position: absolute;
     right: 5%;
     right: 5%;

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

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

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

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

@@ -60,16 +60,10 @@
       </ACol>
       </ACol>
     </ARow>
     </ARow>
   </Form>
   </Form>
-  <Modal v-model:visible="visible" :footer="null" centered>
-    <template #title>
-      <CloseCircleFilled class="modal-icon-error" /><span class="ml-2">错误提示</span>
-    </template>
-    <span class="ml-2" style="color: red">用户名或密码不正确</span>
-  </Modal>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { reactive, ref, unref, computed } from 'vue';
   import { reactive, ref, unref, computed } from 'vue';
-  import { Checkbox, Form, Input, Row, Col, Button, Modal } from 'ant-design-vue';
+  import { Checkbox, Form, Input, Row, Col, Button } from 'ant-design-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
   import LoginFormTitle from './LoginFormTitle.vue';
 
 
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -78,16 +72,15 @@
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
   import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
   import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useDesign } from '/@/hooks/web/useDesign';
-  import { getPlatForm } from '/@/api/oem/index';
-  import { createLocalStorage } from '/@/utils/cache/index';
-  import { CloseCircleFilled } from '@ant-design/icons-vue';
+  import { getPlatForm } from '/@/api/oem';
+  import { createLocalStorage } from '/@/utils/cache';
 
 
   const ACol = Col;
   const ACol = Col;
   const ARow = Row;
   const ARow = Row;
   const FormItem = Form.Item;
   const FormItem = Form.Item;
   const InputPassword = Input.Password;
   const InputPassword = Input.Password;
   const { t } = useI18n();
   const { t } = useI18n();
-  const { notification, createErrorModal } = useMessage();
+  const { notification, createMessage } = useMessage();
   const { prefixCls } = useDesign('login');
   const { prefixCls } = useDesign('login');
   const userStore = useUserStore();
   const userStore = useUserStore();
 
 
@@ -116,34 +109,33 @@
     } else {
     } else {
       storage.set('userInfo', null);
       storage.set('userInfo', null);
     }
     }
-    try {
-      loading.value = true;
-      const userInfo = await userStore.login({
+    loading.value = true;
+    const userInfo = await userStore
+      .login({
         password: data.password,
         password: data.password,
         username: data.account,
         username: data.account,
         mode: 'modal', //不要默认的错误提示
         mode: 'modal', //不要默认的错误提示
+      })
+      .catch((data) => {
+        createMessage.error(data.message);
       });
       });
-      if (userInfo) {
-        notification.success({
-          message: t('sys.login.loginSuccessTitle'),
-          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realName}`,
-          duration: 3,
-        });
-        const res = await getPlatForm();
-        storage.set('platformInfo', res);
-        userStore.setPlatInfo(res);
-        // 设置icon
-        let link = (document.querySelector("link[rel*='icon']") ||
-          document.createElement('link')) as HTMLLinkElement;
-        link.type = 'image/x-icon';
-        link.rel = 'shortcut icon';
-        link.href = res.icon ?? '/favicon.ico';
-        document.getElementsByTagName('head')[0].appendChild(link);
-      }
-    } catch (error: any) {
-      visible.value = true;
-    } finally {
-      loading.value = false;
+    if (userInfo) {
+      notification.success({
+        message: t('sys.login.loginSuccessTitle'),
+        description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realName}`,
+        duration: 3,
+      });
+      const res = await getPlatForm();
+      storage.set('platformInfo', res);
+      userStore.setPlatInfo(res);
+      // 设置icon
+      let link = (document.querySelector("link[rel*='icon']") ||
+        document.createElement('link')) as HTMLLinkElement;
+      link.type = 'image/x-icon';
+      link.rel = 'shortcut icon';
+      link.href = res.icon ?? '/favicon.ico';
+      document.getElementsByTagName('head')[0].appendChild(link);
     }
     }
+    loading.value = false;
   }
   }
 </script>
 </script>

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

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

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

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

@@ -21,7 +21,6 @@ export interface RequestOptions {
   ignoreCancelToken?: boolean;
   ignoreCancelToken?: boolean;
   // Whether to send token in header
   // Whether to send token in header
   withToken?: boolean;
   withToken?: boolean;
-  catchFirst?: boolean;
 }
 }
 
 
 export interface Result<T = any> {
 export interface Result<T = any> {