浏览代码

提交代码

朱鑫波 4 年之前
父节点
当前提交
669f79dfcb

+ 0 - 1
src/components/formComponents/checkBoxGroup.vue

@@ -211,7 +211,6 @@ export default {
       }
     },
     selectedVal(n, o) {
-      console.log(n, o)
       if (this.radioStyle && !this.allValue) {
         if (n.length == 0) {
           this.selectedVal = o

+ 2 - 2
src/views/modules/earlyWarningRules/configRules.vue

@@ -590,7 +590,7 @@ export default {
                                     if(res.success){
                                         
                                         this.$router.push('/earlyWarningRules/index')
-                                        this.$bus.$emit('remove', '/earlyWarningRules/configRules')
+                                        this.$bus.$emit('remove', `/earlyWarningRules/configRules?id=${this.currentRuleId}`)
                                     }else{
                                         this.$message.error(res.message)
                                     }
@@ -598,7 +598,7 @@ export default {
                                 })
                             }else{
                                 this.$router.push('/earlyWarningRules/index')
-                                this.$bus.$emit('remove', '/earlyWarningRules/configRules')
+                                this.$bus.$emit('remove', `/earlyWarningRules/configRules?id=${this.currentRuleId}`)
                             }
                             
                         }else{

+ 1 - 1
src/views/modules/earlyWarningRules/index.vue

@@ -240,7 +240,7 @@ export default {
         },
         editRule(record){
             console.log(record);
-            this.$router.push(`/earlyWarningRules/configRules?id=${record.id}&edit=true`)
+            this.$router.push(`/earlyWarningRules/configRules?id=${record.id}`)
         },
         // recordsRule(record){
         //     console.log(record);

+ 105 - 24
src/views/modules/earlyWarningRules/ruleModule.vue

@@ -46,7 +46,7 @@
                     </div>
                     <div class="label-item">
                       <div class="text-item">{{ item.groupName }}</div>
-                      <div class="required-item"></div>
+                      <div class="required-item" v-if="item.isRequired == 1"></div>
                     </div>
                     <div class="input-item">
                       <a-form-model-item
@@ -55,7 +55,7 @@
                         :ref="value.indicatorCode + valueIndex"
                         :prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
                         :rules="{
-                          required: true,
+                          required: item.isRequired == 1 ? true : false,
                           message: `${item.groupName}必填`,
                           trigger: value.dataType == 'array' ? 'change' : 'blur',
                         }"
@@ -75,7 +75,14 @@
                           v-model="value.threshold"
                           style="width: 300px; margin-right: 5px"
                           :code="value.dictId"
-                          :multiple="value.dataType == 'string' ? false : true"
+                          :multiple="
+                            value.dataType == 'string' ||
+                            value.dataType == 'number' ||
+                            value.indicatorCode == 'presentedVideo' ||
+                            value.indicatorCode == 'hideIfExists'
+                              ? false
+                              : true
+                          "
                           v-else-if="value.modelType == 'select'"
                         />
                         <!-- <selectGroup
@@ -89,7 +96,14 @@
                           style="width: 100%; margin-right: 5px"
                           :code="value.dictId"
                           :allValue="true"
-                          :radioStyle="value.dataType == 'string' ? true : false"
+                          :radioStyle="
+                            value.dataType == 'string' ||
+                            value.dataType == 'number' ||
+                            value.indicatorCode == 'presentedVideo' ||
+                            value.indicatorCode == 'hideIfExists'
+                              ? true
+                              : false
+                          "
                           v-else-if="value.modelType == 'checkBox'"
                         />
                         <a-select
@@ -118,7 +132,7 @@
                     </div>
                     <div class="label-item">
                       <div class="text-item">{{ item.groupName }}</div>
-                      <div class="required-item"></div>
+                      <div class="required-item" v-if="item.isRequired == 1"></div>
                     </div>
                     <div class="input-item">
                       <div class="toolbox-automate-rules-create-content_rules-and-condition_rules">
@@ -140,15 +154,17 @@
                                       :ref="value.indicatorCode + valueIndex"
                                       :prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
                                       :rules="{
-                                        required: true,
+                                        required: item.isRequired == 1 ? true : false,
                                         message: `${value.name}必填`,
                                         trigger: 'blur',
                                       }"
                                       v-if="value.modelType == 'numberText'"
                                     >
