Merge remote-tracking branch 'origin/main'

@@ -15,6 +15,7 @@
         <p style="display: none">{{ field }}</p>
         <p>{{ queryModeFunc(model['queryMode']) }}</p>
         <p>{{ orgFunc(model['organizationId']) }}</p>
+        <p>{{ dataTypeFunc(model['dataType']) }}</p>
         <Select
           placeholder="请选择设备"
           v-model:value="selectDevice"
@@ -83,12 +84,25 @@
   const editDeviceAttr: any = ref([]);
   const orgFuncId = ref('');
   const queryModeStr = ref('');
+  const dataTypeStr = ref(0);
   const orgFunc = (e) => {
     orgFuncId.value = e;
   };
   const queryModeFunc = (e) => {
     queryModeStr.value = e;
   };
+  const dataTypeFunc = (e) => {
+    dataTypeStr.value = e;
+  };
+  watch(
+    () => dataTypeStr.value,
+    (newValue) => {
+      if (newValue == 0) {
+        setFieldsValue({ limit: 100 });
+      } else {
+      }
+    }
+  );
   watch(
     () => queryModeStr.value,
     (newValue: string) => {
@@ -207,7 +221,7 @@
         endTs: editResData.data.queryCondition?.endTs,
         way: editResData.data?.way,
         queryMode: editResData.data.queryCondition?.queryMode === 0 ? 'latest' : 'timePeriod',
-        cronTime: editResData.data?.executeContent
+        cronTime: editResData.data?.executeContent,
       });
       const endTsTime = editResData.data.queryCondition?.endTs;
       const startTsTime = editResData.data.queryCondition?.startTs;
@@ -357,7 +371,7 @@
           return createMessage.error('请选择设备及其属性');
         } else {
           getAttrDevice.value.forEach((f: any) => {
-            if (f.attributes == undefined) hasAttr = true;
+            if (f.attributes == undefined || f.attributes.length == 0) hasAttr = true;
           });
         }
       } else {
@@ -365,7 +379,7 @@
           return createMessage.error('请选择设备及其属性');
         } else {
           getAttrDevice.value.forEach((f: any) => {
-            if (f.attributes == undefined) hasAttr = true;
+            if (f.attributes == undefined || f.attributes.length == 0) hasAttr = true;
           });
         }
       }
@@ -379,8 +393,9 @@
         startTs.value = moment().subtract(values.startTs, 'ms').valueOf();
         endTs.value = Date.now();
       } else {
-        startTs.value = moment(values.startTs).valueOf();
-        endTs.value = moment(values.endTs).valueOf();
+        const fT = JSON.parse(JSON.stringify(values.dataRange));
+        startTs.value = moment(fT[0]).valueOf();
+        endTs.value = moment(fT[1]).valueOf();
       }
       queryCondition = {
         agg: values.agg,
@@ -394,12 +409,6 @@
         },
         queryMode: values?.queryMode === 'latest' ? 0 : 1,
       };
-      if (queryCondition.queryMode === 1) {
-        if (queryCondition.startTs == queryCondition.endTs) {
-          return createMessage.error('自定义周期时间不能选择一样');
-        }
-      }
-
       delete values.devices;
       delete values.agg;
       delete values.interval;

