Merge branch 'f-dev' into 'main'

fix：DEFECT-621 DEFECT-622 DEFECT-613 修复时间段显示为一样的时间 设备未填入属性提示修改...

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

 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { phoneRule, emailRule, chineseAndEnlishRule } from '/@/utils/rules';
+import { phoneRule, emailRule } from '/@/utils/rules';
 
 
 export const formSchema: FormSchema[] = [
 export const formSchema: FormSchema[] = [
   {
   {
@@ -11,7 +11,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
     componentProps: {
       placeholder: '请输入用户昵称',
       placeholder: '请输入用户昵称',
     },
     },
-    rules: chineseAndEnlishRule,
   },
   },
   {
   {
     field: 'phoneNumber',
     field: 'phoneNumber',

@@ -32,6 +32,7 @@
           icon="ion:document-text-outline"
           icon="ion:document-text-outline"
         />
         />
         <MenuItem
         <MenuItem
+          v-if="hasPermission('system:password:view')"
           key="changePassword"
           key="changePassword"
           :text="t('layout.header.dropdownItemChangePassword')"
           :text="t('layout.header.dropdownItemChangePassword')"
           icon="ant-design:unlock-twotone"
           icon="ant-design:unlock-twotone"
@@ -60,9 +61,7 @@
 <script lang="ts">
 <script lang="ts">
   // components
   // components
   import { Dropdown, Menu } from 'ant-design-vue';
   import { Dropdown, Menu } from 'ant-design-vue';
-
   import { defineComponent, computed, ref, reactive } from 'vue';
   import { defineComponent, computed, ref, reactive } from 'vue';
-
   import { useUserStore } from '/@/store/modules/user';
   import { useUserStore } from '/@/store/modules/user';
   import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
   import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -74,7 +73,9 @@
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
   import { getAuthCache } from '/@/utils/auth';
   import { useRouter } from 'vue-router';
   import { useRouter } from 'vue-router';
-  type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal';
+  import { usePermission } from '/@/hooks/web/usePermission';
+
+  type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal' | 'changePassword';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'UserDropdown',
     name: 'UserDropdown',
@@ -89,6 +90,9 @@
       theme: propTypes.oneOf(['dark', 'light']),
       theme: propTypes.oneOf(['dark', 'light']),
     },
     },
     setup() {
     setup() {
+      //修复修改密码根据后端返回的权限标识来显隐
+      const { hasPermission } = usePermission();
+      //修复修改密码根据后端返回的权限标识来显隐
       const refreshPersonlData = reactive({
       const refreshPersonlData = reactive({
         avatar: '',
         avatar: '',
         realName: '',
         realName: '',
@@ -175,6 +179,7 @@
         getShowDoc,
         getShowDoc,
         register,
         register,
         getUseLockPage,
         getUseLockPage,
+        hasPermission,
       };
       };
     },
     },
   });
   });

@@ -13,6 +13,7 @@
     <BasicForm @register="registerForm">
     <BasicForm @register="registerForm">
       <template #devices="{ model, field }">
       <template #devices="{ model, field }">
         <p style="display: none">{{ field }}</p>
         <p style="display: none">{{ field }}</p>
+        <p>{{ queryModeFunc(model['queryMode']) }}</p>
         <p>{{ orgFunc(model['organizationId']) }}</p>
         <p>{{ orgFunc(model['organizationId']) }}</p>
         <Select
         <Select
           placeholder="请选择设备"
           placeholder="请选择设备"
@@ -81,9 +82,23 @@
   let editResData: any = reactive({});
   let editResData: any = reactive({});
   const editDeviceAttr: any = ref([]);
   const editDeviceAttr: any = ref([]);
   const orgFuncId = ref('');
   const orgFuncId = ref('');
+  const queryModeStr = ref('');
   const orgFunc = (e) => {
   const orgFunc = (e) => {
     orgFuncId.value = e;
     orgFuncId.value = e;
   };
   };
