简柏林 / thingskit-front · Commits

Commit d9dcaeafb8643e805cf21077889d94d617f14da6

Authored by xp.Huang
2 parents 4f7cf20d 0f1b4fca

Merge branch 'ft-dev' into 'main' 

fix:检查发现邮件发送记录和短信发送记录问题，fix:修改设备配置点击无效问题，style:修改设备配置键名筛选器表格高度,fix:修改场景联动样式问题

See merge request huang/yun-teng-iot-front!88
Inline Side-by-side
Showing 13 changed files with 788 additions and 259 deletions
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 :before-upload="beforeUploadqrcodePic" 33 :before-upload="beforeUploadqrcodePic"
34 > 34 >
35 <img 35 <img
36 - style="text-align: center; border-radius: 50%; width: 8vw; height: 15vh" 36 + style="text-align: center; border-radius: 50%; width: 8.5vw; height: 15.2vh"
37 v-if="peresonalPic" 37 v-if="peresonalPic"
38 :src="peresonalPic" 38 :src="peresonalPic"
39 alt="avatar" 39 alt="avatar"
@@ -92,7 +92,6 @@ @@ -92,7 +92,6 @@
92 import { Upload } from 'ant-design-vue'; 92 import { Upload } from 'ant-design-vue';
93 import { PlusOutlined } from '@ant-design/icons-vue'; 93 import { PlusOutlined } from '@ant-design/icons-vue';
94 import type { FileItem } from '/@/components/Upload/src/typing'; 94 import type { FileItem } from '/@/components/Upload/src/typing';
95 - import { useUserStore } from '/@/store/modules/user';  
96 95
97 const schema: DescItem[] = [ 96 const schema: DescItem[] = [
98 { 97 {
@@ -125,7 +124,6 @@ @@ -125,7 +124,6 @@
125 components: { BasicModal, BasicForm, Description, Upload, PlusOutlined }, 124 components: { BasicModal, BasicForm, Description, Upload, PlusOutlined },
126 emits: ['refreshPersonl', 'register'], 125 emits: ['refreshPersonl', 'register'],
127 setup(_, { emit }) { 126 setup(_, { emit }) {
128 - // const userStore = useUserStore();  
129 const userInfo = getAuthCache(USER_INFO_KEY); 127 const userInfo = getAuthCache(USER_INFO_KEY);
130 const { createMessage } = useMessage(); 128 const { createMessage } = useMessage();
131 const getPersonalValue: any = ref({}); 129 const getPersonalValue: any = ref({});
@@ -65,7 +65,14 @@ @@ -65,7 +65,14 @@
65 props: { 65 props: {
66 userData: { type: Object }, 66 userData: { type: Object },
67 }, 67 },
68 - emits: ['success', 'register'], 68 + emits: [
  69 + 'success',
  70 + 'register',
  71 + 'handleStepPrev',
  72 + 'handleStep3Next',
  73 + 'handleRedo',
  74 + 'handleStep2Next',
  75 + ],
69 setup(_, { emit }) { 76 setup(_, { emit }) {
70 const DeviceProfileStep1Ref = ref(null); 77 const DeviceProfileStep1Ref = ref(null);
71 const DeviceProfileStep2Ref = ref(null); 78 const DeviceProfileStep2Ref = ref(null);
@@ -133,11 +140,9 @@ @@ -133,11 +140,9 @@
133 current.value--; 140 current.value--;
134 } 141 }
135 function handleStepNext1(v, v1) { 142 function handleStepNext1(v, v1) {
136 - console.log(v, v1);  
137 current.value++; 143 current.value++;
138 getStepOneData.value = v; 144 getStepOneData.value = v;
139 getStepOneData.value.icon = v1; 145 getStepOneData.value.icon = v1;
140 - console.log(getStepOneData.value);  
141 if (unref(isUpdate)) { 146 if (unref(isUpdate)) {
142 proxy.$refs.DeviceProfileStep2Ref.resetFieldsFunc({ 147 proxy.$refs.DeviceProfileStep2Ref.resetFieldsFunc({
143 transportType: editEchoData.value.profileData.transportConfiguration.type, 148 transportType: editEchoData.value.profileData.transportConfiguration.type,
@@ -244,17 +249,16 @@ @@ -244,17 +249,16 @@
244 try { 249 try {
245 if (unref(isUpdate)) { 250 if (unref(isUpdate)) {
246 setTimeout(() => { 251 setTimeout(() => {
247 - proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({  
248 - alarmContactId: editEchoData.value.alarmProfile.alarmContactId,  
249 - messageMode: editEchoData.value.alarmProfile.messageMode,  
250 - }); 252 + try {
  253 + proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({
  254 + alarmContactId: editEchoData.value.alarmProfile.alarmContactId,
  255 + messageMode: editEchoData.value.alarmProfile.messageMode,
  256 + });
  257 + } catch (e) {
  258 + return e;
  259 + }
251 }, 1000); 260 }, 1000);
252 } 261 }
253 - // if (!unref(isUpdate)) {  
254 - // setTimeout(() => {  
255 - // proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();  
256 - // }, 1000);  
257 - // }  
258 } catch (e) { 262 } catch (e) {
259 return e; 263 return e;
260 } 264 }
@@ -140,72 +140,111 @@ @@ -140,72 +140,111 @@
140 span: 24, 140 span: 24,
141 }, 141 },
142 }); 142 });
143 - const [registerStep3Schemas, { setFieldsValue: setRegisterStep3Schemas }] = useForm({ 143 + const [
  144 + registerStep3Schemas,
  145 + { setFieldsValue: setRegisterStep3Schemas, resetFields: resetFieldsStep3Schemas },
  146 + ] = useForm({
144 schemas: step3Schemas, 147 schemas: step3Schemas,
145 actionColOptions: { 148 actionColOptions: {
146 span: 24, 149 span: 24,
147 }, 150 },
148 }); 151 });
149 - const [registerStep3HighSetting, { setFieldsValue: setRegisterStep3HighSetting }] = useForm({ 152 + const [
  153 + registerStep3HighSetting,
  154 + { setFieldsValue: setRegisterStep3HighSetting, resetFields: resetFieldsStep3HighSetting },
  155 + ] = useForm({
150 schemas: step3ViewHighSetting, 156 schemas: step3ViewHighSetting,
151 actionColOptions: { 157 actionColOptions: {
152 span: 24, 158 span: 24,
153 }, 159 },
154 }); 160 });
155 - const [registerStep3CreateAlarm, { setFieldsValue: setRegisterStep3CreateAlarm }] = useForm({ 161 + const [
  162 + registerStep3CreateAlarm,
  163 + { setFieldsValue: setRegisterStep3CreateAlarm, resetFields: resetFieldsStep3CreateAlarm },
  164 + ] = useForm({
156 schemas: step3CreateAlarm, 165 schemas: step3CreateAlarm,
157 actionColOptions: { 166 actionColOptions: {
158 span: 24, 167 span: 24,
159 }, 168 },
160 }); 169 });
161 - const [registerContact, { setFieldsValue: setRegisterContact }] = useForm({ 170 + const [
  171 + registerContact,
  172 + { setFieldsValue: setRegisterContact, resetFields: resetFieldsContact },
  173 + ] = useForm({
162 schemas: alertContactsSchemas, 174 schemas: alertContactsSchemas,
163 actionColOptions: { 175 actionColOptions: {
164 span: 24, 176 span: 24,
165 }, 177 },
166 }); 178 });
167 - const [registerStep3RuleAlarm, { setFieldsValue: setRegisterStep3RuleAlarm }] = useForm({ 179 + const [
  180 + registerStep3RuleAlarm,
  181 + { setFieldsValue: setRegisterStep3RuleAlarm, resetFields: resetFieldsStep3RuleAlarm },
  182 + ] = useForm({
168 schemas: echoFormSchema, 183 schemas: echoFormSchema,
169 actionColOptions: { 184 actionColOptions: {
170 span: 24, 185 span: 24,
171 }, 186 },
172 }); 187 });
173 - const [registerStep3Condition, { setFieldsValue: setRegisterStep3Condition }] = useForm({ 188 + const [
  189 + registerStep3Condition,
  190 + { setFieldsValue: setRegisterStep3Condition, resetFields: resetFieldsrStep3Condition },
  191 + ] = useForm({
174 schemas: conditionFormSchema, 192 schemas: conditionFormSchema,
175 actionColOptions: { 193 actionColOptions: {
176 span: 24, 194 span: 24,
177 }, 195 },
178 }); 196 });
179 - const [registerStep3Enable, { setFieldsValue: setRegisterStep3Enable }] = useForm({ 197 + const [
  198 + registerStep3Enable,
  199 + { setFieldsValue: setRegisterStep3Enable, resetFields: resetFieldsStep3Enable },
  200 + ] = useForm({
180 schemas: enableSchema, 201 schemas: enableSchema,
181 actionColOptions: { 202 actionColOptions: {
182 span: 24, 203 span: 24,
183 }, 204 },
184 }); 205 });
185 - const [registerStep3TemplateDetail, { setFieldsValue: setRegisterStep3TemplateDetail }] =  
186 - useForm({  
187 - schemas: detailSchema,  
188 - actionColOptions: {  
189 - span: 24,  
190 - },  
191 - }); 206 + const [
  207 + registerStep3TemplateDetail,
  208 + {
  209 + setFieldsValue: setRegisterStep3TemplateDetail,
  210 + resetFields: resetFieldsStep3TemplateDetail,
  211 + },
  212 + ] = useForm({
  213 + schemas: detailSchema,
  214 + actionColOptions: {
  215 + span: 24,
  216 + },
  217 + });
192 218
193 //清除报警 219 //清除报警
194 - const [registerStep3ClearRuleAlarm, { setFieldsValue: setRegisterStep3ClearRuleAlarm }] =  
195 - useForm({  
196 - schemas: echoFormClearSchema,  
197 - actionColOptions: {  
198 - span: 24,  
199 - },  
200 - });  
201 - const [registerStep3ClearCondition, { setFieldsValue: setRegisterStep3ClearCondition }] =  
202 - useForm({  
203 - schemas: conditionFormClearschema,  
204 - actionColOptions: {  
205 - span: 24,  
206 - },  
207 - });  
208 - const [registerStep3ClearEnable, { setFieldsValue: setRegisterStep3ClearEnable }] = useForm({ 220 + const [
  221 + registerStep3ClearRuleAlarm,
  222 + {
  223 + setFieldsValue: setRegisterStep3ClearRuleAlarm,
  224 + resetFields: resetFieldsStep3ClearRuleAlarm,
  225 + },
  226 + ] = useForm({
  227 + schemas: echoFormClearSchema,
  228 + actionColOptions: {
  229 + span: 24,
  230 + },
  231 + });
  232 + const [
  233 + registerStep3ClearCondition,
  234 + {
  235 + setFieldsValue: setRegisterStep3ClearCondition,
  236 + resetFields: resetFieldsStep3ClearCondition,
  237 + },
  238 + ] = useForm({
  239 + schemas: conditionFormClearschema,
  240 + actionColOptions: {
  241 + span: 24,
  242 + },
  243 + });
  244 + const [
  245 + registerStep3ClearEnable,
  246 + { setFieldsValue: setRegisterStep3ClearEnable, resetFields: resetFieldStep3ClearEnablel },
  247 + ] = useForm({
209 schemas: enableClearSchema, 248 schemas: enableClearSchema,
210 actionColOptions: { 249 actionColOptions: {
211 span: 24, 250 span: 24,
@@ -213,7 +252,10 @@ @@ -213,7 +252,10 @@
213 }); 252 });
214 const [ 253 const [
215 registerStep3ClearTemplateDetail, 254 registerStep3ClearTemplateDetail,
216 - { setFieldsValue: setRegisterStep3ClearTemplateDetail }, 255 + {
  256 + setFieldsValue: setRegisterStep3ClearTemplateDetail,
  257 + resetFields: resetFieldStep3ClearTemplateDetail,
  258 + },
217 ] = useForm({ 259 ] = useForm({
218 schemas: detailClearSchema, 260 schemas: detailClearSchema,
219 actionColOptions: { 261 actionColOptions: {
@@ -246,80 +288,113 @@ @@ -246,80 +288,113 @@
246 break; 288 break;
247 case '3': 289 case '3':
248 setTimeout(() => { 290 setTimeout(() => {
249 - setRegisterStep3Schemas({  
250 - alarmType: descInfo.value.profileData?.alarms[0]?.alarmType,  
251 - });  
252 - setRegisterStep3HighSetting({  
253 - propagate: descInfo.value.profileData?.alarms[0]?.propagate,  
254 - propagateRelationTypes:  
255 - descInfo.value.profileData?.alarms[0]?.propagateRelationTypes,  
256 - });  
257 - const getKey = Object.keys(descInfo.value.profileData?.alarms[0]?.createRules);  
258 - setRegisterStep3CreateAlarm({  
259 - default: getKey[0],  
260 - });  
261 - setRegisterStep3RuleAlarm({  
262 - type: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition  
263 - .condition[0].key.type,  
264 - key1: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition  
265 - .condition[0].key.key,  
266 - type1:  
267 - descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition  
268 - .condition[0].valueType,  
269 - value1:  
270 - descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition  
271 - .condition[0].predicate.value.defaultValue,  
272 - operation:  
273 - descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition  
274 - .condition[0].predicate.operation,  
275 - });  
276 - setRegisterStep3Condition({  
277 - conditionType:  
278 - descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.spec 291 + resetFieldsStep3SchemasFunc();
  292 + resetFieldsStep3HighSettingFunc();
  293 + resetFieldsStep3CreateAlarmFunc();
  294 + resetFieldsStep3RuleAlarmFunc();
  295 + resetFieldsStep3RuleAlarmFunc1();
  296 + resetFieldsrStep3ConditionFunc();
  297 + resetFieldsStep3EnableFunc();
  298 + resetFieldsStep3TemplateDetailFunc();
  299 + resetFieldsStep3ClearRuleAlarmFunc();
  300 + resetFieldsStep3ClearRuleAlarmlFunc();
  301 + resetFieldsStep3ClearConditionFunc();
  302 + resetFieldStep3ClearEnablelFunc();
  303 + resetFieldStep3ClearTemplateDetailFunc();
  304 + }, 100);
  305 + setTimeout(() => {
  306 + try {
  307 + setRegisterStep3Schemas({
  308 + alarmType: descInfo.value.profileData?.alarms[0]?.alarmType,
  309 + });
  310 + } catch (e) {
  311 + return e;
  312 + }
  313 +
  314 + try {
  315 + setRegisterStep3HighSetting({
  316 + propagate: descInfo.value.profileData?.alarms[0]?.propagate,
  317 + propagateRelationTypes:
  318 + descInfo.value.profileData?.alarms[0]?.propagateRelationTypes,
  319 + });
  320 + const getKey = Object.keys(descInfo.value.profileData?.alarms[0]?.createRules);
  321 + setRegisterStep3CreateAlarm({
  322 + default: getKey[0],
  323 + });
  324 + setRegisterStep3RuleAlarm({
  325 + type: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
  326 + .condition[0].key.type,
  327 + key1: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
  328 + .condition[0].key.key,
  329 + type1:
  330 + descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
  331 + .condition[0].valueType,
  332 + value1:
  333 + descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
  334 + .condition[0].predicate.value.defaultValue,
  335 + operation:
  336 + descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
  337 + .condition[0].predicate.operation,
  338 + });
  339 + setRegisterStep3Condition({
  340 + conditionType:
  341 + descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.spec
  342 + .type,
  343 + });
  344 + setRegisterStep3Enable({
  345 + schedule:
  346 + descInfo.value.profileData?.alarms[0].createRules[getKey[0]].schedule.type,
  347 + });
  348 + setRegisterStep3TemplateDetail({
  349 + alarmDetails:
  350 + descInfo.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,
  351 + });
  352 + //清除报警
  353 + setRegisterStep3ClearRuleAlarm({
  354 + type: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key
279 .type, 355 .type,
280 - });  
281 - setRegisterStep3Enable({  
282 - schedule:  
283 - descInfo.value.profileData?.alarms[0].createRules[getKey[0]].schedule.type,  
284 - });  
285 - setRegisterStep3TemplateDetail({  
286 - alarmDetails:  
287 - descInfo.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,  
288 - });  
289 - //清除报警  
290 - setRegisterStep3ClearRuleAlarm({  
291 - type: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key  
292 - .type,  
293 - key1: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key  
294 - .key,  
295 - type1:  
296 - descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0]  
297 - .valueType,  
298 - value1:  
299 - descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate  
300 - .value.defaultValue,  
301 - operation:  
302 - descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate  
303 - .operation,  
304 - });  
305 - setRegisterStep3ClearCondition({  
306 - conditionType:  
307 - descInfo.value.profileData?.alarms[0].clearRule.condition.spec.type,  
308 - });  
309 - setRegisterStep3ClearEnable({  
310 - schedule: descInfo.value.profileData?.alarms[0].clearRule.schedule.type,  
311 - });  
312 - setRegisterStep3ClearTemplateDetail({  
313 - alarmDetails: descInfo.value.profileData?.alarms[0].clearRule.alarmDetails,  
314 - }); 356 + key1: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key
  357 + .key,
  358 + type1:
  359 + descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0]
  360 + .valueType,
  361 + value1:
  362 + descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0]
  363 + .predicate.value.defaultValue,
  364 + operation:
  365 + descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0]
  366 + .predicate.operation,
  367 + });
  368 + setRegisterStep3ClearCondition({
  369 + conditionType:
  370 + descInfo.value.profileData?.alarms[0].clearRule.condition.spec.type,
  371 + });
  372 + setRegisterStep3ClearEnable({
  373 + schedule: descInfo.value.profileData?.alarms[0].clearRule.schedule.type,
  374 + });
  375 + setRegisterStep3ClearTemplateDetail({
  376 + alarmDetails: descInfo.value.profileData?.alarms[0].clearRule.alarmDetails,
  377 + });
  378 + } catch (e) {
  379 + return e;
  380 + }
315 }, 1000); 381 }, 1000);
  382 + break;
316 case '4': 383 case '4':
317 setTimeout(() => { 384 setTimeout(() => {
318 - setRegisterContact({  
319 - alarmContactId: descInfo.value?.alarmProfile?.alarmContactId,  
320 - messageMode: descInfo.value?.alarmProfile?.messageMode,  
321 - });  
322 - }, 1000); 385 + resetFieldsContactFunc();
  386 + }, 100);
  387 + setTimeout(() => {
  388 + try {
  389 + setRegisterContact({
  390 + alarmContactId: descInfo.value.alarmProfile.alarmContactId,
  391 + messageMode: descInfo.value.alarmProfile.messageMode,
  392 + });
  393 + } catch (e) {
  394 + return e;
  395 + }
  396 + }, 500);
  397 +
323 break; 398 break;
324 } 399 }
325 } catch (e) { 400 } catch (e) {
@@ -327,6 +402,53 @@ @@ -327,6 +402,53 @@
327 } 402 }
328 }; 403 };
329 404
  405 + const resetFieldsContactFunc = () => {
  406 + resetFieldsContact();
  407 + };
  408 + const resetFieldsStep3SchemasFunc = () => {
  409 + resetFieldsStep3Schemas();
  410 + };
  411 +
  412 + const resetFieldsStep3HighSettingFunc = () => {
  413 + resetFieldsStep3HighSetting();
  414 + };
  415 + const resetFieldsStep3CreateAlarmFunc = () => {
  416 + resetFieldsStep3CreateAlarm();
  417 + };
  418 + const resetFieldsStep3RuleAlarmFunc = () => {
  419 + resetFieldsStep3RuleAlarm();
  420 + };
  421 +
  422 + const resetFieldsrStep3ConditionFunc = () => {
  423 + resetFieldsrStep3Condition();
  424 + };
  425 +
  426 + const resetFieldsStep3RuleAlarmFunc1 = () => {
  427 + resetFieldsStep3RuleAlarm();
  428 + };
  429 +
  430 + const resetFieldsStep3EnableFunc = () => {
  431 + resetFieldsStep3Enable();
  432 + };
  433 + const resetFieldsStep3TemplateDetailFunc = () => {
  434 + resetFieldsStep3TemplateDetail();
  435 + };
  436 + //清除报警
  437 + const resetFieldsStep3ClearRuleAlarmFunc = () => {
  438 + resetFieldsStep3ClearRuleAlarm();
  439 + };
  440 + const resetFieldsStep3ClearRuleAlarmlFunc = () => {
  441 + resetFieldsStep3ClearRuleAlarm();
  442 + };
  443 + const resetFieldsStep3ClearConditionFunc = () => {
  444 + resetFieldsStep3ClearCondition();
  445 + };
  446 + const resetFieldStep3ClearEnablelFunc = () => {
  447 + resetFieldStep3ClearEnablel();
  448 + };
  449 + const resetFieldStep3ClearTemplateDetailFunc = () => {
  450 + resetFieldStep3ClearTemplateDetail();
  451 + };
330 watch( 452 watch(
331 () => activeKey.value, 453 () => activeKey.value,
332 (v) => { 454 (v) => {
@@ -338,6 +460,7 @@ @@ -338,6 +460,7 @@
338 }); 460 });
339 461
340 return { 462 return {
  463 + resetFieldsContactFunc,
341 registerStep3ClearTemplateDetail, 464 registerStep3ClearTemplateDetail,
342 registerStep3ClearEnable, 465 registerStep3ClearEnable,
343 registerStep3ClearCondition, 466 registerStep3ClearCondition,
@@ -46,12 +46,16 @@ @@ -46,12 +46,16 @@
46 </template> 46 </template>
47 </BasicTable> 47 </BasicTable>
48 <DeviceProfileModal v-if="isJudgeStatus" @register="registerModal" @success="handleSuccess" /> 48 <DeviceProfileModal v-if="isJudgeStatus" @register="registerModal" @success="handleSuccess" />
49 - <DeviceConfigDetail @register="registerModalDetail" @success="handleSuccess" /> 49 + <DeviceConfigDetail
  50 + ref="deviceDetailRef"
  51 + @register="registerModalDetail"
  52 + @success="handleSuccess"
  53 + />
50 <!-- <ExpExcelModal @register="register1" @success="defaultHeader" /> --> 54 <!-- <ExpExcelModal @register="register1" @success="defaultHeader" /> -->
51 </div> 55 </div>
52 </template> 56 </template>
53 <script lang="ts"> 57 <script lang="ts">
54 - import { defineComponent, ref, reactive } from 'vue'; 58 + import { defineComponent, ref, reactive, getCurrentInstance } from 'vue';
55 import { BasicTable, useTable, TableAction, BasicColumn } from '/@/components/Table'; 59 import { BasicTable, useTable, TableAction, BasicColumn } from '/@/components/Table';
56 import { columns, searchFormSchema } from './device.profile.data'; 60 import { columns, searchFormSchema } from './device.profile.data';
57 import { useMessage } from '/@/hooks/web/useMessage'; 61 import { useMessage } from '/@/hooks/web/useMessage';
@@ -66,6 +70,8 @@ @@ -66,6 +70,8 @@
66 name: 'DeviceProfileManagement', 70 name: 'DeviceProfileManagement',
67 components: { BasicTable, DeviceProfileModal, TableAction, ImpExcel, DeviceConfigDetail }, 71 components: { BasicTable, DeviceProfileModal, TableAction, ImpExcel, DeviceConfigDetail },
68 setup() { 72 setup() {
  73 + const { proxy } = getCurrentInstance();
  74 + const deviceDetailRef = ref(null);
69 let selectedRowKeys: string[] = reactive([]); 75 let selectedRowKeys: string[] = reactive([]);
70 let isJudgeStatus = ref(true); 76 let isJudgeStatus = ref(true);
71 const getPathUrl = ref(''); 77 const getPathUrl = ref('');
@@ -148,17 +154,21 @@ @@ -148,17 +154,21 @@
148 } 154 }
149 155
150 function handleCreate() { 156 function handleCreate() {
151 - openModal(true, {  
152 - isUpdate: false,  
153 - }); 157 + setTimeout(() => {
  158 + openModal(true, {
  159 + isUpdate: false,
  160 + });
  161 + }, 100);
154 isJudgeStatus.value = true; 162 isJudgeStatus.value = true;
155 } 163 }
156 164
157 function handleEdit(record: Recordable) { 165 function handleEdit(record: Recordable) {
158 - openModal(true, {  
159 - record,  
160 - isUpdate: true,  
161 - }); 166 + setTimeout(() => {
  167 + openModal(true, {
  168 + record,
  169 + isUpdate: true,
  170 + });
  171 + }, 100);
162 isJudgeStatus.value = true; 172 isJudgeStatus.value = true;
163 } 173 }
164 const useSelectionChange = () => { 174 const useSelectionChange = () => {
@@ -183,6 +193,9 @@ @@ -183,6 +193,9 @@
183 record, 193 record,
184 isUpdate: false, 194 isUpdate: false,
185 }); 195 });
  196 + setTimeout(() => {
  197 + // proxy.$refs.deviceDetailRef.resetFieldsContactFunc();
  198 + }, 2000);
186 isJudgeStatus.value = false; 199 isJudgeStatus.value = false;
187 } 200 }
188 201
@@ -211,6 +224,7 @@ @@ -211,6 +224,7 @@
211 reload(); 224 reload();
212 } 225 }
213 return { 226 return {
  227 + deviceDetailRef,
214 setRowClassName, 228 setRowClassName,
215 registerModalDetail, 229 registerModalDetail,
216 // register1, 230 // register1,
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 Upload, 67 Upload,
68 PlusOutlined, 68 PlusOutlined,
69 }, 69 },
70 - emits: ['next', 'resetFunc'], 70 + emits: ['next', 'resetFunc', 'register'],
71 setup(_, { emit }) { 71 setup(_, { emit }) {
72 const { createMessage } = useMessage(); 72 const { createMessage } = useMessage();
73 73
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 [Descriptions.name]: Descriptions, 17 [Descriptions.name]: Descriptions,
18 [Descriptions.Item.name]: Descriptions.Item, 18 [Descriptions.Item.name]: Descriptions.Item,
19 }, 19 },
20 - emits: ['next', 'prev'], 20 + emits: ['next', 'prev', 'register'],
21 setup(_, { emit }) { 21 setup(_, { emit }) {
22 const [register, { validate, setFieldsValue, resetFields }] = useForm({ 22 const [register, { validate, setFieldsValue, resetFields }] = useForm({
23 labelWidth: 80, 23 labelWidth: 80,
@@ -120,48 +120,52 @@ @@ -120,48 +120,52 @@
120 <a-button @click="handleFormStep3toStep4Next">下一步</a-button> 120 <a-button @click="handleFormStep3toStep4Next">下一步</a-button>
121 <a-button style="margin-left: 20px" type="primary" @click="addAlarmRule">添加报警规则</a-button> 121 <a-button style="margin-left: 20px" type="primary" @click="addAlarmRule">添加报警规则</a-button>
122 </div> 122 </div>
123 - <!-- 详情模板 -->  
124 - <DetailTemplate  
125 - v-if="isRuleAlarmRuleConditions == 1"  
126 - @getAllFields="getAllFieldsFunc"  
127 - @register="registerModal1"  
128 - />  
129 - <!-- 启用规则 -->  
130 - <EnableRule  
131 - v-if="isRuleAlarmRuleConditions == 2"  
132 - ref="getChildData2"  
133 - @getAllFieldsEnab="getAllFieldsEnabFunc"  
134 - @register="registerModal2"  
135 - />  
136 - <!-- 报警规则条件 -->  
137 - <AlarmRuleConditions  
138 - v-if="isRuleAlarmRuleConditions == 3"  
139 - ref="getChildData3"  
140 - @getAllFieldsRule="getAllFieldsRuleFunc"  
141 - @register="registerModal3"  
142 - /> 123 + <div>
  124 + <!-- 详情模板 -->
  125 + <DetailTemplate
  126 + v-if="isRuleAlarmRuleConditions == 1"
  127 + @getAllFields="getAllFieldsFunc"
  128 + @register="registerModal1"
  129 + />
  130 + <!-- 启用规则 -->
  131 + <EnableRule
  132 + v-if="isRuleAlarmRuleConditions == 2"
  133 + ref="getChildData2"
  134 + @getAllFieldsEnab="getAllFieldsEnabFunc"
  135 + @register="registerModal2"
  136 + />
  137 + <!-- 报警规则条件 -->
  138 + <AlarmRuleConditions
  139 + v-if="isRuleAlarmRuleConditions == 3"
  140 + ref="getChildData3"
  141 + @getAllFieldsRule="getAllFieldsRuleFunc"
  142 + @register="registerModal3"
  143 + />
  144 + </div>
143 145
144 - <!-- 清除条件 -->  
145 - <!-- 详情模板 -->  
146 - <DetailTemplate  
147 - v-if="isRuleAlarmRuleConditions == 4"  
148 - @getAllFields="getAllClearFieldsFunc"  
149 - @register="registerModal4"  
150 - />  
151 - <!-- 启用规则 -->  
152 - <EnableRule  
153 - v-if="isRuleAlarmRuleConditions == 5"  
154 - ref="getChildData2"  
155 - @getAllFieldsEnab="getAllClearFieldsEnabFunc"  
156 - @register="registerModal5"  
157 - />  
158 - <!-- 报警规则条件 -->  
159 - <AlarmRuleConditions  
160 - v-if="isRuleAlarmRuleConditions == 6"  
161 - ref="getChildData3"  
162 - @getAllFieldsRule="getAllClearFieldsRuleFunc"  
163 - @register="registerModal6"  
164 - /> 146 + <div>
  147 + <!-- 清除条件 -->
  148 + <!-- 详情模板 -->
  149 + <DetailTemplate
  150 + v-if="isRuleAlarmRuleConditions == 4"
  151 + @getAllFields="getAllClearFieldsFunc"
  152 + @register="registerModal4"
  153 + />
  154 + <!-- 启用规则 -->
  155 + <EnableRule
  156 + v-if="isRuleAlarmRuleConditions == 5"
  157 + ref="getChildData2"
  158 + @getAllFieldsEnab="getAllClearFieldsEnabFunc"
  159 + @register="registerModal5"
  160 + />
  161 + <!-- 报警规则条件 -->
  162 + <AlarmRuleConditions
  163 + v-if="isRuleAlarmRuleConditions == 6"
  164 + ref="getChildData3"
  165 + @getAllFieldsRule="getAllClearFieldsRuleFunc"
  166 + @register="registerModal6"
  167 + />
  168 + </div>
165 </template> 169 </template>
166 170
167 <script lang="ts"> 171 <script lang="ts">
@@ -185,7 +189,6 @@ @@ -185,7 +189,6 @@
185 import { Button } from '/@/components/Button'; 189 import { Button } from '/@/components/Button';
186 190
187 export const isWhereTypeValueDisabled = ref(false); 191 export const isWhereTypeValueDisabled = ref(false);
188 -  
189 export default defineComponent({ 192 export default defineComponent({
190 components: { 193 components: {
191 BasicForm, 194 BasicForm,
@@ -197,7 +200,7 @@ @@ -197,7 +200,7 @@
197 AlarmRuleConditions, 200 AlarmRuleConditions,
198 Button, 201 Button,
199 }, 202 },
200 - emits: ['prev', 'next'], 203 + emits: ['prev', 'next', 'redo', 'handleFormStep3toStep4Next'],
201 setup(_, { emit }) { 204 setup(_, { emit }) {
202 const { proxy } = getCurrentInstance(); 205 const { proxy } = getCurrentInstance();
203 const getChildData1 = ref(null); 206 const getChildData1 = ref(null);
@@ -760,7 +763,6 @@ @@ -760,7 +763,6 @@
760 return uuid; 763 return uuid;
761 } 764 }
762 const handleFormStep3toStep4Next = async () => { 765 const handleFormStep3toStep4Next = async () => {
763 - console.log(enableObj.value);  
764 try { 766 try {
765 if (enableObj.value.schedule == 'CUSTOM') { 767 if (enableObj.value.schedule == 'CUSTOM') {
766 for (let i in enableObj.value) { 768 for (let i in enableObj.value) {
@@ -942,8 +944,12 @@ @@ -942,8 +944,12 @@
942 isRuleAlarmRuleConditions.value = 3; 944 isRuleAlarmRuleConditions.value = 3;
943 setTimeout(() => { 945 setTimeout(() => {
944 openModal3(true); 946 openModal3(true);
945 - proxy.$refs.getChildData3.resetDataFunc();  
946 - }, 50); 947 + try {
  948 + proxy.$refs.getChildData3.resetDataFunc();
  949 + } catch (e) {
  950 + return e;
  951 + }
  952 + }, 100);
947 }; 953 };
948 const handleOpenClearDetailTemplate = () => { 954 const handleOpenClearDetailTemplate = () => {
949 isRuleAlarmRuleConditions.value = 4; 955 isRuleAlarmRuleConditions.value = 4;
@@ -1055,7 +1061,4 @@ @@ -1055,7 +1061,4 @@
1055 :deep(.vben-collapse-container__header) { 1061 :deep(.vben-collapse-container__header) {
1056 border: none; 1062 border: none;
1057 } 1063 }
1058 - // :deep(.anticon svg) {  
1059 - // display: none !important;  
1060 - // }  
1061 </style> 1064 </style>
1 <template> 1 <template>
2 - <div> 2 + <div class="step-4">
3 <!-- <span>请选择告警通知联系人：</span> --> 3 <!-- <span>请选择告警通知联系人：</span> -->
4 <!-- <Tag v-for="(item, index) in 15" closable :key="index"> 冯涛+{{ item }}</Tag> --> 4 <!-- <Tag v-for="(item, index) in 15" closable :key="index"> 冯涛+{{ item }}</Tag> -->
5 <BasicForm :showSubmitButton="false" @register="register" /> 5 <BasicForm :showSubmitButton="false" @register="register" />
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 components: { 15 components: {
16 BasicForm, 16 BasicForm,
17 }, 17 },
18 - emits: ['prev'], 18 + emits: ['prev', 'register'],
19 setup(_, { emit }) { 19 setup(_, { emit }) {
20 const getValueData: any = ref({}); 20 const getValueData: any = ref({});
21 const [register, { setProps, validate, setFieldsValue, resetFields }] = useForm({ 21 const [register, { setProps, validate, setFieldsValue, resetFields }] = useForm({
@@ -54,3 +54,12 @@ @@ -54,3 +54,12 @@
54 }, 54 },
55 }); 55 });
56 </script> 56 </script>
  57 +<style lang="less" scoped>
  58 + .step-4 {
  59 + /deep/ .ant-btn {
  60 + position: relative;
  61 + right: 375px;
  62 + top: 18px;
  63 + }
  64 + }
  65 +</style>
1 <template> 1 <template>
2 - <BasicModal  
3 - v-bind="$attrs"  
4 - width="55rem"  
5 - @register="register"  
6 - :title="getTitle"  
7 - @ok="handleSubmit"  
8 - >  
9 - <CollapseContainer title="键名筛选器" class="border mb-8">  
10 - <BasicTable  
11 - :showIndexColumn="false"  
12 - :resizeHeightOffset="200"  
13 - :dataSource="getTableApiData"  
14 - @register="registerTable"  
15 - >  
16 - <template #toolbar>  
17 - <a-button type="primary" @click="handleAddKey">新增键名筛选器</a-button>  
18 - </template>  
19 - <template #action="{ record }">  
20 - <TableAction  
21 - :actions="[  
22 - {  
23 - label: '编辑',  
24 - icon: 'clarity:note-edit-line',  
25 - onClick: handleEdit.bind(null, record),  
26 - },  
27 - {  
28 - label: '删除',  
29 - icon: 'ant-design:delete-outlined',  
30 - color: 'error',  
31 - popConfirm: {  
32 - title: '是否确认删除',  
33 - confirm: handleDelete.bind(null, record), 2 + <div class="key-style">
  3 + <BasicModal
  4 + v-bind="$attrs"
  5 + width="55rem"
  6 + @register="register"
  7 + :title="getTitle"
  8 + @ok="handleSubmit"
  9 + >
  10 + <CollapseContainer title="键名筛选器" class="border mb-8">
  11 + <BasicTable
  12 + :showIndexColumn="false"
  13 + :resizeHeightOffset="200"
  14 + :dataSource="getTableApiData"
  15 + @register="registerTable"
  16 + >
  17 + <template #toolbar>
  18 + <a-button type="primary" @click="handleAddKey">新增键名筛选器</a-button>
  19 + </template>
  20 + <template #action="{ record }">
  21 + <TableAction
  22 + :actions="[
  23 + {
  24 + label: '编辑',
  25 + icon: 'clarity:note-edit-line',
  26 + onClick: handleEdit.bind(null, record),
34 }, 27 },
35 - },  
36 - ]"  
37 - />  
38 - </template>  
39 - </BasicTable>  
40 - </CollapseContainer>  
41 - <CollapseContainer title="筛选器预览" class="border mb-8">  
42 - <!-- <p v-for="(item, index) in detailData" :key="index">{{ item }}</p> -->  
43 - <Description  
44 - v-for="(item, index) in detailData"  
45 - :key="index"  
46 - :column="3"  
47 - :data="item"  
48 - :schema="schema"  
49 - />  
50 - </CollapseContainer>  
51 - <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm" />  
52 - </BasicModal>  
53 - <KeyValueModal @register="registerModal" @success="handleSuccess" /> 28 + {
  29 + label: '删除',
  30 + icon: 'ant-design:delete-outlined',
  31 + color: 'error',
  32 + popConfirm: {
  33 + title: '是否确认删除',
  34 + confirm: handleDelete.bind(null, record),
  35 + },
  36 + },
  37 + ]"
  38 + />
  39 + </template>
  40 + </BasicTable>
  41 + </CollapseContainer>
  42 + <CollapseContainer title="筛选器预览" class="border mb-8">
  43 + <!-- <p v-for="(item, index) in detailData" :key="index">{{ item }}</p> -->
  44 + <Description
  45 + v-for="(item, index) in detailData"
  46 + :key="index"
  47 + :column="3"
  48 + :data="item"
  49 + :schema="schema"
  50 + />
  51 + </CollapseContainer>
  52 + <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm" />
  53 + </BasicModal>
  54 + <KeyValueModal @register="registerModal" @success="handleSuccess" />
  55 + </div>
54 </template> 56 </template>
55 <script lang="ts"> 57 <script lang="ts">
56 import { defineComponent, ref, computed, unref } from 'vue'; 58 import { defineComponent, ref, computed, unref } from 'vue';
@@ -218,3 +220,10 @@ @@ -218,3 +220,10 @@
218 }, 220 },
219 }); 221 });
220 </script> 222 </script>
  223 +<style lang="less" scoped>
  224 + /deep/ .ant-table-body {
  225 + overflow-y: auto !important;
  226 + min-height: 173px !important;
  227 + height: 100px !important;
  228 + }
  229 +</style>
@@ -140,19 +140,6 @@ export const step3ViewHighSetting: FormSchema[] = [ @@ -140,19 +140,6 @@ export const step3ViewHighSetting: FormSchema[] = [
140 maxLength: 255, 140 maxLength: 255,
141 placeholder: '请输入关联类型', 141 placeholder: '请输入关联类型',
142 }, 142 },
143 - dynamicRules: () => {  
144 - return [  
145 - {  
146 - required: false,  
147 - validator: (_, value) => {  
148 - if (String(value).length > 255) {  
149 - return Promise.reject('字数不超过255个字');  
150 - }  
151 - return Promise.resolve();  
152 - },  
153 - },  
154 - ];  
155 - },  
156 }, 143 },
157 ]; 144 ];
158 145
@@ -265,7 +252,6 @@ export const alertContactsSchemas: FormSchema[] = [ @@ -265,7 +252,6 @@ export const alertContactsSchemas: FormSchema[] = [
265 field: 'alarmContactId', 252 field: 'alarmContactId',
266 label: '告警通知联系人', 253 label: '告警通知联系人',
267 component: 'ApiSelect', 254 component: 'ApiSelect',
268 - required: true,  
269 componentProps: { 255 componentProps: {
270 placeholder: '请选择告警通知联系人', 256 placeholder: '请选择告警通知联系人',
271 api: alarmContactGetPage, 257 api: alarmContactGetPage,
@@ -277,7 +263,6 @@ export const alertContactsSchemas: FormSchema[] = [ @@ -277,7 +263,6 @@ export const alertContactsSchemas: FormSchema[] = [
277 { 263 {
278 field: 'messageMode', 264 field: 'messageMode',
279 label: '告警通知方式', 265 label: '告警通知方式',
280 - required: true,  
281 component: 'ApiSelect', 266 component: 'ApiSelect',
282 componentProps: { 267 componentProps: {
283 placeholder: '请选择告警通知方式', 268 placeholder: '请选择告警通知方式',
@@ -12,17 +12,12 @@ @@ -12,17 +12,12 @@
12 <Button 12 <Button
13 style="margin-left: -99px; margin-top: 0px; display: inline-block" 13 style="margin-left: -99px; margin-top: 0px; display: inline-block"
14 v-if="Number(field) === 0" 14 v-if="Number(field) === 0"
  15 + :style="addHideButton > 1 ? 'display:none' : 'display:inline-block'"
15 @click="add" 16 @click="add"
16 type="primary" 17 type="primary"
17 >+新增执行条件</Button 18 >+新增执行条件</Button
18 > 19 >
19 - <!-- <Button  
20 - @click="del(field)"  
21 - style="margin-left: 10px"  
22 - v-if="Number(field) === 0"  
23 - type="primary"  
24 - >删除</Button  
25 - > --> 20 +
26 <Button 21 <Button
27 style="margin-left: -95px; margin-top: 20px" 22 style="margin-left: -95px; margin-top: 20px"
28 v-if="field > 0" 23 v-if="field > 0"
@@ -52,6 +47,8 @@ @@ -52,6 +47,8 @@
52 props: ['deviceInfo1'], 47 props: ['deviceInfo1'],
53 setup(props) { 48 setup(props) {
54 const getValueData: any = ref({}); 49 const getValueData: any = ref({});
  50 + const addHideButton = ref(1);
  51 +
55 const [ 52 const [
56 registerCondition, 53 registerCondition,
57 { 54 {
@@ -119,6 +116,58 @@ @@ -119,6 +116,58 @@
119 116
120 const n = ref(1); 117 const n = ref(1);
121 function add() { 118 function add() {
  119 + addHideButton.value++;
  120 + if (addHideButton.value == 3) {
  121 + setTimeout(() => {
  122 + let getDom1 = document.getElementById('1') as HTMLElement;
  123 + getDom1.style.display = 'none';
  124 + }, 500);
  125 + }
  126 + if (addHideButton.value == 4) {
  127 + setTimeout(() => {
  128 + let getDom2 = document.getElementById('2') as HTMLElement;
  129 + getDom2.style.display = 'none';
  130 + let getDom41 = document.getElementById('1') as HTMLElement;
  131 + getDom41.style.display = 'none';
  132 + }, 500);
  133 + }
  134 + if (addHideButton.value == 5) {
  135 + setTimeout(() => {
  136 + let getDom3 = document.getElementById('3') as HTMLElement;
  137 + getDom3.style.display = 'none';
  138 + let getDom51 = document.getElementById('1') as HTMLElement;
  139 + getDom51.style.display = 'none';
  140 + let getDom52 = document.getElementById('2') as HTMLElement;
  141 + getDom52.style.display = 'none';
  142 + }, 500);
  143 + }
  144 + if (addHideButton.value == 6) {
  145 + setTimeout(() => {
  146 + let getDom4 = document.getElementById('4') as HTMLElement;
  147 + getDom4.style.display = 'none';
  148 + let getDom61 = document.getElementById('1') as HTMLElement;
  149 + getDom61.style.display = 'none';
  150 + let getDom62 = document.getElementById('2') as HTMLElement;
  151 + getDom62.style.display = 'none';
  152 + let getDom63 = document.getElementById('3') as HTMLElement;
  153 + getDom63.style.display = 'none';
  154 + }, 500);
  155 + }
  156 + if (addHideButton.value == 7) {
  157 + setTimeout(() => {
  158 + let getDom7 = document.getElementById('5') as HTMLElement;
  159 + getDom7.style.display = 'none';
  160 + let getDom71 = document.getElementById('1') as HTMLElement;
  161 + getDom71.style.display = 'none';
  162 + let getDom72 = document.getElementById('2') as HTMLElement;
  163 + getDom72.style.display = 'none';
  164 + let getDom73 = document.getElementById('3') as HTMLElement;
  165 + getDom73.style.display = 'none';
  166 + let getDom74 = document.getElementById('4') as HTMLElement;
  167 + getDom74.style.display = 'none';
  168 + }, 500);
  169 + }
  170 +
122 appendSchemaByField( 171 appendSchemaByField(
123 { 172 {
124 field: `kong${n.value}`, 173 field: `kong${n.value}`,
@@ -312,6 +361,73 @@ @@ -312,6 +361,73 @@
312 n.value++; 361 n.value++;
313 } 362 }
314 function del(field) { 363 function del(field) {
  364 + addHideButton.value--;
  365 + if (addHideButton.value == 2) {
  366 + setTimeout(() => {
  367 + let getDom1 = document.getElementById('1') as HTMLElement;
  368 + getDom1.style.display = 'flex';
  369 + }, 500);
  370 + }
  371 + if (addHideButton.value == 3) {
  372 + setTimeout(() => {
  373 + let getDom2 = document.getElementById('2') as HTMLElement;
  374 + getDom2.style.display = 'flex';
  375 + let getDom21 = document.getElementById('1') as HTMLElement;
  376 + getDom21.style.display = 'none';
  377 + }, 500);
  378 + }
  379 + if (addHideButton.value == 4) {
  380 + setTimeout(() => {
  381 + let getDom3 = document.getElementById('3') as HTMLElement;
  382 + getDom3.style.display = 'flex';
  383 + let getDom31 = document.getElementById('1') as HTMLElement;
  384 + getDom31.style.display = 'none';
  385 + let getDom32 = document.getElementById('2') as HTMLElement;
  386 + getDom32.style.display = 'none';
  387 + }, 500);
  388 + }
  389 + if (addHideButton.value == 5) {
  390 + setTimeout(() => {
  391 + let getDom4 = document.getElementById('4') as HTMLElement;
  392 + getDom4.style.display = 'flex';
  393 + let getDom41 = document.getElementById('1') as HTMLElement;
  394 + getDom41.style.display = 'none';
  395 + let getDom42 = document.getElementById('2') as HTMLElement;
  396 + getDom42.style.display = 'none';
  397 + let getDom43 = document.getElementById('3') as HTMLElement;
  398 + getDom43.style.display = 'none';
  399 + }, 500);
  400 + }
  401 + if (addHideButton.value == 6) {
  402 + setTimeout(() => {
  403 + let getDom5 = document.getElementById('5') as HTMLElement;
  404 + getDom5.style.display = 'flex';
  405 + let getDom51 = document.getElementById('1') as HTMLElement;
  406 + getDom51.style.display = 'none';
  407 + let getDom52 = document.getElementById('2') as HTMLElement;
  408 + getDom52.style.display = 'none';
  409 + let getDom53 = document.getElementById('3') as HTMLElement;
  410 + getDom53.style.display = 'none';
  411 + let getDom54 = document.getElementById('4') as HTMLElement;
  412 + getDom54.style.display = 'none';
  413 + }, 500);
  414 + }
  415 + if (addHideButton.value == 7) {
  416 + setTimeout(() => {
  417 + let getDom7 = document.getElementById('6') as HTMLElement;
  418 + getDom7.style.display = 'flex';
  419 + let getDom71 = document.getElementById('1') as HTMLElement;
  420 + getDom71.style.display = 'none';
  421 + let getDom72 = document.getElementById('2') as HTMLElement;
  422 + getDom72.style.display = 'none';
  423 + let getDom73 = document.getElementById('3') as HTMLElement;
  424 + getDom73.style.display = 'none';
  425 + let getDom74 = document.getElementById('4') as HTMLElement;
  426 + getDom74.style.display = 'none';
  427 + let getDom75 = document.getElementById('5') as HTMLElement;
  428 + getDom75.style.display = 'none';
  429 + }, 500);
  430 + }
315 removeSchemaByFiled([ 431 removeSchemaByFiled([
316 `kong${field}`, 432 `kong${field}`,
317 `status${field}`, 433 `status${field}`,
@@ -329,6 +445,7 @@ @@ -329,6 +445,7 @@
329 n.value--; 445 n.value--;
330 } 446 }
331 return { 447 return {
  448 + addHideButton,
332 editSelectDevice, 449 editSelectDevice,
333 clearSelectDevice, 450 clearSelectDevice,
334 setFieldsFormValue, 451 setFieldsFormValue,
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 <Button 12 <Button
13 style="margin-left: -99px; margin-top: 5px; display: inline-block" 13 style="margin-left: -99px; margin-top: 5px; display: inline-block"
14 v-if="Number(field) === 0" 14 v-if="Number(field) === 0"
  15 + :style="addHideButton > 1 ? 'display:none' : 'display:inline-block'"
15 @click="add" 16 @click="add"
16 type="primary" 17 type="primary"
17 >+新增执行动作</Button 18 >+新增执行动作</Button
@@ -45,6 +46,8 @@ @@ -45,6 +46,8 @@
45 components: { CollapseContainer, BasicForm, [Input.name]: Input, Button }, 46 components: { CollapseContainer, BasicForm, [Input.name]: Input, Button },
46 props: ['deviceInfo2'], 47 props: ['deviceInfo2'],
47 setup(props) { 48 setup(props) {
  49 + const addHideButton = ref(1);
  50 +
48 const getValueData: any = ref({}); 51 const getValueData: any = ref({});
49 const [ 52 const [
50 registerAction, 53 registerAction,
@@ -112,6 +115,58 @@ @@ -112,6 +115,58 @@
112 }; 115 };
113 const n = ref(1); 116 const n = ref(1);
114 function add() { 117 function add() {
  118 + addHideButton.value++;
  119 + if (addHideButton.value == 3) {
  120 + setTimeout(() => {
  121 + let getDom1 = document.getElementById('1') as HTMLElement;
  122 + getDom1.style.display = 'none';
  123 + }, 500);
  124 + }
  125 + if (addHideButton.value == 4) {
  126 + setTimeout(() => {
  127 + let getDom2 = document.getElementById('2') as HTMLElement;
  128 + getDom2.style.display = 'none';
  129 + let getDom41 = document.getElementById('1') as HTMLElement;
  130 + getDom41.style.display = 'none';
  131 + }, 500);
  132 + }
  133 + if (addHideButton.value == 5) {
  134 + setTimeout(() => {
  135 + let getDom3 = document.getElementById('3') as HTMLElement;
  136 + getDom3.style.display = 'none';
  137 + let getDom51 = document.getElementById('1') as HTMLElement;
  138 + getDom51.style.display = 'none';
  139 + let getDom52 = document.getElementById('2') as HTMLElement;
  140 + getDom52.style.display = 'none';
  141 + }, 500);
  142 + }
  143 + if (addHideButton.value == 6) {
  144 + setTimeout(() => {
  145 + let getDom4 = document.getElementById('4') as HTMLElement;
  146 + getDom4.style.display = 'none';
  147 + let getDom61 = document.getElementById('1') as HTMLElement;
  148 + getDom61.style.display = 'none';
  149 + let getDom62 = document.getElementById('2') as HTMLElement;
  150 + getDom62.style.display = 'none';
  151 + let getDom63 = document.getElementById('3') as HTMLElement;
  152 + getDom63.style.display = 'none';
  153 + }, 500);
  154 + }
  155 + if (addHideButton.value == 7) {
  156 + setTimeout(() => {
  157 + let getDom7 = document.getElementById('5') as HTMLElement;
  158 + getDom7.style.display = 'none';
  159 + let getDom71 = document.getElementById('1') as HTMLElement;
  160 + getDom71.style.display = 'none';
  161 + let getDom72 = document.getElementById('2') as HTMLElement;
  162 + getDom72.style.display = 'none';
  163 + let getDom73 = document.getElementById('3') as HTMLElement;
  164 + getDom73.style.display = 'none';
  165 + let getDom74 = document.getElementById('4') as HTMLElement;
  166 + getDom74.style.display = 'none';
  167 + }, 500);
  168 + }
  169 +
115 appendSchemaByField( 170 appendSchemaByField(
116 { 171 {
117 field: `kong${n.value}`, 172 field: `kong${n.value}`,
@@ -272,6 +327,73 @@ @@ -272,6 +327,73 @@
272 } 327 }
273 328
274 function del(field) { 329 function del(field) {
  330 + addHideButton.value--;
  331 + if (addHideButton.value == 2) {
  332 + setTimeout(() => {
  333 + let getDom1 = document.getElementById('1') as HTMLElement;
  334 + getDom1.style.display = 'flex';
  335 + }, 500);
  336 + }
  337 + if (addHideButton.value == 3) {
  338 + setTimeout(() => {
  339 + let getDom2 = document.getElementById('2') as HTMLElement;
  340 + getDom2.style.display = 'flex';
  341 + let getDom21 = document.getElementById('1') as HTMLElement;
  342 + getDom21.style.display = 'none';
  343 + }, 500);
  344 + }
  345 + if (addHideButton.value == 4) {
  346 + setTimeout(() => {
  347 + let getDom3 = document.getElementById('3') as HTMLElement;
  348 + getDom3.style.display = 'flex';
  349 + let getDom31 = document.getElementById('1') as HTMLElement;
  350 + getDom31.style.display = 'none';
  351 + let getDom32 = document.getElementById('2') as HTMLElement;
  352 + getDom32.style.display = 'none';
  353 + }, 500);
  354 + }
  355 + if (addHideButton.value == 5) {
  356 + setTimeout(() => {
  357 + let getDom4 = document.getElementById('4') as HTMLElement;
  358 + getDom4.style.display = 'flex';
  359 + let getDom41 = document.getElementById('1') as HTMLElement;
  360 + getDom41.style.display = 'none';
  361 + let getDom42 = document.getElementById('2') as HTMLElement;
  362 + getDom42.style.display = 'none';
  363 + let getDom43 = document.getElementById('3') as HTMLElement;
  364 + getDom43.style.display = 'none';
  365 + }, 500);
  366 + }
  367 + if (addHideButton.value == 6) {
  368 + setTimeout(() => {
  369 + let getDom5 = document.getElementById('5') as HTMLElement;
  370 + getDom5.style.display = 'flex';
  371 + let getDom51 = document.getElementById('1') as HTMLElement;
  372 + getDom51.style.display = 'none';
  373 + let getDom52 = document.getElementById('2') as HTMLElement;
  374 + getDom52.style.display = 'none';
  375 + let getDom53 = document.getElementById('3') as HTMLElement;
  376 + getDom53.style.display = 'none';
  377 + let getDom54 = document.getElementById('4') as HTMLElement;
  378 + getDom54.style.display = 'none';
  379 + }, 500);
  380 + }
  381 + if (addHideButton.value == 7) {
  382 + setTimeout(() => {
  383 + let getDom7 = document.getElementById('6') as HTMLElement;
  384 + getDom7.style.display = 'flex';
  385 + let getDom71 = document.getElementById('1') as HTMLElement;
  386 + getDom71.style.display = 'none';
  387 + let getDom72 = document.getElementById('2') as HTMLElement;
  388 + getDom72.style.display = 'none';
  389 + let getDom73 = document.getElementById('3') as HTMLElement;
  390 + getDom73.style.display = 'none';
  391 + let getDom74 = document.getElementById('4') as HTMLElement;
  392 + getDom74.style.display = 'none';
  393 + let getDom75 = document.getElementById('5') as HTMLElement;
  394 + getDom75.style.display = 'none';
  395 + }, 500);
  396 + }
275 removeSchemaByFiled([ 397 removeSchemaByFiled([
276 `kong${field}`, 398 `kong${field}`,
277 `outTarget${field}`, 399 `outTarget${field}`,
@@ -288,6 +410,7 @@ @@ -288,6 +410,7 @@
288 } 410 }
289 411
290 return { 412 return {
  413 + addHideButton,
291 editSelectDevice, 414 editSelectDevice,
292 clearSelectDevice, 415 clearSelectDevice,
293 setFieldsFormValue, 416 setFieldsFormValue,
@@ -19,17 +19,15 @@ @@ -19,17 +19,15 @@
19 >+新增触发器</Button 19 >+新增触发器</Button
20 > 20 >
21 <Button 21 <Button
22 - style="margin-left: 5px; margin-top: 35px"  
23 - :style="addHideButton >= 2 ? 'display:inline-block' : 'display:none'"  
24 v-if="Number(field) > 0" 22 v-if="Number(field) > 0"
  23 + style="margin-left: 5px; margin-top: 35px"
25 @click="add" 24 @click="add"
26 type="primary" 25 type="primary"
27 >+新增触发器</Button 26 >+新增触发器</Button
28 > 27 >
29 <Button 28 <Button
30 - style="margin-left: 10px"  
31 - :style="addHideButton >= 2 ? 'display:inline-block' : 'display:none'"  
32 v-if="Number(field) > 0" 29 v-if="Number(field) > 0"
  30 + style="margin-left: 10px"
33 @click="del(field)" 31 @click="del(field)"
34 type="primary" 32 type="primary"
35 >删除</Button 33 >删除</Button
@@ -139,11 +137,73 @@ @@ -139,11 +137,73 @@
139 function add() { 137 function add() {
140 addHideButton.value++; 138 addHideButton.value++;
141 addHideButtonTemp.value = addHideButton.value; 139 addHideButtonTemp.value = addHideButton.value;
142 - addHideButtonTemp.value--;  
143 - const getS = document.getElementById('1') as HTMLElement;  
144 - // getS.setAttribute('style', 'display:none');  
145 - console.log(getS);  
146 - getS.hidden = true; 140 + addHideButtonTemp.value -= 2;
  141 + if (addHideButton.value == 3) {
  142 + setTimeout(() => {
  143 + let getDom1 = document.getElementById('1') as HTMLElement;
  144 + getDom1.style.display = 'none';
  145 + }, 500);
  146 + }
  147 + if (addHideButton.value == 4) {
  148 + setTimeout(() => {
  149 + let getDom2 = document.getElementById('2') as HTMLElement;
  150 + getDom2.style.display = 'none';
  151 + let getDom41 = document.getElementById('1') as HTMLElement;
  152 + getDom41.style.display = 'none';
  153 + }, 500);
  154 + }
  155 + if (addHideButton.value == 5) {
  156 + setTimeout(() => {
  157 + let getDom3 = document.getElementById('3') as HTMLElement;
  158 + getDom3.style.display = 'none';
  159 + let getDom51 = document.getElementById('1') as HTMLElement;
  160 + getDom51.style.display = 'none';
  161 + let getDom52 = document.getElementById('2') as HTMLElement;
  162 + getDom52.style.display = 'none';
  163 + }, 500);
  164 + }
  165 + if (addHideButton.value == 6) {
  166 + setTimeout(() => {
  167 + let getDom4 = document.getElementById('4') as HTMLElement;
  168 + getDom4.style.display = 'none';
  169 + let getDom61 = document.getElementById('1') as HTMLElement;
  170 + getDom61.style.display = 'none';
  171 + let getDom62 = document.getElementById('2') as HTMLElement;
  172 + getDom62.style.display = 'none';
  173 + let getDom63 = document.getElementById('3') as HTMLElement;
  174 + getDom63.style.display = 'none';
  175 + }, 500);
  176 + }
  177 + if (addHideButton.value == 7) {
  178 + setTimeout(() => {
  179 + let getDom7 = document.getElementById('5') as HTMLElement;
  180 + getDom7.style.display = 'none';
  181 + let getDom71 = document.getElementById('1') as HTMLElement;
  182 + getDom71.style.display = 'none';
  183 + let getDom72 = document.getElementById('2') as HTMLElement;
  184 + getDom72.style.display = 'none';
  185 + let getDom73 = document.getElementById('3') as HTMLElement;
  186 + getDom73.style.display = 'none';
  187 + let getDom74 = document.getElementById('4') as HTMLElement;
  188 + getDom74.style.display = 'none';
  189 + }, 500);
  190 + }
  191 + if (addHideButton.value == 8) {
  192 + setTimeout(() => {
  193 + let getDom8 = document.getElementById('6') as HTMLElement;
  194 + getDom8.style.display = 'none';
  195 + let getDom81 = document.getElementById('1') as HTMLElement;
  196 + getDom81.style.display = 'none';
  197 + let getDom82 = document.getElementById('2') as HTMLElement;
  198 + getDom82.style.display = 'none';
  199 + let getDom83 = document.getElementById('3') as HTMLElement;
  200 + getDom83.style.display = 'none';
  201 + let getDom84 = document.getElementById('4') as HTMLElement;
  202 + getDom84.style.display = 'none';
  203 + let getDom85 = document.getElementById('5') as HTMLElement;
  204 + getDom85.style.display = 'none';
  205 + }, 500);
  206 + }
147 207
148 appendSchemaByField( 208 appendSchemaByField(
149 { 209 {
@@ -365,6 +425,90 @@ @@ -365,6 +425,90 @@
365 425
366 function del(field) { 426 function del(field) {
367 addHideButton.value--; 427 addHideButton.value--;
  428 + if (addHideButton.value == 2) {
  429 + setTimeout(() => {
  430 + let getDom1 = document.getElementById('1') as HTMLElement;
  431 + getDom1.style.display = 'flex';
  432 + }, 500);
  433 + }
  434 + if (addHideButton.value == 3) {
  435 + setTimeout(() => {
  436 + let getDom2 = document.getElementById('2') as HTMLElement;
  437 + getDom2.style.display = 'flex';
  438 + let getDom21 = document.getElementById('1') as HTMLElement;
  439 + getDom21.style.display = 'none';
  440 + }, 500);
  441 + }
  442 + if (addHideButton.value == 4) {
  443 + setTimeout(() => {
  444 + let getDom3 = document.getElementById('3') as HTMLElement;
  445 + getDom3.style.display = 'flex';
  446 + let getDom31 = document.getElementById('1') as HTMLElement;
  447 + getDom31.style.display = 'none';
  448 + let getDom32 = document.getElementById('2') as HTMLElement;
  449 + getDom32.style.display = 'none';
  450 + }, 500);
  451 + }
  452 + if (addHideButton.value == 5) {
  453 + setTimeout(() => {
  454 + let getDom4 = document.getElementById('4') as HTMLElement;
  455 + getDom4.style.display = 'flex';
  456 + let getDom41 = document.getElementById('1') as HTMLElement;
  457 + getDom41.style.display = 'none';
  458 + let getDom42 = document.getElementById('2') as HTMLElement;
  459 + getDom42.style.display = 'none';
  460 + let getDom43 = document.getElementById('3') as HTMLElement;
  461 + getDom43.style.display = 'none';
  462 + }, 500);
  463 + }
  464 + if (addHideButton.value == 6) {
  465 + setTimeout(() => {
  466 + let getDom5 = document.getElementById('5') as HTMLElement;
  467 + getDom5.style.display = 'flex';
  468 + let getDom51 = document.getElementById('1') as HTMLElement;
  469 + getDom51.style.display = 'none';
  470 + let getDom52 = document.getElementById('2') as HTMLElement;
  471 + getDom52.style.display = 'none';
  472 + let getDom53 = document.getElementById('3') as HTMLElement;
  473 + getDom53.style.display = 'none';
  474 + let getDom54 = document.getElementById('4') as HTMLElement;
  475 + getDom54.style.display = 'none';
  476 + }, 500);
  477 + }
  478 + if (addHideButton.value == 7) {
  479 + setTimeout(() => {
  480 + let getDom7 = document.getElementById('6') as HTMLElement;
  481 + getDom7.style.display = 'flex';
  482 + let getDom71 = document.getElementById('1') as HTMLElement;
  483 + getDom71.style.display = 'none';
  484 + let getDom72 = document.getElementById('2') as HTMLElement;
  485 + getDom72.style.display = 'none';
  486 + let getDom73 = document.getElementById('3') as HTMLElement;
  487 + getDom73.style.display = 'none';
  488 + let getDom74 = document.getElementById('4') as HTMLElement;
  489 + getDom74.style.display = 'none';
  490 + let getDom75 = document.getElementById('5') as HTMLElement;
  491 + getDom75.style.display = 'none';
  492 + }, 500);
  493 + }
  494 + if (addHideButton.value == 8) {
  495 + setTimeout(() => {
  496 + let getDom8 = document.getElementById('7') as HTMLElement;
  497 + getDom8.style.display = 'flex';
  498 + let getDom81 = document.getElementById('1') as HTMLElement;
  499 + getDom81.style.display = 'none';
  500 + let getDom82 = document.getElementById('2') as HTMLElement;
  501 + getDom82.style.display = 'none';
  502 + let getDom83 = document.getElementById('3') as HTMLElement;
  503 + getDom83.style.display = 'none';
  504 + let getDom84 = document.getElementById('4') as HTMLElement;
  505 + getDom84.style.display = 'none';
  506 + let getDom85 = document.getElementById('5') as HTMLElement;
  507 + getDom85.style.display = 'none';
  508 + let getDom86 = document.getElementById('6') as HTMLElement;
  509 + getDom86.style.display = 'none';
  510 + }, 500);
  511 + }
368 removeSchemaByFiled([ 512 removeSchemaByFiled([
369 `kong${field}`, 513 `kong${field}`,
370 `tiggerEvent${field}`, 514 `tiggerEvent${field}`,