xieyonghong пре 3 година
родитељ
комит
b8efb9ad2a

+ 6 - 1
src/pages/rule-engine/Alarm/Configuration/Save/index.tsx

@@ -246,7 +246,12 @@ const Save = (props: Props) => {
               style={{ padding: 0 }}
               isPermission={permission.add}
               onClick={() => {
-                const tab: any = window.open(`${origin}/#/iot/rule-engine/scene/Save`);
+                const targetType = form.values.targetType;
+                let queryStr = '';
+                if (targetType && targetType !== 'other') {
+                  queryStr = '?targetType=device';
+                }
+                const tab: any = window.open(`${origin}/#/iot/rule-engine/scene/Save${queryStr}`);
                 tab!.onTabSaveSuccess = (value: any) => {
                   form.setFieldState('sceneId', async (state) => {
                     state.dataSource = await getScene();

+ 8 - 1
src/pages/rule-engine/Scene/Save/index.tsx

@@ -46,6 +46,7 @@ export default () => {
   const [loading, setLoading] = useState(false);
   const [parallel, setParallel] = useState(true); // 是否并行
   const [shakeLimit, setShakeLimit] = useState<ShakeLimitType>(DefaultShakeLimit);
+  const [targetTypeDisabled, setTargetTypeDisabled] = useState(false);
 
   const [requestParams, setRequestParams] = useState<any>(undefined);
   const [triggerValue, setTriggerValue] = useState<any>([]);
@@ -95,9 +96,15 @@ export default () => {
   useEffect(() => {
     const params = new URLSearchParams(location.search);
     const id = params.get('id');
+    const targetType = params.get('targetType');
     if (id) {
       getDetail(id);
     }
+
+    if (targetType) {
+      setTargetTypeDisabled(true);
+    }
+
     if (location && location.state) {
       setView(location.state.view);
     }
@@ -291,7 +298,7 @@ export default () => {
                   rules={[{ required: true, message: '请选择触发方式' }]}
                   initialValue={'device'}
                 >
-                  <TriggerWay onSelect={setTriggerType} disabled={isEdit} />
+                  <TriggerWay onSelect={setTriggerType} disabled={isEdit || targetTypeDisabled} />
                 </Form.Item>
                 {triggerType === TriggerWayType.timing && (
                   <TimingTrigger