refractor：重新修改了报表配置部分代码

fengtao
1 parent 2b197447
Showing 4 changed files with 66 additions and 79 deletions
src/views/report/config/ReportConfigDrawer.vue
src/views/report/config/cpns/DeviceAttrCpns.vue
src/views/system/scheduled/config.data.ts
src/views/system/scheduled/config.form.data.ts
--- a/src/views/report/config/ReportConfigDrawer.vue
View file @5ec48e6
+++ b/src/views/report/config/ReportConfigDrawer.vue
View file @5ec48e6
@@ -18,23 +18,23 @@
           mode="multiple"
           labelInValue
           allowClear
-          @deselect="handleDeSelect"
           notFoundContent="请选择设备"
         />
         <div style="margin-top: 1.5vh"></div>
-        <DeviceAttrCpns
-          ref="deviceAttrRef"
-          @change="handleChange"
-          :value="deviceList"
-          :orgId="organizationId || orgId"
-          :deSelectValue="deSelectValue"
-        />
+        <div v-for="(item, index) in deviceList" :key="index">
+          <DeviceAttrCpns
+            ref="deviceAttrRef"
+            @change="handleChange"
+            :value="item"
+            :orgId="organizationId || orgId"
+          />
+        </div>
       </template>
     </BasicForm>
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref, reactive, watch } from 'vue';
+  import { ref, computed, unref, reactive, watch, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema, organizationId } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -50,10 +50,9 @@
   const isUpdate = ref(true);
   const editId = ref('');
   const orgId = ref('');
-  let deviceAttrData: any = ref([]);
   const selectOptions: any = ref([]);
   const selectDevice = ref([]);
-  const deviceList = ref([]);
+  const deviceList: any = ref([]);
   watch(organizationId, async (newValue: string) => {
     if (!newValue) return;
     //获取设备
@@ -71,11 +70,6 @@
   const handleDeviceChange = (e) => {
     deviceList.value = e;
   };
-  const deSelectValue = ref('');
-  const handleDeSelect = ({ key }) => {
-    //取消选中的key
-    deSelectValue.value = key;
-  };
   const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
@@ -129,29 +123,29 @@
       ];
       selectDevice.value = deviceIds;
       //回显设备属性 TODO 模拟的数据 待服务端返回
-      deviceAttrData.value = [
+      deviceList.value = [
         {
-          device: '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
+          value: '8a4cc9a0-f201-11ec-98ad-a9680487d1e0',
           attribute: 'CO2',
-          name: '宝马默认设备',
+          label: '奥迪网关子设备',
         },
         {
-          device: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
+          value: '8943f0b0-f1f7-11ec-98ad-a9680487d1e0',
           attribute: 'co',
-          name: '新增奥迪测试设备',
+          label: '宝马默认设备',
         },
         {
-          device: '54e199d0-f1f7-11ec-98ad-a9680487d1e0',
+          value: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
           attribute: 'hot',
-          name: '奥迪默认设备',
+          label: '奔驰默认设备',
         },
         {
-          device: '6d9043f0-f1f7-11ec-98ad-a9680487d1e0',
+          value: '8f5b4280-f29e-11ec-98ad-a9680487d1e0',
           attribute: 'wet',
-          name: '奔驰默认设备',
+          label: '新增奥迪测试设备',
         },
       ];
-      deviceAttrRef.value?.echoDynamicInputFunc(deviceAttrData.value);
+      nextTick(() => {});
     } else {
       editId.value = '';
       orgId.value = '';
@@ -162,7 +156,9 @@
   });
   const getAttrDevice: any = ref([]);
   const getTitle = computed(() => (!unref(isUpdate) ? '新增报表配置' : '编辑报表配置'));
-  const handleChange = (e) => (getAttrDevice.value = e);
+  const handleChange = (e) => {
+    getAttrDevice.value.push(e);
+  };
   let postObj: any = reactive({});
   let queryCondition: any = reactive({});
   let executeContent: any = reactive({});
