Merge branch 'master' of http://116.63.33.55/git/industry-data-platform

industry-admin/src/views/report/reportTablePolicy/reportDataPolicy.vue

@@ -151,7 +151,7 @@
                   </el-checkbox-group>
                 </el-form-item>
                 <el-form-item label="时间域" prop="valuePeriod">
-                  <el-time-picker style="width: 100%" is-range :clearable="false" :editable="false"
+                  <el-time-picker style="width: 100%" is-range :clearable="true" :editable="true"
                                   v-model="reportDataPolicyRateForm.valuePeriod"
                                   :picker-options="{ format: 'HH:mm:ss', }" value-format="HH:mm:ss"
                                   range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"

industry-admin/src/views/report/runConfig/timeConfig.vue

@@ -27,8 +27,8 @@
                     <el-form-item label="指定时间">
                         <el-radio :label="4" :disabled="disabled">
                             <span style="margin-right: 10px">在每天的</span>
-                            <el-time-picker v-model="radioByCronValD" size="mini" placeholder="请选择时间" :clearable="false"
-                                :editable="false" value-format="HH:mm:ss" :picker-options="{ format: 'HH:mm:ss', }" :disabled="disabled">
+                            <el-time-picker v-model="radioByCronValD" size="mini" placeholder="请选择时间" :clearable="true"
+                                :editable="true" value-format="HH:mm:ss" :picker-options="{ format: 'HH:mm:ss', }" :disabled="disabled">
                             </el-time-picker>
                             <span style="margin-left: 10px">执行一次</span>
                         </el-radio>
@@ -40,7 +40,7 @@
                                 :precision="0" :disabled="disabled"></el-input-number>
                             <span style="margin-right: 10px; margin-left: 10px">号的</span>
                             <el-time-picker v-model="radioByCronValMoD" size="mini" placeholder="请选择时间"
-                                :clearable="false" :editable="false" value-format="HH:mm:ss"
+                                :clearable="true" :editable="true" value-format="HH:mm:ss"
                                 :picker-options="{ format: 'HH:mm:ss', }" :disabled="disabled">
                             </el-time-picker>
                             <span style="margin-left: 10px">执行一次</span>

industry-admin/src/views/source/itemGroup/item.vue

@@ -14,8 +14,11 @@
                    style="float: right;">批量删除
         </el-button>
         <el-button type="primary" icon="el-icon-s-tools" size="mini" @click="multipleModelItemEvent"
-                   style="float: right; margin-right: 15px;" title="未勾选点位则设置所有点位的数据计算模型">批量设置计算模型
+                   style="float: right; margin-right: 15px;">批量设置计算模型
         </el-button>
+<!--        <el-button type="primary" icon="el-icon-s-tools" size="mini" @click="multipleModelItemEvent"
+                   style="float: right; margin-right: 15px;" title="未勾选点位则设置所有点位的数据计算模型">批量设置计算模型
+        </el-button>-->
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="addGroupItemEvent"
                    style="float: right; margin-right: 5px;">添加点位
         </el-button>

industry-admin/src/views/source/itemGroup/itemChooseTree.vue

@@ -67,6 +67,8 @@
                         :render="renderTree" :checkable="true" :selectable="true"
                         :filterMethod="filterLabelEvent"
                         @click="handleLabelNodeClick2"
+                        @check="handleCheckBoxChecked"
+                        @uncheck="handleCheckBoxUnchecked"
                         @selected-change="handleLabelNodeSelected"></c-tree>
               </div>
               <el-divider content-position="left" style="margin-bottom: 15px !important">
@@ -152,6 +154,7 @@ export default {
     filterLabelText(val) {
       // this.$refs.itemTree.filter(val);
 	    this.$refs.cTree.filter(val)
+      this.handleCheckAllLabelChange(false)
       this.searchCountChildrenLeaf(val)
     },
   },
@@ -460,6 +463,18 @@ export default {
 	    }
 	    return tree;
 	},
