|
|
@@ -217,7 +217,7 @@ export default {
|
|
|
let pcClientEnabled = this.ruleForm.PC_CLIENT_ENABLED;
|
|
|
if (pcClientEnabled) {
|
|
|
let reg = /^[1-9][0-9]*$/;
|
|
|
- if (!value.match(reg) || value < 5 || value > 20) {
|
|
|
+ if (!new String(value).match(reg) || value < 5 || value > 20) {
|
|
|
return callback(new Error("范围5至20之间"));
|
|
|
}
|
|
|
}
|
|
|
@@ -395,8 +395,17 @@ export default {
|
|
|
if (params.properties.PC_CLIENT_ENABLED) {
|
|
|
params.properties.ACTION_ALERT = this.ruleForm.ACTION_ALERT;
|
|
|
params.properties.ACTION_NUM = this.ruleForm.ACTION_NUM;
|
|
|
- params.properties.ACTION_OPTIONS =
|
|
|
- this.ruleForm.ACTION_OPTIONS.join(",");
|
|
|
+
|
|
|
+ // 固定动作顺序
|
|
|
+ let finalActionOptions = [];
|
|
|
+ for (let n = 0; n < ACTION_OPTION_LIST.length; n++) {
|
|
|
+ let code = ACTION_OPTION_LIST[n].code;
|
|
|
+ if (this.ruleForm.ACTION_OPTIONS.indexOf(code) > -1) {
|
|
|
+ finalActionOptions.push(code);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ params.properties.ACTION_OPTIONS = finalActionOptions.join(",");
|
|
|
+
|
|
|
params.properties.ACTION_ORDER = this.ruleForm.ACTION_ORDER;
|
|
|
params.properties.ACTION_DURATION = this.ruleForm.ACTION_DURATION;
|
|
|
}
|
deason