-                                      <a-input-number style="width: 100px; margin-right: 5px" v-model="value.threshold" :min="0" />{{
-                                        value.dataUnit
-                                      }}
+                                      <a-input-number
+                                        style="width: 100px; margin-right: 5px"
+                                        v-model="value.threshold"
+                                        :min="0"
+                                      />{{ value.dataUnit }}
                                     </a-form-model-item>
                                     <a-form-model-item
                                       :label-col="{ span: 6 }"
@@ -157,7 +173,7 @@
                                       :ref="value.indicatorCode + valueIndex"
                                       :prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
                                       :rules="{
-                                        required: true,
+                                        required: item.isRequired == 1 ? true : false,
                                         message: `${value.name}必填`,
                                         trigger: 'blur',
                                       }"
@@ -172,7 +188,7 @@
                                       :ref="value.indicatorCode + valueIndex"
                                       :prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
                                       :rules="{
-                                        required: true,
+                                        required: item.isRequired == 1 ? true : false,
                                         message: `${value.name}必选`,
                                         trigger: 'change',
                                       }"
@@ -181,7 +197,14 @@
                                       <selectGroup
                                         v-model="value.threshold"
                                         :code="value.dictId"
-                                        :multiple="value.dataType == 'string' ? false : true"
+                                        :multiple="
+                                          value.dataType == 'string' ||
+                                          value.dataType == 'number' ||
+                                          value.indicatorCode == 'presentedVideo' ||
+                                          value.indicatorCode == 'hideIfExists'
+                                            ? false
+                                            : true
+                                        "
                                         style="width: 95%"
                                         @clearValidate="clearAll"
                                       />
@@ -193,7 +216,7 @@
                                       :ref="value.indicatorCode + valueIndex"
                                       :prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
                                       :rules="{
-                                        required: true,
+                                        required: item.isRequired == 1 ? true : false,
                                         message: `${value.name}必选`,
                                         trigger: 'change',
                                       }"
@@ -206,6 +229,7 @@
                                         v-model="value.threshold"
                                         dropdownClassName="display-none-selset"
                                         :token-separators="[',', ' ', ',']"
+                                        :maxTagCount="3"
                                       >
                                       </a-select>
                                     </a-form-model-item>
@@ -229,7 +253,7 @@
                     </div>
                     <div class="label-item">
                       <div class="text-item">{{ item.groupName }}</div>
-                      <div class="required-item"></div>
+                      <div class="required-item" v-if="item.isRequired == 1"></div>
                     </div>
                     <div class="input-item">
                       <div class="toolbox-automate-rules-create-content_rules-and-condition_rules">
@@ -259,15 +283,17 @@
                                         '.threshold'
                                       "
                                       :rules="{
-                                        required: true,
+                                        required: item.isRequired == 1 ? true : false,
                                         message: `${value.name}必填`,
                                         trigger: 'blur',
                                       }"
                                       v-if="value.modelType == 'numberText'"
                                     >
-                                      <a-input-number style="width:100px; margin-right: 5px" v-model="value.threshold" :min="0" />{{
-                                        value.dataUnit
-                                      }}
+                                      <a-input-number
+                                        style="width: 100px; margin-right: 5px"
+                                        v-model="value.threshold"
+                                        :min="0"
+                                      />{{ value.dataUnit }}
                                     </a-form-model-item>
                                     <a-form-model-item
                                       :label-col="{ span: 6 }"
@@ -284,7 +310,7 @@
                                         '.threshold'
                                       "
                                       :rules="{
-                                        required: true,
+                                        required: item.isRequired == 1 ? true : false,
                                         message: `${value.name}必填`,
                                         trigger: 'blur',
                                       }"
@@ -307,7 +333,7 @@
                                         '.threshold'
                                       "
                                       :rules="{
-                                        required: true,
+                                        required: item.isRequired == 1 ? true : false,
                                         message: `${value.name}必选`,
                                         trigger: 'change',
                                       }"
@@ -316,7 +342,14 @@
                                       <selectGroup
                                         v-model="value.threshold"
                                         :code="value.dictId"
-                                        :multiple="value.dataType == 'string' ? false : true"
+                                        :multiple="
+                                          value.dataType == 'string' ||
+                                          value.dataType == 'number' ||
+                                          value.indicatorCode == 'presentedVideo' ||
+                                          value.indicatorCode == 'hideIfExists'
+                                            ? false
+                                            : true
+                                        "
                                         style="width: 95%"
                                         @clearValidate="clearAll"
                                       />
@@ -336,7 +369,7 @@
                                         '.threshold'
                                       "
                                       :rules="{
-                                        required: true,
+                                        required: item.isRequired == 1 ? true : false,
                                         message: `${value.name}必选`,
                                         trigger: 'change',
                                       }"
