Merge remote-tracking branch 'origin/ft-dev'

# Conflicts:
#	src/views/dashboard/workbench/components/VisitAnalysis.vue
#	src/views/dashboard/workbench/components/VisitAnalysisBar.vue

@@ -244,7 +244,7 @@
 </script>
 <style scoped lang="less">
   .change-avatar {
-    /deep/ .ant-upload-select-picture-card {
+    :deep .ant-upload-select-picture-card {
       display: inherit;
       float: none;
       width: 8.6vw;

@@ -4,8 +4,6 @@ import { mainOutRoutes } from './mainOut';
 import { PageEnum } from '/@/enums/pageEnum';
 import { t } from '/@/hooks/web/useI18n';
 import { LAYOUT } from '../constant';
-import { getMenuList } from '/@/api/sys/menu';
-import { router } from '/@/router';
 
 const modules = import.meta.globEager('./modules/**/*.ts');
 const routeModuleList: AppRouteModule[] = [];
@@ -14,40 +12,6 @@ Object.keys(modules).forEach((key) => {
   const modList = Array.isArray(mod) ? [...mod] : [mod];
   routeModuleList.push(...modList);
 });
-let pushPath = '';
-let pushSubPath = '';
-
-async function hashChangeFunc() {
-  const getMenuListData1 = window.localStorage.getItem('menuListStorage') || (await getMenuList());
-  const getMenuListData = JSON.parse(getMenuListData1);
-  const getHomePage = getMenuListData.find((f) => {
-    return f.path == '/dashboard/workbench';
-  });
-  if (getHomePage?.path == '/dashboard/workbench') {
-    setTimeout(() => {
-      router.push('/dashboard/workbench');
-    }, 200);
-  } else {
-    const routeF = getMenuListData[0]?.children[0]?.path || getMenuListData[0].path;
-    pushPath = routeF;
-    pushSubPath = pushPath.substring(1);
-  }
-}
-hashChangeFunc();
-
-window.onhashchange = (e) => {
-  console.log(e);
-  setTimeout(() => {
-    if (
-      e.newURL == 'http://localhost:8083/#/' ||
-      e.newURL == 'http://localhost:8083/#' ||
-      e.newURL == 'http://localhost:8083/' ||
-      e.newURL == 'http://localhost:8083'
-    ) {
-      window.location.href = e.newURL + pushSubPath;
-    }
-  }, 1000);
-};
 
 export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, ...routeModuleList];
 export const RootRoute: AppRouteRecordRaw = {

@@ -122,7 +122,6 @@ const transform: AxiosTransform = {
     const err: string = error?.toString?.() ?? '';
     let errMessage = '';
     try {
-      console.log(response.data);
       if (response.data.status == '401' || response.data.message == '"Authentication failed"') {
         window.localStorage.clear();
         window.sessionStorage.clear();

@@ -153,7 +153,6 @@
       }
       function handleStep2Next(v) {
         current.value++;
-
         getStepTwoData.value = v;
         if (unref(isUpdate)) {
           proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormFunc({
@@ -162,7 +161,7 @@
           proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormHighSettingmFunc({
             propagate: editEchoData.value.profileData.alarms[0].propagate,
             propagateRelationTypes:
-              editEchoData.value.profileData?.alarms[0].propagateRelationTypes,
+              editEchoData.value.profileData?.alarms[0].propagateRelationTypes[0],
           });
           const getKey = Object.keys(editEchoData.value.profileData?.alarms[0].createRules);
           proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormCreateAlarmFunc({
@@ -212,13 +211,11 @@
             `
           );
           proxy.$refs.DeviceProfileStep3Ref.retryEnableFormDataFunc(`始终启用`);
-          proxy.$refs.DeviceProfileStep3Ref.retryTemplateFormDataFunc(
-            `
-           报警详细信息:${
-             editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails
-           }
-           `
-          );
+          proxy.$refs.DeviceProfileStep3Ref.setRegisterFormChangeDetailFunc({
+            alarmDetails:
+              editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,
+          });
+
           //清除报警
           proxy.$refs.DeviceProfileStep3Ref.retryRulesClearFormDataFunc(
             `
@@ -226,21 +223,23 @@
             `
           );
           proxy.$refs.DeviceProfileStep3Ref.retryEnableClearFormDataFunc(`始终启用`);
-          proxy.$refs.DeviceProfileStep3Ref.retryTemplateClearFormDataFunc(
-            `
-           报警详细信息:${editEchoData.value.profileData?.alarms[0].clearRule.alarmDetails}
-           `
-          );
+          proxy.$refs.DeviceProfileStep3Ref.setRegisterFormClearChangeDetailFunc({
+            alarmDetails: editEchoData.value.profileData?.alarms[0].clearRule.alarmDetails,
+          });
         } else {
-          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormHighSettingmFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormCreateAlarmFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetRulesFormDataFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetEnableFormDataFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetTemplateFormDataFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetRulesClearFormDataFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetEnableClearFormDataFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetTemplateClearFormDataFunc();
+          try {
+            proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormHighSettingmFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormCreateAlarmFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetRulesFormDataFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetEnableFormDataFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetTemplateFormDataFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetRulesClearFormDataFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetEnableClearFormDataFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetTemplateClearFormDataFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormChangeDetailFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormClearChangeDetailFunc();
+          } catch (e) {}
         }
       }
       function handleStep3Next(v) {
@@ -248,16 +247,23 @@
         getStepThreeData.value = v;
         try {
           if (unref(isUpdate)) {
-            setTimeout(() => {
-              try {
-                proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({
-                  alarmContactId: editEchoData.value.alarmProfile.alarmContactId,
-                  messageMode: editEchoData.value.alarmProfile.messageMode,
-                });
-              } catch (e) {
-                return e;
-              }
-            }, 1000);
+            try {
+              proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({
+                alarmContactId: editEchoData.value.alarmProfile.alarmContactId,
+                messageMode: editEchoData.value.alarmProfile.messageMode,
+              });
+            } catch (e) {
+              return e;
+            }
+          } else {
+            try {
+              proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({
+                alarmContactId: '',
+                messageMode: '',
+              });
+            } catch (e) {
+              return e;
+            }
           }
         } catch (e) {
           return e;
@@ -302,7 +308,7 @@
         }
       };
       const handleCancel = () => {
-        return;
+        closeModal();
       };
       return {
         handleChange,

@@ -10,7 +10,7 @@
     components: { BasicForm },
     setup() {
       const getValueData: any = ref({});
-      const [register, { setProps, getFieldsValue }] = useForm({
+      const [register, { getFieldsValue, resetFields }] = useForm({
         schemas: alertContactsSchemas,
         actionColOptions: {
           span: 24,
@@ -22,10 +22,13 @@
         getV = getValueData.value;
         return getV;
       }
+      const customResetStep4AndFunc = () => {
+        resetFields();
+      };
       return {
+        customResetStep4AndFunc,
         getAllFields,
         register,
-        setProps,
       };
     },
   });

 <template>
   <div>
     <BasicModal
-      :showCancelBtn="true"
+      :showCancelBtn="false"
       :showOkBtn="false"
       v-bind="$attrs"
       width="55rem"
@@ -315,7 +315,7 @@
                   setRegisterStep3HighSetting({
                     propagate: descInfo.value.profileData?.alarms[0]?.propagate,
                     propagateRelationTypes:
-                      descInfo.value.profileData?.alarms[0]?.propagateRelationTypes,
+                      descInfo.value.profileData?.alarms[0]?.propagateRelationTypes[0],
                   });
                   const getKey = Object.keys(descInfo.value.profileData?.alarms[0]?.createRules);
                   setRegisterStep3CreateAlarm({
@@ -486,13 +486,13 @@
 
 <style scoped lang="less">
   .input-style {
-    /deep/ .ant-form-item-control-input {
+    :deep .ant-form-item-control-input {
       position: relative;
       display: flex;
       align-items: center;
       min-height: 02px;
     }
-    /deep/.ant-col-24 {
+    :deep.ant-col-24 {
       display: block;
       flex: 0 0 100%;
       max-width: 100%;
@@ -501,13 +501,13 @@
   }
 
   .clear-input-style {
-    /deep/ .ant-form-item-control-input {
+    :deep .ant-form-item-control-input {
       position: relative;
       display: flex;
       align-items: center;
       min-height: 02px;
     }
-    /deep/.ant-col-24 {
+    :deep.ant-col-24 {
       display: block;
       flex: 0 0 100%;
       max-width: 100%;

@@ -19,7 +19,7 @@
           :actions="[
             {
               label: '详情',
-              icon: 'clarity:note-edit-line',
+              icon: 'ant-design:eye-outlined',
               onClick: handleDetailView.bind(null, record),
             },
             {
@@ -29,7 +29,7 @@
             },
             {
               label: '导出',
-              icon: 'clarity:note-edit-line',
+              icon: 'ant-design:login-outlined',
               onClick: handleExport.bind(null, record),
             },
             {

@@ -42,7 +42,9 @@
           </Upload>
         </div>
       </div>
-      <BasicForm @register="register" />
+      <div style="margin-top: -50px">
+        <BasicForm @register="register" />
+      </div>
     </div>
   </div>
 </template>
@@ -167,7 +169,7 @@
       color: @text-color;
     }
     .device-icon-style {
-      /deep/ .ant-upload-select-picture-card {
+      :deep .ant-upload-select-picture-card {
         display: inherit;
         float: none;
         width: 8.6vw;

@@ -47,7 +47,9 @@
         try {
           const values = await validate();
           emit('next', values);
-        } catch (error) {}
+        } catch (error) {
+        } finally {
+        }
       }
       return { register, resetFieldsFunc, customResetAndFunc };
     },

 <template>
-  <div class="step3">
+  <div class="step3" style="background-color: #f6f8f9">
     <template v-for="(item, index) in profileData" :key="item.id">
       <CollapseContainer class="border mb-1" :canExpan="false">
         <template #action>
@@ -8,110 +8,125 @@
               style="cursor: pointer"
               @click="deleteAlarmRule(index)"
               alt="移除"
-              src="../../../../assets/images/close.png"
+              src="../../../../assets/images/shanchu.png"
             />
           </div>
         </template>
-        <div class="alert-type" style="margin-left: -26px; margin-top: -10px">
-          <BasicForm @register="registerForm"
-        /></div>
-        <div style="margin-top: -20px">
-          <div style="margin-left: 20px; margin-top: -10px">
-            <BasicForm
-              @register="registerFormHighSetting"
-              style="margin-left: 12px; margin-top: -10px"
-            >
-              <template #checkBox="{ model, field }">
-                <Checkbox v-model:checked="model[field]">传递报警</Checkbox>
-              </template>
-            </BasicForm>
+        <div style="margin-top: -15px; margin-left: 10px">
+          <div class="alert-type" style="margin-left: -50px; margin-top: -10px">
+            <BasicForm @register="registerForm"
+          /></div>
+          <div style="margin-top: -15px">
+            <div style="margin-left: -8px; margin-top: -10px">
+              <BasicForm
+                @register="registerFormHighSetting"
+                style="margin-left: 12px; margin-top: -10px"
+              >
+                <template #checkBox="{ model, field }">
+                  <Checkbox v-model:checked="model[field]">传递报警</Checkbox>
+                </template>
+              </BasicForm>
+            </div>
           </div>
         </div>
-        <p>创建报警规则</p>
-        <template v-for="(childItem, createIndex) in item.alarms" :key="childItem.id">
-          <div class="aic" style="border: 1px solid #bfbfbf">
-            <div class="w-3/4">
-              <div style="margin-left: -33px; margin-top: 20px"
-                ><BasicForm @register="registerFormCreateAlarm" />
-              </div>
-              <div style="margin-left: 5px; margin-top: -50px">
-                <div style="color: #f5594e" class="ml-4"
-                  >报警规则条件：
-                  <Button size="small" type="primary" @click="handleOpenAlaramRuleConditions"
-                    >添加</Button
-                  >
-                  <p>{{ ruleTemplateData }}</p>
+        <div style="margin-top: -57px">
+          <p style="margin-left: 10px">创建报警规则</p>
+          <template v-for="(childItem, createIndex) in item.alarms" :key="childItem.id">
+            <div class="aic" style="border: 1px solid #bfbfbf">
+              <div class="w-3/4" style="margin-left: 40px">
+                <div style="margin-left: -33px; margin-top: 20px"
+                  ><BasicForm @register="registerFormCreateAlarm" />
                 </div>
-                <div style="white-space: wrap" class="mt-4 ml-4"
-                  >启用规则：
-                  <Button size="small" type="primary" @click="handleOpenEnableRule">添加</Button>
-                  <p>{{ enableTemplateData }}</p>
-                  <div class="mt-4 ml-4" style="margin-left: 0px"
-                    >详情模板：
-                    <Button size="small" type="primary" @click="handleOpenDetailTemplate"
+                <div style="margin-left: 5px; margin-top: -50px">
+                  <div style="color: #f5594e" class="ml-4"
+                    >报警规则条件：
+                    <Button size="small" type="primary" @click="handleOpenAlaramRuleConditions"
                       >添加</Button
                     >
-                    <p>{{ detailTemplateData }}</p>
+                    <p>{{ ruleTemplateData }}</p>
                   </div>
-                  <div style="margin-left: 0px; position: relative">
-                    <BasicForm @register="dashboardForm" />
+                  <div style="white-space: wrap; margin-top: 25px" class="mt-4 ml-4"
+                    >启用规则：
+                    <Button size="small" type="primary" @click="handleOpenEnableRule">添加</Button>
+                    <p>{{ enableTemplateData }}</p>
+                    <div
+                      class="mt-4 ml-4"
+                      style="margin-left: 0px; position: relative; margin-top: 25px"
+                      >详情模板：
+                      <div style="position: absolute; top: -5px; left: 80px; width: 571px">
+                        <BasicForm @register="registerFormChangeDetail" />
+                      </div>
+                      <!-- <Button size="small" type="primary" @click="handleOpenDetailTemplate"
+                        >添加</Button
+                      > -->
+                    </div>
+                    <div style="margin-left: 0px; margin-top: 25px; position: relative">
+                      <BasicForm @register="dashboardForm" />
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                class="remove-type"
-                style="display: inline-block; position: relative; top: -237px; left: 800px"
-              >
-                <img
-                  style="cursor: pointer"
-                  @click="deleteCondition(index, createIndex)"
-                  alt="移除"
-                  src="../../../../assets/images/close.png"
-                />
+                <div
+                  class="remove-type"
+                  style="display: inline-block; position: relative; top: -257px; left: 757px"
+                >
+                  <img
+                    style="cursor: pointer"
+                    @click="deleteCondition(index, createIndex)"
+                    alt="移除"
+                    src="../../../../assets/images/close.png"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </template>
-        <a-button style="border-radius: 10px" class="mt-5" @click="addCreateRole(index)"
-          ><PlusCircleOutlined />添加创建条件</a-button
-        >
+          </template>
+          <a-button style="border-radius: 10px" class="mt-5" @click="addCreateRole(index)"
+            ><PlusCircleOutlined />添加创建条件</a-button
+          >
+        </div>
         <div style="height: 20px"></div>
-        <p>清除报警规则</p>
-        <template
-          v-for="(childClearItem, clearIndexItem) in item.clearRule"
-          :key="childClearItem.id"
-        >
-          <div class="aic mb-1" style="border: 1px solid #bfbfbf">
-            <div class="w-3/4">
-              <div style="margin-left: 5px">
-                <div style="color: #f5594e" class="mt-4 ml-4"
-                  >报警规则条件：
-                  <Button size="small" type="primary" @click="handleOpenClearAlaramRuleConditions"
-                    >添加</Button
-                  >
-                  <p>{{ ruleClearTemplateData }}</p>
-                </div>
-                <div style="white-space: wrap" class="mt-4 ml-4"
-                  >启用规则：
-                  <Button size="small" type="primary" @click="handleOpenClearEnableRule"
-                    >添加</Button
-                  >
-                  <p>{{ enableClearTemplateData }}</p>
-                  <div class="mt-4 ml-4" style="margin-left: 0px"
-                    >详情模板：
-                    <Button size="small" type="primary" @click="handleOpenClearDetailTemplate"
+        <div>
+          <p style="margin-left: 10px">清除报警规则</p>
+          <template
+            v-for="(childClearItem, clearIndexItem) in item.clearRule"
+            :key="childClearItem.id"
+          >
+            <div class="aic mb-1" style="border: 1px solid #bfbfbf">
+              <div class="w-3/4" style="margin-left: 40px">
+                <div style="margin-left: 5px">
+                  <div style="color: #f5594e" class="mt-4 ml-4"
+                    >报警规则条件：
+                    <Button size="small" type="primary" @click="handleOpenClearAlaramRuleConditions"
                       >添加</Button
                     >
-                    <p>{{ detailClearTemplateData }}</p>
+                    <p>{{ ruleClearTemplateData }}</p>
                   </div>
-                  <div style="margin-left: 0px">
-                    <BasicForm @register="dashboardForm" />
+                  <div style="white-space: wrap; margin-top: 25px" class="mt-4 ml-4"
+                    >启用规则：
+                    <Button size="small" type="primary" @click="handleOpenClearEnableRule"
+                      >添加</Button
+                    >
+                    <p>{{ enableClearTemplateData }}</p>
+                    <div
+                      class="mt-4 ml-4"
+                      style="margin-left: 0px; position: relative; margin-top: 25px"
+                      >详情模板：
+                      <div style="position: absolute; top: -5px; left: 80px; width: 571px">
+                        <BasicForm @register="registerFormChangeClearDetail" />
+                      </div>
+                      <!-- <Button size="small" type="primary" @click="handleOpenClearDetailTemplate"
+                        >添加</Button
+                      >
+                      <p>{{ detailClearTemplateData }}</p> -->
+                    </div>
+                    <div style="margin-left: 0px; margin-top: 25px">
+                      <BasicForm @register="dashboardForm" />
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
-        </template>
+          </template>
+        </div>
       </CollapseContainer>
     </template>
   </div>
@@ -179,6 +194,7 @@
     step3CreateAlarm,
     dashboardFormScheme,
     isWhereType,
+    formChangeDetailSchema,
   } from './data';
   import { PlusCircleOutlined } from '@ant-design/icons-vue';
   import { Checkbox } from 'ant-design-vue';
@@ -202,6 +218,9 @@
     },
     emits: ['prev', 'next', 'redo', 'handleFormStep3toStep4Next'],
     setup(_, { emit }) {
+      const changeGetDetailValue: any = ref(null);
+      const changeGetClearDetailValue: any = ref(null);
+      const ruleNumber = ref(0);
       const { proxy } = getCurrentInstance();
       const getChildData1 = ref(null);
       const getChildData2 = ref(null);
@@ -241,6 +260,7 @@
       };
       //删除告警配置
       const deleteAlarmRule = (index: number) => {
+        ruleNumber.value--;
         unref(profileData).splice(index, 1);
       };
       // 上一步
@@ -249,6 +269,7 @@
       };
       //添加报警规则
       const addAlarmRule = () => {
+        ruleNumber.value++;
         clearIndex.value++;
         unref(profileData).push({
           configuration: {
@@ -326,6 +347,40 @@
           span: 24,
         },
       });
+      //详情模板
+      const [
+        registerFormChangeDetail,
+        {
+          getFieldsValue: getRegisterFormChangeDetail,
+          setFieldsValue: setRegisterFormChangeDetail,
+          resetFields: resetRegisterFormChangeDetail,
+        },
+      ] = useForm({
+        labelWidth: 120,
+        schemas: formChangeDetailSchema,
+        showResetButton: false,
+        showSubmitButton: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      //清除详情模板
+      const [
+        registerFormChangeClearDetail,
+        {
+          getFieldsValue: getRegisterFormClearChangeDetail,
+          setFieldsValue: setRegisterFormClearChangeDetail,
+          resetFields: resetRegisterFormClearChangeDetail,
+        },
+      ] = useForm({
+        labelWidth: 120,
+        schemas: formChangeDetailSchema,
+        showResetButton: false,
+        showSubmitButton: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
       // 添加创建条件表单
       const [
         registerFormCreateAlarm,
@@ -372,6 +427,14 @@
       const resetTemplateClearFormDataFunc = () => {
         detailClearTemplateData.value = ``;
       };
+      //修改详情模板
+      const resetRegisterFormChangeDetailFunc = () => {
+        resetRegisterFormChangeDetail();
+      };
+      //清除修改详情模板
+      const resetRegisterFormClearChangeDetailFunc = () => {
+        resetRegisterFormClearChangeDetail();
+      };
 
       //回显表单数据
       const retryRegisterFormFunc = (v) => {
@@ -401,6 +464,14 @@
       const retryTemplateClearFormDataFunc = (v) => {
         detailClearTemplateData.value = v;
       };
+      //修改详情模板
+      const setRegisterFormChangeDetailFunc = (v) => {
+        setRegisterFormChangeDetail(v);
+      };
+      //清除修改详情模板
+      const setRegisterFormClearChangeDetailFunc = (v) => {
+        setRegisterFormClearChangeDetail(v);
+      };
 
       const tempValue1: string = ref<string>('');
       // 添加‘创建条件’
@@ -486,6 +557,7 @@
           // isWhereTypeValueDisabled.value = false;
         }
       });
+
       //详情模板
       const getAllFieldsFunc = (v) => {
         detailObj.value = v;
@@ -764,17 +836,17 @@
       }
       const handleFormStep3toStep4Next = async () => {
         try {
+          changeGetDetailValue.value = getRegisterFormChangeDetail();
+          changeGetClearDetailValue.value = getRegisterFormClearChangeDetail();
           if (enableObj.value.schedule == 'CUSTOM') {
-            for (let i in enableObj.value) {
-              console.log(enableObj.value[i]);
-              console.log(i);
-              // let o = {};
-              // if(enableObj.value[i]=='1')
-              // o[i] = enableObj.value[i];
-              // getSchduleCustomValue.value.push(o);
-              // getSchduleCustomValue.value.push(enableObj.value[i]);
-            }
-            console.log(getSchduleCustomValue.value);
+            // for (let i in enableObj.value) {
+            //   console.log(i);
+            //   // let o = {};
+            //   // if(enableObj.value[i]=='1')
+            //   // o[i] = enableObj.value[i];
+            //   // getSchduleCustomValue.value.push(o);
+            //   // getSchduleCustomValue.value.push(enableObj.value[i]);
+            // }
             // switch (enableObj.value.daysOfWeek1[0]) {
             //   case '1':
             //     getSchduleCustomValue.value.push({
@@ -854,7 +926,11 @@
                 ? scheduleCustomClearValue.value
                 : scheduleClearValue,
           };
-          const getClearAdditionalProp = Object.assign({}, detailClearObj.value, getClearSchedule);
+          const getClearAdditionalProp = Object.assign(
+            {},
+            changeGetClearDetailValue.value,
+            getClearSchedule
+          );
           const scheduleValue = {
             type: enableObj.value.schedule,
             daysOfWeek: enableObj.value.daysOfWeek,
@@ -867,7 +943,7 @@
               enableObj.value.schedule == 'CUSTOM' ? scheduleCustomValue.value : scheduleValue,
           };
 
-          const getAdditionalProp = Object.assign({}, detailObj.value, getSchedule);
+          const getAdditionalProp = Object.assign({}, changeGetDetailValue.value, getSchedule);
           const getScheduleAndAlarmDetails = Object.assign(
             {},
             getAdditionalProp,
@@ -930,14 +1006,18 @@
         isRuleAlarmRuleConditions.value = 1;
         setTimeout(() => {
           openModal1(true);
-          proxy.$refs.getChildData1.resetDataFunc();
+          setTimeout(() => {
+            proxy.$refs.getChildData1.resetDataFunc();
+          }, 1000);
         }, 50);
       };
       const handleOpenEnableRule = () => {
         isRuleAlarmRuleConditions.value = 2;
         setTimeout(() => {
           openModal2(true);
-          proxy.$refs.getChildData2.resetDataFunc();
+          setTimeout(() => {
+            proxy.$refs.getChildData2.resetDataFunc();
+          }, 1000);
         }, 50);
       };
       const handleOpenAlaramRuleConditions = () => {
@@ -945,39 +1025,54 @@
         setTimeout(() => {
           openModal3(true);
           try {
-            proxy.$refs.getChildData3.resetDataFunc();
+            setTimeout(() => {
+              proxy.$refs.getChildData3.resetDataFunc();
+            }, 1000);
           } catch (e) {
             return e;
           }
-        }, 100);
+        }, 500);
       };
       const handleOpenClearDetailTemplate = () => {
         isRuleAlarmRuleConditions.value = 4;
         setTimeout(() => {
           openModal4(true);
           try {
-            proxy.$refs.getChildData1.resetDataFunc();
+            setTimeout(() => {
+              proxy.$refs.getChildData1.resetDataFunc();
+            }, 1000);
           } catch (e) {
             return e;
           }
-        }, 50);
+        }, 500);
       };
       const handleOpenClearEnableRule = () => {
         isRuleAlarmRuleConditions.value = 5;
         setTimeout(() => {
           openModal5(true);
-          proxy.$refs.getChildData2.resetDataFunc();
+          setTimeout(() => {
+            proxy.$refs.getChildData2.resetDataFunc();
+          }, 1000);
         }, 50);
       };
       const handleOpenClearAlaramRuleConditions = () => {
         isRuleAlarmRuleConditions.value = 6;
         setTimeout(() => {
           openModal6(true);
-          proxy.$refs.getChildData3.resetDataFunc();
+          setTimeout(() => {
+            proxy.$refs.getChildData3.resetDataFunc();
+          }, 1000);
         }, 50);
       };
 
       return {
+        resetRegisterFormChangeDetailFunc,
+        resetRegisterFormClearChangeDetailFunc,
+        setRegisterFormClearChangeDetailFunc,
+        setRegisterFormChangeDetailFunc,
+        registerFormChangeClearDetail,
+        registerFormChangeDetail,
+        ruleNumber,
         resetEnableClearFormDataFunc,
         resetTemplateClearFormDataFunc,
         resetRulesClearFormDataFunc,
@@ -1046,6 +1141,8 @@
 <style lang="less" scoped>
   .step3 {
     width: 100%;
+    background-color: #f6f8f9;
+    z-index: 1;
   }
   .border {
     border: 1px solid #bfbfbf;

@@ -31,8 +31,8 @@
       const resetFieldsFunc = (v) => {
         setFieldsValue(v);
       };
-      const customResetAndFunc = async () => {
-        await resetFields();
+      const customResetAndFunc = () => {
+        resetFields();
       };
       async function customResetFunc() {
         emit('prev');
@@ -56,7 +56,7 @@
 </script>
 <style lang="less" scoped>
   .step-4 {
-    /deep/ .ant-btn {
+    :deep .ant-btn {
       position: relative;
       right: 375px;
       top: 18px;

@@ -221,7 +221,7 @@
   });
 </script>
 <style lang="less" scoped>
-  /deep/ .ant-table-body {
+  :deep.ant-table-body {
     overflow-y: auto !important;
     min-height: 173px !important;
     height: 100px !important;

@@ -98,6 +98,7 @@ export const step3Schemas: FormSchema[] = [
   {
     field: 'alarmType',
     component: 'Input',
+    required: true,
     label: '报警类型',
     colProps: {
       span: 12,
@@ -106,19 +107,6 @@ export const step3Schemas: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入报警类型',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];
 
@@ -127,7 +115,6 @@ export const step3ViewHighSetting: FormSchema[] = [
     field: 'propagate',
     component: 'Checkbox',
     label: '传递报警',
-    // renderComponentContent: '忽略大小写',
   },
   {
     field: 'propagateRelationTypes',
@@ -161,19 +148,6 @@ export const step3HighSetting: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入关联类型',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
     ifShow: ({ values }) => !!values.propagate,
   },
 ];
@@ -275,3 +249,17 @@ export const alertContactsSchemas: FormSchema[] = [
     },
   },
 ];
+
+export const formChangeDetailSchema: FormSchema[] = [
+  {
+    field: 'alarmDetails',
+    label: '',
+    colProps: { span: 13 },
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入报警详细信息',
+    },
+  },
+];

@@ -227,19 +227,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入消息配置',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'id',
@@ -270,19 +257,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入备注',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
 
     component: 'InputTextArea',
   },

@@ -3,6 +3,8 @@ import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { useI18n } from '/@/hooks/web/useI18n';
+import { phoneRule } from '/@/utils/rules';
+
 const { t } = useI18n();
 export const columns: BasicColumn[] = [
   {
@@ -52,6 +54,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '发送手机',
     component: 'Input',
     colProps: { span: 6 },
+    rules: phoneRule,
     componentProps: {
       maxLength: 36,
     },

@@ -44,6 +44,7 @@
 
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input, Button },
+    // eslint-disable-next-line vue/require-prop-types
     props: ['deviceInfo1'],
     setup(props) {
       const getValueData: any = ref({});
@@ -66,7 +67,9 @@
       });
       let isJudge = ref(1);
       if (isJudge.value == 1) {
-        resetFields();
+        setTimeout(() => {
+          resetFields();
+        }, 1000);
       }
       watch(
         () => props.deviceInfo1,

@@ -44,6 +44,7 @@
 
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input, Button },
+    // eslint-disable-next-line vue/require-prop-types
     props: ['deviceInfo2'],
     setup(props) {
       const addHideButton = ref(1);
@@ -66,7 +67,9 @@
       });
       let isJudge = ref(1);
       if (isJudge.value == 1) {
-        resetFields();
+        setTimeout(() => {
+          resetFields();
+        }, 1000);
       }
       watch(
         () => props.deviceInfo2,
@@ -432,5 +435,6 @@
     display: inline-block;
     position: relative;
     top: 33px;
+    left: 5px;
   }
 </style>

+/* eslint-disable vue/require-prop-types */
 <template>
   <div>
     <CollapseContainer title="触发器" style="background-color: #eeeeee">
@@ -56,6 +57,7 @@
 
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input, Button },
+    // eslint-disable-next-line vue/require-prop-types
     props: ['deviceInfo'],
     setup(props) {
       const getValueData: any = ref({});
@@ -79,7 +81,9 @@
       });
       let isJudge = ref(1);
       if (isJudge.value == 1) {
-        resetFields();
+        setTimeout(() => {
+          resetFields();
+        }, 1000);
       }
       watch(
         () => props.deviceInfo,

 <template>
   <div>
     <BasicTable
-      :rowSelection="{ type: 'checkbox' }"
-      @selection-change="useSelectionChange"
       @register="registerTable"
+      @selection-change="useSelectionChange"
+      :rowSelection="{ type: 'checkbox' }"
     >
       <template #toolbar>
         <a-button type="primary" @click="handleAdd"> 新增场景联动 </a-button>
-        <a-button type="error" @click="handleToolbarDel"> 删除 </a-button>
+        <a-button
+          style="background-color: rgba(237, 111, 111, 1)"
+          type="default"
+          @click="handleToolbarDel"
+        >
+          <span style="color: white">删除</span>
+        </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -49,13 +55,14 @@
   export default defineComponent({
     name: 'Index',
     components: { BasicTable, SceneLinkAgeDrawer, TableAction },
+    emits: ['default', 'registerTable', 'registerDrawer', 'register'],
     setup() {
       let selectedRowKeys: Array<string> = [];
       let echoEditData = reactive({});
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
       const [registerTable, { reload, getSelectRowKeys }] = useTable({
-        title: '',
+        title: '场景联动列表',
         clickToRowSelect: false,
         api: screenLinkPageGetApi,
         columns,
@@ -63,9 +70,6 @@
           labelWidth: 120,
           schemas: searchFormSchema,
         },
-        filterFn: (registerTable) => {
-          return registerTable;
-        },
         rowKey: 'id',
         useSearchForm: true,
         showTableSetting: true,
@@ -126,3 +130,5 @@
     },
   });
 </script>
+
+<style lang="less" scoped></style>

@@ -8,9 +8,15 @@
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm" />
-    <AddTriggerForm ref="getTriggerChildData" :deviceInfo="getDeviceInfo" />
-    <AddConditiForm ref="getConditionChildData" :deviceInfo1="getDeviceInfo1" />
-    <AddActionForm ref="getChildData" :deviceInfo2="getDeviceInfo2" />
+    <div>
+      <AddTriggerForm ref="getTriggerChildData" :deviceInfo="getDeviceInfo" />
+    </div>
+    <div>
+      <AddConditiForm ref="getConditionChildData" :deviceInfo1="getDeviceInfo1" />
+    </div>
+    <div>
+      <AddActionForm ref="getChildData" :deviceInfo2="getDeviceInfo2" />
+    </div>
   </BasicDrawer>
 </template>
 <script lang="ts">
@@ -31,7 +37,7 @@
   export default defineComponent({
     name: 'ConfigDrawer',
     components: { BasicDrawer, BasicForm, AddTriggerForm, AddActionForm, AddConditiForm },
-    emits: ['success', 'register'],
+    emits: ['success', 'register', 'registerForm'],
     setup(_, { emit }) {
       const { proxy } = getCurrentInstance();
       const getChildData = ref(null);
@@ -49,14 +55,12 @@
       let getDeviceInfo1 = ref(null);
       let getDeviceInfo2 = ref(null);
 
-      const [
-        registerForm,
-        { resetFields, setFieldsValue, validateFields, getFieldsValue, updateSchema },
-      ] = useForm({
-        labelWidth: 120,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-      });
+      const [registerForm, { resetFields, setFieldsValue, validateFields, getFieldsValue }] =
+        useForm({
+          labelWidth: 120,
+          schemas: formSchema,
+          showActionButtonGroup: false,
+        });
 
       watch(getData, (newV) => {
         getDeviceInfo.value = newV;
@@ -65,7 +69,6 @@
       });
 
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        console.log(data);
         await resetFields();
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;

@@ -107,7 +107,7 @@
             roleMenus.value = await getMenusIdsByRoleId(data.record.id);
             treeData.value.map((m) => {
               roleMenus.value.map((m1) => {
-                if (m.key === m1) {
+                if (m.key === m1 && m.children.length !== 0) {
                   proxy.useChildrenIdsRemoveParentId(m1, roleMenus.value);
                 }
               });

@@ -4,6 +4,7 @@ import { h } from 'vue';
 import { Switch } from 'ant-design-vue';
 import { setRoleStatus } from '/@/api/system/system';
 import { useMessage } from '/@/hooks/web/useMessage';
+import { getAllRoleList } from '/@/api/system/system';
 
 export const columns: BasicColumn[] = [
   {
@@ -29,10 +30,14 @@ export const columns: BasicColumn[] = [
         checkedChildren: '已启用',
         unCheckedChildren: '已禁用',
         loading: record.pendingStatus,
-        onChange(checked: boolean) {
+        async onChange(checked: boolean) {
           record.pendingStatus = true;
           const newStatus = checked ? 1 : 0;
           const { createMessage } = useMessage();
+          const data = await getAllRoleList();
+          const findById = data.find((f) => f.id == record.id);
+          if (findById?.id) return createMessage.error(`该租户下面有此用户，无法禁用`);
+          record.pendingStatus = true;
           setRoleStatus(record.id, newStatus)
             .then(() => {
               record.status = newStatus;

@@ -50,31 +50,33 @@
             placeholder: '请输入账号',
           },
           dynamicRules: ({ values }) => {
-            const findUserName = isJudgeUserNameExist.value.find((f) => {
-              if (f) {
-                return f.username == values.username;
-              }
-            });
-            return [
-              {
-                validator(_, value) {
-                  return new Promise((resolve, reject) => {
-                    if (value == '') {
-                      reject('请输入账号');
-                    } else if (ChineseRegexp.test(value)) {
-                      reject('账号不能含有中文');
-                    } else if (EmailRegexp.test(value)) {
-                      reject('账号不能为电子邮箱格式');
-                    } else if (value == findUserName?.username) {
-                      reject('账号已存在');
-                      return;
-                    } else {
-                      resolve();
-                    }
-                  });
+            try {
+              const findUserName = isJudgeUserNameExist.value.find((f) => {
+                if (f) {
+                  return f.username == values.username;
+                }
+              });
+              return [
+                {
+                  validator(_, value) {
+                    return new Promise((resolve, reject) => {
+                      if (value == '') {
+                        reject('请输入账号');
+                      } else if (ChineseRegexp.test(value)) {
+                        reject('账号不能含有中文');
+                      } else if (EmailRegexp.test(value)) {
+                        reject('账号不能为电子邮箱格式');
+                      } else if (value == findUserName?.username) {
+                        reject('账号已存在');
+                        return;
+                      } else {
+                        resolve();
+                      }
+                    });
+                  },
                 },
-              },
-            ];
+              ];
+            } catch (e) {}
           },
         },
         {