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

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

@@ -201,6 +201,21 @@ export default {
                 });
                 return;
             }
+            //
+            let selectdcount = 0;
+            for (let i = temp.length - 1; i >= 0; i--) {
+              if (temp[i].checked) {
+                selectdcount++;
+              }
+            }
+            if(selectdcount==0){
+              this.$message({
+                message: '请选择点位！',
+                type: 'warning'
+              });
+              return;
+            }
+            //移除点位
             for (let i = temp.length - 1; i >= 0; i--) {
                 if (temp[i].checked) {
                     this.selectedItemList.splice(i, 1);

industry-admin/src/views/source/dataModel/index.vue

@@ -216,7 +216,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery(event) {
-      this.$refs['queryForm'].resetFields()
+      this.$refs['queryForm'].resetFields();
+      this.searchRuleEvent();
     },
     /** 查询所有模型数据 */
     getAllDataModel() {

industry-admin/src/views/source/dataSource/index.vue

@@ -140,7 +140,7 @@
               style="float: right;width: 80px;margin-top: 4px;">获取驱动</el-button>
           </el-form-item>
           <el-form-item label='从站：' prop="slaveId" v-if="dataSourceForm.type == 'modbus_real'">
-            <el-input v-model='dataSourceForm.slaveId' type="text" auto-complete="off" placeholder="请输入从站id"></el-input>
+            <el-input v-model='dataSourceForm.slaveId' type="text" auto-complete="off" placeholder="请输入从站id" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" style="text-align: right">

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

@@ -16,13 +16,13 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="表达式:" prop="remark">
-                        {{ alarmConfigForm.remark }}
-                    </el-form-item>
-                </el-col>
-            </el-row>
+<!--            <el-row>-->
+<!--                <el-col :span="12">-->
+<!--                    <el-form-item label="计算模型:" prop="remark">-->
+<!--                        {{ alarmConfigForm.remark }}-->
+<!--                    </el-form-item>-->
+<!--                </el-col>-->
+<!--            </el-row>-->
             <el-row>
                 <el-col :span="12">
                     <el-form-item label="报警级别:" prop="alarmLevelId">
@@ -159,35 +159,34 @@
                     <el-col :span="12">
                         <el-form-item prop="switchType">
                             <el-radio-group v-model="alarmConfigForm.switchType" @input="switchTypeChange">
-                                <el-radio :label="0">
+                                <el-radio :label="0" style="margin-bottom: 10px">
                                     <template slot="default">
                                         关断(0)
-                                        <el-input v-model="alarmConfigForm.closeText" size="mini">
+                                        <el-input v-model="alarmConfigForm.closeText" size="mini" style="width: 200px">
                                         </el-input>
                                     </template>
                                 </el-radio>
-                                <el-radio :label="1">
+                                <el-radio :label="1" style="margin-bottom: 10px">
                                     <template slot="default">
                                         开通(1)
-                                        <el-input v-model="alarmConfigForm.openText" size="mini">
+                                        <el-input v-model="alarmConfigForm.openText" size="mini" style="width: 200px">
                                         </el-input>
                                     </template>
                                 </el-radio>
-                                <el-radio :label="2">
+                                <el-radio :label="2" style="margin-bottom: 10px">
                                     <template slot="default">
-                                        <div>
                                             值改变
-                                            <div>
+                                            <div style="margin-left: 34px;margin-bottom: 10px">
                                                 开->关
-                                                <el-input v-model="alarmConfigForm.closeText2" size="mini">
+                                                <el-input v-model="alarmConfigForm.closeText2" size="mini" style="width: 200px">
                                                 </el-input>
                                             </div>
-                                            <div>
+                                            <div style="margin-left: 34px;">
                                                 关->开
-                                                <el-input v-model="alarmConfigForm.openText2" size="mini">
+                                                <el-input v-model="alarmConfigForm.openText2" size="mini" style="width: 200px">
                                                 </el-input>
                                             </div>
-                                        </div>
+
                                     </template>
                                 </el-radio>
                             </el-radio-group>
@@ -569,4 +568,6 @@ export default {
     }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" scoped></style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>

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

@@ -426,6 +426,15 @@ export default {
     },
     /** 批量设置表达式 */
     multipleModelItemEvent() {
+
+      if (!this.checkItemList || this.checkItemList.length == 0) {
+        this.$message({
+          message: '请至少选择一项数据！',
+          type: 'warning'
+        })
+        return
+      }
+
       if (!this.checkItemList || this.checkItemList.length == 0) {
         showConfirmWin(this, null, '您确定要对所有点位设置数据计算模型吗？', () => {
           this.allModelItemEvent()

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

@@ -543,6 +543,20 @@ export default {
       if (!_temp || _temp.length == 0) {
         return;
       }
+      let selectdcount = 0;
+      for (let i = _temp.length - 1; i >= 0; i--) {
+        if (_temp[i].checked) {
+          selectdcount ++;
+        }
+      }
+      if(selectdcount==0){
+        this.$message({
+          message: '请选择点位！',
+          type: 'warning'
+        });
+        return;
+      }
+      //移除
       for (let i = _temp.length - 1; i >= 0; i--) {
         if (_temp[i].checked) {
           this.chooseItemDataListByTree.splice(i, 1);

industry-system/industry-da/src/main/java/com/example/opc_da/validate/reportTable/AutomaticReportTableValidate.java

@@ -546,7 +546,11 @@ public abstract class AutomaticReportTableValidate implements ReportTableValidat
             //如果为饼图
         } else if (chartType.equals(ConstantStr.PIE_CHART)) {
             //因为饼图只有一个点位
-            List<Item> validDataList = itemDataMap.get(policyItemIdList.get(0));
+            ReportDataPolicyItem first = itemScaleList.get(0);
+            Integer scale = first.getScale();
+
+            List<Item> validDataList = splitData(null, itemDataMap.get(policyItemIdList.get(0)), sTime, eTime, valueTakingMode, bucketType, bucketValue, scale, defaultScale);
+            //itemDataMap.get(policyItemIdList.get(0));
             //生成series的数据
             List<JSONObject> serieDataList = new ArrayList<>();
             if(Blank.isNotEmpty(validDataList)){

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

@@ -112,6 +112,12 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 					if (layui.sheetTypew.templateReportType == 1) {
 						if (!layui.sheetUtil.checkAutoSheet(layui.rightMenu.data.chart[_this.data.chartId].dataForm)) {
 							return false
+						}else if(fn.data.chartType=='pie'){
+							let itemList = layui.rightMenu.data.chart[_this.data.chartId].items;
+							if(itemList.length>1){
+								layer.msg('饼状图目前只支持选择一个点位！', {icon: 2});
+								return false
+							}
 						}
 					}
 					layer.close(index)

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/item-list-window.js

@@ -28,7 +28,7 @@ layui.define(['layer', 'form', 'transfer'], function(exports) {
 					elem: '#item-list-transfer',
 					id: 'item-list-transfer',
 					data: json.data.policyItemList,
-					title: ['未选择', '已选择'],
+					title: ['全选', '全选'],
 					value,
 					width: 400,
 					height: 600,

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

@@ -497,8 +497,8 @@ layui.define(['layer', 'util', 'jquery', 'form', 'sheetTypew', 'chartRightw', 'i
 		openReportTemplate: function() {
 			layer.open({
 				type: 1,
-				title: ['选择模板报表', 'text-align: center;padding-left: 81px;'],
-				area: ['50%', '70%'],
+				title: ['选择报表模板', 'text-align: center;padding-left: 81px;'],
+				area: ['70%', '60%'],
 				btn: ['确定', '取消'],
 				content: `
 					<form class="layui-form layui-row layui-padding-3" lay-filter="template-search-form">