+  const queryModeFunc = (e) => {
+    queryModeStr.value = e;
+  };
+  watch(
+    () => queryModeStr.value,
+    (newValue: string) => {
+      if (newValue == 'latest') {
+        setFieldsValue({ startTs: 1000 });
+        setFieldsValue({ interval: 1000 });
+      } else {
+      }
+    }
+  );
   watch(
   watch(
     () => orgFuncId.value,
     () => orgFuncId.value,
     async (newValue: string) => {
     async (newValue: string) => {
@@ -144,11 +159,6 @@
       deviceList.value = deWeightThree();
       deviceList.value = deWeightThree();
       const findEditValue = deviceList.value.findIndex((f) => f.value == e.value);
       const findEditValue = deviceList.value.findIndex((f) => f.value == e.value);
       if (findEditValue !== -1) deviceList.value.splice(findEditValue, 1);
       if (findEditValue !== -1) deviceList.value.splice(findEditValue, 1);
-      // try {
-      //   if (deviceList.value[0]?.attributes.length > 0) {
-      //     deviceList.value.splice(0, 1);
-      //   }
-      // } catch {}
     } else {
     } else {
       const eDevice = e.key || e.value;
       const eDevice = e.key || e.value;
       const findValue = deviceList.value.findIndex((f) => f.value == eDevice);
       const findValue = deviceList.value.findIndex((f) => f.value == eDevice);
@@ -197,6 +207,7 @@
         endTs: editResData.data.queryCondition?.endTs,
         endTs: editResData.data.queryCondition?.endTs,
         way: editResData.data?.way,
         way: editResData.data?.way,
         queryMode: editResData.data.queryCondition?.queryMode === 0 ? 'latest' : 'timePeriod',
         queryMode: editResData.data.queryCondition?.queryMode === 0 ? 'latest' : 'timePeriod',
+        cronTime: editResData.data?.executeContent
       });
       });
       const endTsTime = editResData.data.queryCondition?.endTs;
       const endTsTime = editResData.data.queryCondition?.endTs;
       const startTsTime = editResData.data.queryCondition?.startTs;
       const startTsTime = editResData.data.queryCondition?.startTs;
@@ -340,15 +351,25 @@
       const values = await validate();
       const values = await validate();
       if (!values) return;
       if (!values) return;
       getFormValueFunc();
       getFormValueFunc();
+      let hasAttr = false;
       if (!unref(isUpdate)) {
       if (!unref(isUpdate)) {
         if (getAttrDevice.value.length === 0) {
         if (getAttrDevice.value.length === 0) {
           return createMessage.error('请选择设备及其属性');
           return createMessage.error('请选择设备及其属性');
+        } else {
+          getAttrDevice.value.forEach((f: any) => {
+            if (f.attributes == undefined) hasAttr = true;
+          });
         }
         }
       } else {
       } else {
         if (getAttrDevice.value.length === 0) {
         if (getAttrDevice.value.length === 0) {
           return createMessage.error('请选择设备及其属性');
           return createMessage.error('请选择设备及其属性');
+        } else {
+          getAttrDevice.value.forEach((f: any) => {
+            if (f.attributes == undefined) hasAttr = true;
+          });
         }
         }
       }
       }
+      if (hasAttr) return createMessage.error('请选择设备属性');
       if (values.executeWay == 0) {
       if (values.executeWay == 0) {
         executeContent = null;
         executeContent = null;
       } else {
       } else {
@@ -364,7 +385,7 @@
       queryCondition = {
       queryCondition = {
         agg: values.agg,
         agg: values.agg,
         interval: values.interval,
         interval: values.interval,
-        limit: values.limit1,
+        limit: values.limit,
         ...{
         ...{
           startTs: startTs.value,
           startTs: startTs.value,
         },
         },
@@ -373,6 +394,11 @@
         },
         },
         queryMode: values?.queryMode === 'latest' ? 0 : 1,
         queryMode: values?.queryMode === 'latest' ? 0 : 1,
       };
       };
+      if (queryCondition.queryMode === 1) {
+        if (queryCondition.startTs == queryCondition.endTs) {
+          return createMessage.error('自定义周期时间不能选择一样');
+        }
+      }
 
 
       delete values.devices;
       delete values.devices;
       delete values.agg;
       delete values.agg;

