Merge branch 'f-dev' into 'main'

fix：修改报表配置相关代码

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

@@ -431,30 +431,6 @@ export const formSchema: QFormSchema[] = [
         defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
         defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
       },
       },
     },
     },
-    // componentProps({ formActionType }) {
-    //   const { setFieldsValue } = formActionType;
-    //   let dates: Moment[] = [];
-    //   return {
-    //     placeholder: ['请选择开始时间', '请选择结束时间'],
-    //     showTime: {
-    //       defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-    //     },
-    //     // onCalendarChange(value: Moment[]) {
-    //     //   dates = value;
-    //     // },
-    //     // disabledDate(current: Moment) {
-    //     //   if (!dates || dates.length === 0 || !current) {
-    //     //     return false;
-    //     //   }
-    //     //   const diffDate = current.diff(dates[0], 'years', true);
-    //     //   return Math.abs(diffDate) > 1;
-    //     // },
-    //     onChange() {
-    //       dates = [];
-    //       setFieldsValue({ [SchemaFiled.INTERVAL]: null });
-    //     },
-    //   };
-    // },
     colProps: {
     colProps: {
       span: 10,
       span: 10,
     },
     },

@@ -29,7 +29,7 @@
           :actions="[
           :actions="[
             {
             {
               label: '查看',
               label: '查看',
-              icon: 'clarity:note-edit-line',
+              icon: 'ant-design:eye-outlined',
               onClick: handleViewDetail.bind(null, record),
               onClick: handleViewDetail.bind(null, record),
               ifShow: record.status === 1,
               ifShow: record.status === 1,
             },
             },

@@ -108,8 +108,7 @@
           let myOption = {
           let myOption = {
             title: {
             title: {
               text: `${item.attr}趋势图`,
               text: `${item.attr}趋势图`,
-              subtext: `${item.attr}`,
-              left: 'left',
+              left: 'center',
             },
             },
             tooltip: {
             tooltip: {
               trigger: 'axis',
               trigger: 'axis',

@@ -296,6 +296,7 @@
                 return createMessage.error('请填写属性');
                 return createMessage.error('请填写属性');
               }
               }
             }
             }
+            Object.assign(noEditObj, getTypeObj);
             const res = await postAddConvertApi(isEdit.value ? noEditObj : allPostForm);
             const res = await postAddConvertApi(isEdit.value ? noEditObj : allPostForm);
             if (res) {
             if (res) {
               closeModal();
               closeModal();

@@ -116,9 +116,10 @@
         mode: 'modal', //不要默认的错误提示
         mode: 'modal', //不要默认的错误提示
       })
       })
       .catch((data) => {
       .catch((data) => {
-        //登录失败返回的html,所以提示框什么都没有
-        //去掉提示框
-        // createMessage.error(data.message);
+        //登录失败如果是502，返回的html,那么提示框什么都没有
+        if (data.message == 'Invalid username or password' && typeof data.message == 'string') {
+          createMessage.error(data.message);
+        }
       });
       });
     if (userInfo) {
     if (userInfo) {
       notification.success({
       notification.success({

@@ -27,10 +27,25 @@
     showActionButtonGroup: false,
     showActionButtonGroup: false,
     fieldMapToTime: [['timeZone', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
     fieldMapToTime: [['timeZone', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
   });
   });
+  const isViewDetail = ref(false);
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     await resetFields();
     await resetFields();
     setDrawerProps({ confirmLoading: false });
     setDrawerProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
     isUpdate.value = !!data?.isUpdate;
+    isViewDetail.value = !!data?.isView;
+
+    if (unref(isViewDetail)) {
+      setDrawerProps({ showFooter: true });
+      if (unref(isUpdate)) {
+        setDrawerProps({ title: '编辑定时任务' });
+      } else {
+        setDrawerProps({ title: '新增定时任务' });
+      }
+    } else {
+      setDrawerProps({ showFooter: false });
+      setDrawerProps({ title: '查看定时任务' });
+    }
+
     if (unref(isUpdate)) {
     if (unref(isUpdate)) {
       //回显基础数据
       //回显基础数据
       editId.value = data.record.id;
       editId.value = data.record.id;

@@ -40,6 +40,12 @@
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
               },
             },
             },
+            {
+              label: '查看',
+              icon: 'ant-design:eye-outlined',
+              onClick: handleViewDetail.bind(null, record),
+              ifShow: record.status === 1,
+            },
           ]"
           ]"
           :dropDownActions="[
           :dropDownActions="[
             {
             {
@@ -166,10 +172,12 @@
       openDrawer(true, {
       openDrawer(true, {
         isUpdate: true,
         isUpdate: true,
         record,
         record,
+        isView: true,
       });
       });
     } else {
     } else {
       openDrawer(true, {
       openDrawer(true, {
         isUpdate: false,
         isUpdate: false,
+        isView: true,
       });
       });
     }
     }
   };
   };
@@ -203,5 +211,14 @@
       createMessage.success(`执行一次任务"${record.jobName}"成功`);
       createMessage.success(`执行一次任务"${record.jobName}"成功`);
     }
     }
   };
   };
+  const handleViewDetail = (record: Recordable) => {
+    if (record) {
+      openDrawer(true, {
+        isUpdate: true,
+        record,
+        isView: false,
+      });
+    }
+  };
 </script>
 </script>
 <style lang="less" scoped></style>
 <style lang="less" scoped></style>

@@ -18,14 +18,20 @@
               icon: 'ant-design:send-outlined',
               icon: 'ant-design:send-outlined',
               tooltip: '发送通知短信',
               tooltip: '发送通知短信',
               ifShow: record.phoneNumber != null && !record.hasPassword,
               ifShow: record.phoneNumber != null && !record.hasPassword,
-              onClick: handleSendMsg.bind(null, record),
+              popConfirm: {
+                title: '是否需要发送通知短信',
+                confirm: handleSendMsg.bind(null, record),
+              },
             },
             },
             {
             {
               label: '清除密码',
               label: '清除密码',
               icon: 'ant-design:clear-outlined',
               icon: 'ant-design:clear-outlined',
               tooltip: '清除密码',
               tooltip: '清除密码',
               ifShow: record.hasPassword,
               ifShow: record.hasPassword,
-              onClick: handleResetPassword.bind(null, record),
+              popConfirm: {
+                title: '是否需要清除密码',
+                confirm: handleResetPassword.bind(null, record),
+              },
             },
             },
             {
             {
               label: '编辑',
               label: '编辑',