Merge branch 'ft_local_dev' into 'main'

fix:修改问题

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

@@ -7,8 +7,9 @@ import { useUserStoreWithOut } from '/@/store/modules/user';
 import projectSetting from '/@/settings/projectSetting';
 import projectSetting from '/@/settings/projectSetting';
 import { SessionTimeoutProcessingEnum } from '/@/enums/appEnum';
 import { SessionTimeoutProcessingEnum } from '/@/enums/appEnum';
 
 
-const { createMessage, createErrorModal } = useMessage();
+const { createMessage } = useMessage();
 const error = createMessage.error!;
 const error = createMessage.error!;
+const success = createMessage.success!;
 const stp = projectSetting.sessionTimeoutProcessing;
 const stp = projectSetting.sessionTimeoutProcessing;
 export function checkStatus(
 export function checkStatus(
   status: number,
   status: number,
@@ -18,7 +19,6 @@ export function checkStatus(
   const { t } = useI18n();
   const { t } = useI18n();
   const userStore = useUserStoreWithOut();
   const userStore = useUserStoreWithOut();
   let errMessage = msg;
   let errMessage = msg;
-  // console.log('mag11', msg);
   switch (status) {
   switch (status) {
     case 400:
     case 400:
       errMessage = `${msg}`;
       errMessage = `${msg}`;
@@ -70,7 +70,6 @@ export function checkStatus(
       break;
       break;
     default:
     default:
   }
   }
-
   if (errMessage) {
   if (errMessage) {
     if (errorMessageMode === 'message') {
     if (errorMessageMode === 'message') {
       error({ content: errMessage, key: `global_error_message_status_${status}` });
       error({ content: errMessage, key: `global_error_message_status_${status}` });
@@ -81,4 +80,7 @@ export function checkStatus(
     //   error({ content: errMessage, key: `global_error_message_status_${status}` });
     //   error({ content: errMessage, key: `global_error_message_status_${status}` });
     // }
     // }
   }
   }
+  if (errMessage == '密码重置成功，请自行通知用户！') {
+    success({ content: errMessage, key: `global_error_message_status_${status}` });
+  }
 }
 }

@@ -56,15 +56,15 @@
     });
     });
   });
   });
   const handleSuccess = async (opt) => {
   const handleSuccess = async (opt) => {
-    const res = await getScriptManageMeList();
-    selectOptions.value = res.map((m) => {
-      return {
-        label: m.name,
-        value: m.id,
-      };
-    });
     if (opt.text !== 'test') {
     if (opt.text !== 'test') {
       selectScript.script = opt?.res?.id;
       selectScript.script = opt?.res?.id;
+      const res = await getScriptManageMeList();
+      selectOptions.value = res.map((m) => {
+        return {
+          label: m.name,
+          value: m.id,
+        };
+      });
     }
     }
   };
   };
 
 

@@ -38,7 +38,7 @@
           <!-- 按钮 -->
           <!-- 按钮 -->
           <a-button type="primary" class="mt-4" @click="addTrigger" v-if="isView">
           <a-button type="primary" class="mt-4" @click="addTrigger" v-if="isView">
             <PlusOutlined />
             <PlusOutlined />
-            新增触发器
+            新增触发器<span style="visibility: hidden">发</span>
           </a-button>
           </a-button>
           <!-- 按钮 -->
           <!-- 按钮 -->
         </div>
         </div>
@@ -656,6 +656,12 @@
     try {
     try {
       setDrawerProps({ confirmLoading: true });
       setDrawerProps({ confirmLoading: true });
       getFormValueFunc();
       getFormValueFunc();
+      //新增的代码2022-11-22
+      if (unref(getTriggerFormValue).length === 0 && unref(getConditionFormValue).length === 0) {
+        createMessage.error('请添加触发器或者执行条件');
+        throw '请添加触发器或者执行条件';
+      }
+      //新增的代码2022-11-22
       const postAddOrEditData = {
       const postAddOrEditData = {
         ...basicFormValue,
         ...basicFormValue,
         triggers: !unref(getTriggerFormValue).length ? null : unref(getTriggerFormValue),
         triggers: !unref(getTriggerFormValue).length ? null : unref(getTriggerFormValue),

@@ -97,7 +97,7 @@
 
 
   //ft add 表单数据置空
   //ft add 表单数据置空
   const resetConditionScreenForm = () => {
   const resetConditionScreenForm = () => {
-    // conditionScreeningList.value = [];
+    conditionScreeningList.value = [];
     resetFilter();
     resetFilter();
     for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
     for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
       unref(refItem.conditionScreeningRefs)[i]?.resetConditionScreenForm();
       unref(refItem.conditionScreeningRefs)[i]?.resetConditionScreenForm();
@@ -121,3 +121,12 @@
     resetConditionScreenForm,
     resetConditionScreenForm,
   });
   });
 </script>
 </script>
+
+<style lang="less" scoped>
+  :deep(.vben-collapse-container__header) {
+    overflow: hidden !important;
+    overflow-y: scroll !important;
+    white-space: pre !important;
+    height: 93px !important;
+  }
+</style>

 <template>
 <template>
   <div
   <div
+    style="width: 100%; flex-wrap: wrap"
     v-if="otherAttribute.length > 0 && otherAttribute[0].value && otherAttribute[0].operation"
     v-if="otherAttribute.length > 0 && otherAttribute[0].value && otherAttribute[0].operation"
     class="flex"
     class="flex"
   >
   >

@@ -231,9 +231,12 @@
     //TODO-fengtao-清除告警验证
     //TODO-fengtao-清除告警验证
     //TODO-fengtao-设备验证
     //TODO-fengtao-设备验证
     const validate = getFieldsValue();
     const validate = getFieldsValue();
-    if (validate.device == 'PART') {
+    //ft-add-2022-11-22
+    const type = validate?.outTarget;
+    if (type === 'DEVICE_OUT' && validate.device == 'PART') {
       if (validate.deviceId == undefined) return createMessage.error('请选择设备');
       if (validate.deviceId == undefined) return createMessage.error('请选择设备');
     }
     }
+    //ft-add-2022-11-22
     //TODO-fengtao-设备验证
     //TODO-fengtao-设备验证
     return {
     return {
       ...getFieldsValue(),
       ...getFieldsValue(),