+
+  handleCheckBoxChecked(d){
+    // 扁平化后的节点数据
+    const treeNodes = this.$refs.cTree.getFlatData()
+    const size = treeNodes.filter(v => !v.checked).length;
+    if(size === 0){
+      this.checkChangeAllLabel(true)
+    }
+  },
+  handleCheckBoxUnchecked(d){
+    this.checkChangeAllLabel(false)
+  },
   handleLabelNodeSelected(d){
     if(d){
       if(this.filterLabelText){
@@ -533,13 +548,17 @@ export default {
     handleCheckAllLabelChange(flag){
       if(flag){
         this.$refs.cTree.checkAll()
+        this.checkChangeAllLabel(true)
       }else{
         this.$refs.cTree.clearChecked()
+        this.checkChangeAllLabel(false)
       }
     },
     /** 是否全部选中 */
     checkChangeAllLabel(flag) {
-      this.isSelectAllLabel = flag;
+      if(this.isSelectAllLabel !== flag){
+        this.isSelectAllLabel = flag;
+      }
     },
     /** 全选叶节点事件 */
     handleCheckAllLeavesChange(flag) {

industry-admin/src/views/system/log/index.vue

@@ -43,7 +43,7 @@
               v-model="queryParams.changeTime"
               value-format="yyyy-MM-dd HH:mm:ss"
               type="daterange"
-              :editable="false"
+              :editable="true"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"

industry-admin/src/views/system/operationLog/index.vue

@@ -52,7 +52,7 @@
               v-model="queryParams.changeTime"
               value-format="yyyy-MM-dd HH:mm:ss"
               type="daterange"
-              :editable="false"
+              :editable="true"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/chart-right-window.js

@@ -1165,9 +1165,9 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 							<input type="radio" name="bucketType" value="3" title="分" lay-filter="chart-hand-bucket-type">
 							<input type="radio" name="bucketType" value="4" title="秒" lay-filter="chart-hand-bucket-type"> 
 						</div>
-						<div class="cr-form-label">切换周期：</div>
+						<div class="cr-form-label">数据周期：</div>
 						<div class="layui-form-item">
-							<input name="bucketValue" type="number" lay-affix="number" value="1" placeholder="切换周期" step="1" min="1" 
+							<input name="bucketValue" type="number" lay-affix="number" value="1" placeholder="数据周期" step="1" min="1" 
 							class="layui-input chart-hand-bucket-value" lay-filter="chart-hand-bucket-value" />
 						</div>
 						<div class="cr-form-label">时间范围：</div>
@@ -1215,9 +1215,9 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 								<input type="radio" name="bucketType" value="3" title="分" lay-filter="bucket-type">
 								<input type="radio" name="bucketType" value="4" title="秒" lay-filter="bucket-type"> 
 							</div>
-							<div class="cr-form-label">切换周期：</div>
+							<div class="cr-form-label">数据周期：</div>
 							<div class="layui-form-item">
-								<input name="bucketValue" lay-filter="bucket-value" type="number" lay-affix="number" value="1" placeholder="切换周期" step="1" min="1" class="layui-input bucket-value">
+								<input name="bucketValue" lay-filter="bucket-value" type="number" lay-affix="number" value="1" placeholder="数据周期" step="1" min="1" class="layui-input bucket-value">
 							</div>
 							<div class="cr-form-label">数据区域时间范围：</div>
 							<div class="layui-form-item chart-setting-data-time">

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/sheet-util.js

@@ -325,7 +325,7 @@ layui.define(function(exports) {
 		},
 		checkAutoSheet: function(data) {
 			if (!data.bucketValue || parseInt(data.bucketValue) < 1) {
-				layer.msg('请设置正确的切换周期！', {icon: 2})
+				layer.msg('请设置正确的数据周期！', {icon: 2})
 				return false
 			}
 			if (data.bucketType > 1) {
@@ -372,7 +372,7 @@ layui.define(function(exports) {
 			}
 			const count = parseInt(fn.countCycle(data) / parseInt(data.bucketValue))
 			if (count <= 0) {
-				layer.msg('可显示值数量不足一条，请重新设置切换周期或数据区域时间范围！', {icon: 2})
+				layer.msg('可显示值数量不足一条，请重新设置数据周期或数据区域时间范围！', {icon: 2})
 				return false
 			}
 			return true