--- a/src/views/report/config/cpns/DeviceAttrCpns.vue
View file @5ec48e6
+++ b/src/views/report/config/cpns/DeviceAttrCpns.vue
View file @5ec48e6
@@ -38,14 +38,14 @@
     device: string;
   }
   const props = defineProps({
-    value: propTypes.array.def([]),
+    value: propTypes.object.def({}),
     orgId: propTypes.string.def(''),
   });
   const emits = defineEmits(['change', 'update:value']);
   const selectOptions = ref<SelectTypes['options']>([]);
   //获取属性
   const getAttr = async (orgId, deviceId) => {
-    const res = await getAttribute(orgId, deviceId.join(','));
+    const res = await getAttribute(orgId, deviceId);
     selectOptions.value = res.map((o) => {
       return {
         label: o,
@@ -55,25 +55,20 @@
   };
   //动态数据
   const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
-  //监听传入数据value
-  watchEffect(() => {
+  const rEffect = watchEffect(() => {
     initVal();
   });
+  rEffect();
   /**
    * 初始化数值
    */
   async function initVal() {
-    dynamicInput.params = [];
-    if (props.value && props.orgId) {
-      let jsonObj = props.value;
-      const deviceId = jsonObj.map((m: any) => m.value);
-      await getAttr(props.orgId, deviceId);
-      jsonObj.forEach((item: any) => {
-        dynamicInput.params.push({
-          attribute: '',
-          device: item.label,
-          value: item.value,
-        });
+    if (props.orgId && props.value.value) {
+      await getAttr(props.orgId, props.value.value);
+      dynamicInput.params.push({
+        device: props.value.label,
+        value: props.value.value,
+        attribute: props.value.attribute == '' ? '' : props.value.attribute,
       });
     }
   }
@@ -81,32 +76,12 @@
    * 数值改变
    */
   function emitChange() {
-    let obj: any = [];
-    if (dynamicInput.params.length > 0) {
-      dynamicInput.params.forEach((item: Params) => {
-        obj.push({
-          attribute: item.attribute,
-          device: item.value,
-        });
-      });
-    }
-    console.log('emitChange', obj);
+    let obj: any = dynamicInput.params[0];
     emits('change', obj);
     emits('update:value', obj);
   }
-  //回显
-  const echoDynamicInputFunc = (o) => {
-    dynamicInput.params = [];
-    o.forEach((m: any) => {
-      dynamicInput.params.push({
-        device: m.name,
-        attribute: m.attribute,
-        value: m.device,
-      });
-    });
-  };
   defineExpose({
-    echoDynamicInputFunc,
+    getAttr,
   });
 </script>
 <style scoped lang="css">
--- a/src/views/system/scheduled/config.data.ts
View file @5ec48e6
+++ b/src/views/system/scheduled/config.data.ts
View file @5ec48e6
@@ -4,13 +4,24 @@ import moment from 'moment';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
+///任务组名Enum
+export enum EJobGroup {
+  DEFAULT = 'DEFAULT',
+  SYSTEM = 'SYSTEM',
+  REPORT = 'REPORT',
+}
+
 //任务详细配置
 export const personSchema: DescItem[] = [
   {
     field: 'jobGroup',
     label: '任务分组：',
     render: (_, data) => {
-      return data.jobGroup == 'Default' ? '默认' : data.jobGroup == 'System' ? '系统' : '报表';
+      return data.jobGroup == EJobGroup.DEFAULT
+        ? '默认'
+        : data.jobGroup == EJobGroup.SYSTEM
+        ? '系统'
+        : '报表';
     },
   },
   {
@@ -62,9 +73,9 @@ export const columnSchedue: BasicColumn[] = [
     dataIndex: 'jobGroup',
     width: 120,
     format: (_text: string, record: Recordable) => {
-      return record.jobGroup === 'Default'
+      return record.jobGroup === EJobGroup.DEFAULT
         ? '默认'
-        : record.jobGroup === 'System'
+        : record.jobGroup === EJobGroup.SYSTEM
         ? '系统'
         : '报表';
     },
@@ -121,15 +132,15 @@ export const searchSchedueFormSchema: FormSchema[] = [
       options: [
         {
           label: '默认',
-          value: 'Default',
+          value: EJobGroup.DEFAULT,
         },
         {
           label: '系统',
-          value: 'System',
+          value: EJobGroup.SYSTEM,
         },
         {
           label: '报表',
-          value: 'Report',
+          value: EJobGroup.REPORT,
         },
       ],
       placeholder: '请选择任务组名',
@@ -176,7 +187,11 @@ export const scheduleLogDetailSchema: DescItem[] = [
     field: 'jobGroup',
     label: '任务组名：',
     render: (_, data) => {
-      return data.jobGroup == 'Default' ? '默认' : data.jobGroup == 'System' ? '系统' : '报表';
+      return data.jobGroup == EJobGroup.DEFAULT
+        ? '默认'
+        : data.jobGroup == EJobGroup.SYSTEM
+        ? '系统'
+        : '报表';
     },
   },
   {
--- a/src/views/system/scheduled/config.form.data.ts
View file @5ec48e6
+++ b/src/views/system/scheduled/config.form.data.ts
View file @5ec48e6
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import type { FormSchema as QFormSchema } from '/@/components/Form/index';
 import { JCronValidator } from '/@/components/Form';
+import { EJobGroup } from './config.data';
 // 定时任务表格配置
 export const columnSchedue: BasicColumn[] = [
@@ -14,9 +15,9 @@ export const columnSchedue: BasicColumn[] = [
     dataIndex: 'jobGroup',
     width: 120,
     format: (_text: string, record: Recordable) => {
-      return record.jobGroup === 'Default'
+      return record.jobGroup === EJobGroup.DEFAULT
         ? '默认'
-        : record.jobGroup === 'System'
+        : record.jobGroup === EJobGroup.SYSTEM
         ? '系统'
         : '报表';
     },
@@ -60,15 +61,15 @@ export const searchSchedueFormSchema: FormSchema[] = [
       options: [
         {
           label: '默认',
-          value: 'Default',
+          value: EJobGroup.DEFAULT,
         },
         {
           label: '系统',
-          value: 'System',
+          value: EJobGroup.SYSTEM,
         },
         {
           label: '报表',
-          value: 'Report',
+          value: EJobGroup.REPORT,
         },
       ],
       placeholder: '请选择任务组名',
@@ -120,15 +121,15 @@ export const formSchema: QFormSchema[] = [
       options: [
         {
           label: '默认',
-          value: 'Default',
+          value: EJobGroup.DEFAULT,
         },
         {
           label: '系统',
-          value: 'System',
+          value: EJobGroup.SYSTEM,
         },
         {
           label: '报表',
-          value: 'Report',
+          value: EJobGroup.REPORT,
         },
       ],
     },