Commit b4676b5fd1eb7bd943bbf0bac87ac59c5d2eaf9c

Authored by 1400859700@qq.com
1 parent d20550a7

fix

@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 75
76 const schema: DescItem[] = [ 76 const schema: DescItem[] = [
77 { 77 {
78 - field: 'creator', 78 + field: 'username',
79 label: '用户名称:', 79 label: '用户名称:',
80 }, 80 },
81 { 81 {
@@ -5,7 +5,6 @@ import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi'; @@ -5,7 +5,6 @@ import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
5 import { ref } from 'vue'; 5 import { ref } from 'vue';
6 import { findDictItemByCode } from '/@/api/system/dict'; 6 import { findDictItemByCode } from '/@/api/system/dict';
7 import { alarmContactGetPage } from '/@/api/device/deviceConfigApi'; 7 import { alarmContactGetPage } from '/@/api/device/deviceConfigApi';
8 -import { isWhereTypeValueDisabled } from './DeviceProfileStep3.vue';  
9 8
10 export const step1Schemas: FormSchema[] = [ 9 export const step1Schemas: FormSchema[] = [
11 { 10 {
@@ -153,40 +152,38 @@ export const step3CreateAlarm: FormSchema[] = [ @@ -153,40 +152,38 @@ export const step3CreateAlarm: FormSchema[] = [
153 colProps: { 152 colProps: {
154 span: 16, 153 span: 16,
155 }, 154 },
156 - componentProps({ formModel, formActionType }) {  
157 - console.log(formModel.default);  
158 - return {  
159 - filterOptions: (i, v) => {  
160 - console.log(i, v); 155 + componentProps({ formModel }) {
  156 + const optionsFilter = [
  157 + {
  158 + value: 'CRITICAL',
  159 + label: '危险',
  160 + // disabled: formModel.default == 'CRITICAL',
  161 + },
  162 + {
  163 + value: 'MAJOR',
  164 + label: '重要',
  165 + // disabled: formModel.default == 'MAJOR',
  166 + },
  167 + {
  168 + value: 'MINOR',
  169 + label: '次要',
  170 + // disabled: formModel.default == 'MINOR',
161 }, 171 },
  172 + {
  173 + value: 'WARNING',
  174 + label: '警告',
  175 + // disabled: formModel.default == 'WARNING',
  176 + },
  177 + {
  178 + value: 'INDETERMINATE',
  179 + label: '不确定',
  180 + // disabled: formModel.default == 'INDETERMINATE',
  181 + },
  182 + ];
  183 + const newOptions = optionsFilter.filter((f) => f.value != formModel.default);
  184 + return {
162 placeholder: '请选择严重程度', 185 placeholder: '请选择严重程度',
163 - options: [  
164 - {  
165 - value: 'CRITICAL',  
166 - label: '危险',  
167 - disabled: formModel.default == 'CRITICAL',  
168 - },  
169 - {  
170 - value: 'MAJOR',  
171 - label: '重要',  
172 - disabled: formModel.default == 'MAJOR',  
173 - },  
174 - {  
175 - value: 'MINOR',  
176 - label: '次要',  
177 - // disabled: formModel.default == 'MINOR',  
178 - },  
179 - {  
180 - value: 'WARNING',  
181 - label: '警告',  
182 - // disabled: formModel.default == 'WARNING',  
183 - },  
184 - {  
185 - value: 'INDETERMINATE',  
186 - label: '不确定',  
187 - // disabled: formModel.default == 'INDETERMINATE',  
188 - },  
189 - ], 186 + options: newOptions.length == 0 ? optionsFilter : newOptions,
190 onChange: (v) => { 187 onChange: (v) => {
191 // const newFiletr = [ 188 // const newFiletr = [
192 // { 189 // {