@@ -379,15 +379,15 @@ export const formSchema: QFormSchema[] = [
   {
     field: 'limit',
     required: true,
-    label: '最大值',
+    label: '最大条数',
     component: 'InputNumber',
-    defaultValue: 200,
+    defaultValue: 100,
     ifShow({ values }) {
       return values[SchemaFiled.AGG] === AggregateDataEnum.NONE;
     },
     colProps: { span: 12 },
     componentProps: {
-      placeholder: '请输入最大值',
+      placeholder: '请输入最大条数',
       min: 7,
       max: 50000,
     },
@@ -427,28 +427,35 @@ export const formSchema: QFormSchema[] = [
     ifShow({ values }) {
       return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && !isFixedTime(values.executeWay);
     },
-    componentProps({ formActionType }) {
-      const { setFieldsValue } = formActionType;
-      let dates: Moment[] = [];
-      return {
-        placeholder: ['请选择开始时间', '请选择结束时间'],
-        showTime: true,
-        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 });
-        },
-      };
+    componentProps: {
+      showTime: {
+        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: {
       span: 10,
     },

@@ -29,7 +29,6 @@
 <script lang="ts" setup>
   import { reactive, UnwrapRef, watchEffect, ref } from 'vue';
   import { propTypes } from '/@/utils/propTypes';
-  import { SelectTypes } from 'ant-design-vue/es/select';
   import { Select } from 'ant-design-vue';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 
@@ -42,16 +41,23 @@
     value: propTypes.object.def({}),
     orgId: propTypes.string.def(''),
   });
-  const selectOptions = ref<SelectTypes['options']>([]);
-  //获取属性
+  const selectOptions: any = ref([]);
+  //获取对应设备属性
   const getAttr = async (orgId, deviceId) => {
     const res = await getAttribute(orgId, deviceId);
     selectOptions.value = res.map((o) => {
-      return {
-        label: o,
-        value: o,
-      };
+      let obj: any = {};
+      if (o !== null) {
+        obj = {
+          label: o,
+          value: o,
+        };
+        return obj;
+      }
     });
+    //如果服务端返回的数组里含有null 过滤null值
+    const excludeNull = selectOptions.value.filter(Boolean);
+    selectOptions.value = excludeNull;
   };
   //动态数据
   const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });

@@ -130,6 +130,14 @@
     handleSuccess,
     setProps
   );
+  selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+    // Demo:status为1的选择框禁用
+    if (record.status === 1) {
+      return { disabled: true };
+    } else {
+      return { disabled: false };
+    }
+  };
 
   nextTick(() => {
     setProps(selectionOptions);

 .wrapper {
-  margin: 60px;
-  display: grid;
-  justify-content: space-between;
-  grid-template-columns: repeat(2, 400px);
-  grid-gap: 40px;
-  grid-template-rows: 400px 400px;
+  margin: 10px 60px 60px 60px;
 }
 
 .inner {

@@ -9,15 +9,25 @@
       title="报表趋势图"
       :showOkBtn="false"
     >
-      <div class="wrapper">
-        <div v-if="initChartData.length > 0">
-          <div class="inner item" v-for="(item, index) in initChartData" :key="index">
+      <div :class="[initChartData.length % 2 !== 0 ? '' : 'wrapper']">
+        <div
+          v-if="initChartData.length > 0"
+          :class="[initChartData.length % 2 !== 0 ? '' : 'chart-style']"
+        >
+          <div
+            :class="[
+              initChartData.length % 2 !== 0 ? '' : 'inner',
+              initChartData.length % 2 !== 0 ? '' : '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 style="position: relative; left: 0rem; top: 3rem">暂无数据</div>
         </div>
       </div>
     </BasicModal>
@@ -110,18 +120,19 @@
             },
             toolbox: {},
             grid: {
-              left: '3%',
-              right: '4%',
-              bottom: '3%',
+              left: '8%',
+              right: '8%',
+              bottom: '12%',
               containLabel: true,
             },
             dataZoom: [
               {
                 type: 'slider',
                 show: true,
-                start: 0,
-                end: 30,
-                xAxisIndex: [0],
+                startValue: 0,
+                endValue: 5,
+                height: '30',
+                bottom: '4%',
               },
             ],
             xAxis: {
@@ -130,9 +141,19 @@
               boundaryGap: false,
               axisPointer: { type: 'shadow' },
               axisLabel: {
-                color: '#333',
+                interval: 0, 
+                rotate: 65,
+                textStyle: {
+                  color: '#000',
+                  fontSize: 10,
+                },
+              },
+              axisLine: {
+                show: true,
                 interval: 0,
-                rotate: 90,
+                lineStyle: {
+                  color: 'RGB(210,221,217)',
+                },
               },
             },
             yAxis: {
@@ -155,4 +176,11 @@
 </script>
 <style lang="less" scoped>
   @import url('./ReportPreviewModal.less');
+  .chart-style {
+    display: flex;
+    flex-wrap: wrap;
+    width: 825px;
+    margin-top: 10px;
+    justify-content: space-between;
+  }
 </style>

@@ -133,6 +133,14 @@
     handleSuccess,
     setProps
   );
+  selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+    // Demo:status为1的选择框禁用
+    if (record.status === 1) {
+      return { disabled: true };
+    } else {
+      return { disabled: false };
+    }
+  };
 
   nextTick(() => {
     setProps(selectionOptions);