@@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'dataType',
     dataIndex: 'dataType',
     width: 120,
     width: 120,
     format: (_text: string, record: Recordable) => {
     format: (_text: string, record: Recordable) => {
-      return record.dataCompare === 0 ? '原始数据' : '聚合数据';
+      return record.dataType === 0 ? '原始数据' : '聚合数据';
     },
     },
   },
   },
   {
   {
@@ -383,7 +383,7 @@ export const formSchema: QFormSchema[] = [
     },
     },
   },
   },
   {
   {
-    field: 'limit1',
+    field: 'limit',
     required: true,
     required: true,
     label: '最大值',
     label: '最大值',
     component: 'InputNumber',
     component: 'InputNumber',
@@ -407,13 +407,13 @@ export const formSchema: QFormSchema[] = [
     componentProps({ formActionType }) {
     componentProps({ formActionType }) {
       const { setFieldsValue } = formActionType;
       const { setFieldsValue } = formActionType;
       return {
       return {
-        getPopupContainer: () => document.body,
         placeholder: '请选择查询周期',
         placeholder: '请选择查询周期',
         options: [
         options: [
           { label: '固定周期', value: QueryWay.LATEST },
           { label: '固定周期', value: QueryWay.LATEST },
           { label: '自定义周期', value: QueryWay.TIME_PERIOD },
           { label: '自定义周期', value: QueryWay.TIME_PERIOD },
         ],
         ],
         onChange(value) {
         onChange(value) {
+          console.log(value);
           value === QueryWay.LATEST
           value === QueryWay.LATEST
             ? setFieldsValue({
             ? setFieldsValue({
                 [SchemaFiled.DATE_RANGE]: [],
                 [SchemaFiled.DATE_RANGE]: [],

@@ -10,9 +10,14 @@
       :showOkBtn="false"
       :showOkBtn="false"
     >
     >
       <div class="wrapper">
       <div class="wrapper">
-        <div class="inner item" v-for="(item, index) in initChartData" :key="index">
-          <p style="display: none">{{ item }}</p>
-          <div :id="`chart${index}`" :style="{ height, width }"></div>
+        <div v-if="initChartData.length > 0">
+          <div class="inner item" v-for="(item, index) in initChartData" :key="index">
+            <p style="display: none">{{ item }}</p>
+            <div :id="`chart${index}`" :style="{ height, width }"></div>
+          </div>
+        </div>
+        <div v-else style="display: flex; justify-content: center; align-items: center">
+          <div style="position: relative; left: 13rem; top: 8rem">暂无数据</div>
         </div>
         </div>
       </div>
       </div>
     </BasicModal>
     </BasicModal>
@@ -126,12 +131,8 @@
               axisPointer: { type: 'shadow' },
               axisPointer: { type: 'shadow' },
               axisLabel: {
               axisLabel: {
                 color: '#333',
                 color: '#333',
-                //  让x轴文字方向为竖向
                 interval: 0,
                 interval: 0,
                 rotate: 90,
                 rotate: 90,
-                // formatter: function (value) {
-                //   return value.split('').join('\n');
-                // },
               },
               },
             },
             },
             yAxis: {
             yAxis: {

@@ -79,11 +79,11 @@ export const searchSchedueFormSchema: FormSchema[] = [
     componentProps: {
     componentProps: {
       options: [
       options: [
         {
         {
-          label: '正常',
+          label: '启用',
           value: 1,
           value: 1,
         },
         },
         {
         {
-          label: '暂停',
+          label: '禁用',
           value: 0,
           value: 0,
         },
         },
       ],
       ],

@@ -139,6 +139,7 @@
       const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
       const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
 
 
       async function handleSubmit() {
       async function handleSubmit() {
+        setDrawerProps({ loading: true });
         setDrawerProps({ confirmLoading: true });
         setDrawerProps({ confirmLoading: true });
         const { createMessage } = useMessage();
         const { createMessage } = useMessage();
         try {
         try {
@@ -152,14 +153,17 @@
             menu: allCheckedKeys.value.length ? allCheckedKeys.value : originMenus.value,
             menu: allCheckedKeys.value.length ? allCheckedKeys.value : originMenus.value,
           };
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
-          saveOrUpdateRoleInfoWithMenu(req).then(() => {
+          const res = await saveOrUpdateRoleInfoWithMenu(req);
+          if (res) {
             closeDrawer();
             closeDrawer();
             emit('success');
             emit('success');
             createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
             createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
-          });
-        } catch {
+            setDrawerProps({ loading: false });
+            setDrawerProps({ confirmLoading: false });
+          }
         } finally {
         } finally {
           setTimeout(() => {
           setTimeout(() => {
+            setDrawerProps({ loading: false });
             setDrawerProps({ confirmLoading: false });
             setDrawerProps({ confirmLoading: false });
           }, 300);
           }, 300);
         }
         }