Merge branch 'develop' into single-develop

src/views/ems/dzjk/clpz/xftg/AddTemplate.vue

@@ -262,28 +262,6 @@ export default {
     saveDialog() {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
-        //校验时间选择范围是否冲突
-        let status = true
-        this.tableData.forEach((outer, outerIndex) => {
-          const {startTime, endTime} = outer
-          const outerStart = parseInt(startTime), outerEnd = parseInt(endTime)
-          if (outerStart > outerEnd) {
-            status = false
-          } else {
-            this.tableData.forEach((inner, innerIndex) => {
-              if (innerIndex !== outerIndex) {
-                const {startTime: innerStartTime, endTime: innerEndTime} = inner
-                const innerStart = parseInt(innerStartTime), innerEnd = parseInt(innerEndTime)
-                if ((innerStart < outerStart && innerEnd > outerEnd) || !((innerStart < outerStart && innerEnd <= outerStart) || (innerStart >= outerEnd && innerEnd > outerEnd))) {
-                  status = false
-                }
-              }
-            })
-          }
-        })
-        if (!status) {
-          return this.$message.error('时间选择范围冲突');
-        }
         const {templateName, sdcLimit, sdcDown, sdcUp} = this.formData
         const {siteId, updateStrategyId} = this.$home
         const {tableData} = this