@@ -349,6 +382,7 @@
                                         v-model="value.threshold"
                                         dropdownClassName="display-none-selset"
                                         :token-separators="[',', ' ', ',']"
+                                        :maxTagCount="3"
                                       >
                                       </a-select>
                                     </a-form-model-item>
@@ -925,6 +959,7 @@ export default {
           }
           this.saveLoading = true
 
+          console.log(params)
           postAction('/ruleAccountThreshold/fillThreshold', params).then((res) => {
             if (res.success) {
               this.saveLoading = false
@@ -933,8 +968,7 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
-          this.$message.error('请按提示填写必填项目!')
+          this.$message.error('请按提示填写必填项!')
           return false
         }
       })
@@ -1042,6 +1076,31 @@ export default {
       }).then((res) => {
         if (res.success) {
           this.form = res.result
+
+          var data = this.form.ruleList.map((item) => {
+            return {
+              ...item,
+              ruleDetail: item.ruleDetail.map((end) => {
+                if (isArray(end)) {
+                  var data = end.map((c) => {
+                    return {
+                      ...c,
+                      threshold:
+                        c.modelType == 'tagBox' ? (c.threshold == null ? undefined : c.threshold) : c.threshold,
+                    }
+                  })
+                  return [...data]
+                } else {
+                  return {
+                    ...end,
+                    threshold:
+                      end.modelType == 'tagBox' ? (end.threshold == null ? undefined : end.threshold) : end.threshold,
+                  }
+                }
+              }),
+            }
+          })
+          this.form.ruleList = data
           this.spinLoading = false
         } else {
           this.spinLoading = false
@@ -1052,6 +1111,28 @@ export default {
       getAction('/ruleTemplate/previewTemplate', { id: data.id }).then((res) => {
         if (res.success) {
           this.form = res.result
+          var data = this.form.ruleList.map((item) => {
+            return {
+              ...item,
+              ruleDetail: item.ruleDetail.map((end) => {
+                if (isArray(end)) {
+                  var data = end.map((c) => {
+                    return {
+                      ...c,
+                      threshold: c.modelType == 'tagBox' ? undefined : end.threshold,
+                    }
+                  })
+                  return [...data]
+                } else {
+                  return {
+                    ...end,
+                    threshold: end.modelType == 'tagBox' ? undefined : end.threshold,
+                  }
+                }
+              }),
+            }
+          })
+          this.form.ruleList = data
           this.spinLoading = false
         } else {
           this.spinLoading = false

+ 7 - 6
src/views/modules/earlyWarningRules/useRuleList.vue

@@ -60,8 +60,8 @@
           <span slot="optionsTwo" slot-scope="text, record">
             <a href="javascript:;" @click="editRule(record)">编辑模板</a>
             <a-divider type="vertical" />
-            <a-popconfirm :title="`当前模板关联账户个数为${relationCount},确定删除吗?`" @confirm="deleteRule(record)">
-              <a href="javascript:;" @click.stop="showRelativeCount(record)">删除模板</a>
+            <a-popconfirm :title="`当前删除会解除此账户绑定模板,确定删除吗?`" @confirm="deleteRule(record)">
+              <a href="javascript:;">删除模板</a>
             </a-popconfirm>
           </span>
         </a-table>
@@ -84,7 +84,7 @@
 
 <script>
 import moment from 'moment'
-import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
+import { getAction, postAction, downFile, downFilePost, deleteAction } from '@/api/manage'
 let existColumns = [
   // {
   //     title: '运行/暂停',
@@ -283,7 +283,7 @@ export default {
             })
           } else {
             this.accountId = ''
-            this.$message.error(res.message)
+            this.$message.error(`此账户下已绑定模板${res.result.templateName},请重新选择账户`)
             this.confirmLoading = false
           }
         } else {
@@ -304,6 +304,7 @@ export default {
         console.log(res)
         if (res.success) {
           this.relationCount = res.result.relationCount
+
           // getAction(this.url.delete,{
           //     id:record.id
           // }).then(res=>{
@@ -319,11 +320,11 @@ export default {
     },
     deleteRule(record) {
       console.log(record)
-      getAction(this.url.getRelationAccountById, {
+      deleteAction('/ruleAccountTemplate/delete', {
         id: record.id,
       }).then((res) => {
-        console.log(res)
         if (res.success) {
+          this.getTableListHttp('/ruleAccountTemplate/getTemplateApplied')
           // getAction(this.url.delete,{
           //     id:record.id
           // }).then(res=>{