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

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

@@ -309,6 +309,7 @@ export default {
         /** 运行记录 */
         runRecordEvent(row) {
             this.$refs.runRecord.params.autoTableId = row.id
+            this.$refs.runRecord.params.byShare = row.byShare
             this.$refs.runRecord.visible = true
         },
         /** 配置 */

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

@@ -22,7 +22,7 @@
                     <el-form-item>
                         <el-button type="primary" icon="el-icon-search" size="mini"
                             @click="getChReportTable">查询</el-button>
-                      <el-button type="danger" size="mini" icon="el-icon-delete-solid" @click="multipleDelReportTableEvent">批量删除</el-button>
+                      <el-button v-if="!params.byShare" type="danger" size="mini" icon="el-icon-delete-solid" @click="multipleDelReportTableEvent">批量删除</el-button>
                     </el-form-item>
                 </el-form>
                 <!-- 数据组表格信息 -->
@@ -86,6 +86,9 @@ export default {
                     style: 'color: red;',
                     icon: 'el-icon-delete',
                     methodName: "delReportTableEvent",
+                  hidden: row => {
+                    return  !this.params.byShare
+                  }
                 }
             ],
             tableTotal: 0,
@@ -94,6 +97,7 @@ export default {
                 page: 1,
                 limit: 10,
                 autoTableId: null,
+                byShare: null,
                 reportTableName: null,
                 startTime: null,
                 endTime: null

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

@@ -16,8 +16,8 @@
                         </el-col>
                         <el-col v-if="chartForm.trendType == 0" :xl="5">
                             <el-form-item label="更新频率" prop="frequencyValue">
-                                <el-input v-model="chartForm.frequencyValue"
-                                    @change="changeFrequency" style="width: 100px;"></el-input>
+                                <el-input  v-model="chartForm.frequencyValue"
+                                    @change="changeFrequency" @input="chartForm.frequencyValue = handleNumberInput(chartForm.frequencyValue)" style="width: 100px;"></el-input>
                             </el-form-item>
                             <el-form-item prop="frequencyType" style="width: 70px;">
                                 <el-select v-model="chartForm.frequencyType" @change="changeFrequencyType">
@@ -30,7 +30,7 @@
 
                         <el-col v-if="chartForm.trendType == 0" :xl="5">
                             <el-form-item label="时间长度" prop="timeValue">
-                                <el-input v-model="chartForm.timeValue" style="width: 100px;"></el-input>
+                                <el-input v-model="chartForm.timeValue" @input="chartForm.timeValue = handleNumberInput(chartForm.timeValue)" style="width: 100px;"></el-input>
                             </el-form-item>
                             <el-form-item prop="timeType">
                                 <el-select v-model="chartForm.timeType" style="width: 70px;">
@@ -65,7 +65,11 @@
                         </el-col>
                         <el-col :xl="4">
                             <el-form-item label="小数位" prop="decimalPlaces">
-                                <el-input style="width: 100px;" v-model="chartForm.decimalPlaces"></el-input>
+                              <el-select v-model="chartForm.decimalPlaces" filterable clearable placeholder="请选择小数位数">
+                                <el-option v-for="(d,index) in decimalPlacesList" :key="index" :label="d.label"
+                                           :value="d.value">
+                                </el-option>
+                              </el-select>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -167,6 +171,17 @@ export default {
                 { label: '时', value: 2 },
                 { label: '天', value: 3 }
             ],
+            decimalPlacesList:[
+              {value : '0', label: '0'},
+              {value : '1', label: '1'},
+              {value : '2', label: '2'},
+              {value : '3', label: '3'},
+              {value : '4', label: '4'},
+              {value : '5', label: '5'},
+              {value : '6', label: '6'},
+              {value : '7', label: '7'},
+              {value : '8', label: '8'}
+            ],
             itemList: [],
             chartForm: {
                 itemListTitile: '',
@@ -336,6 +351,18 @@ export default {
         }
     },
     methods: {
+      handleNumberInput(value){
+        if(value){
+          value = value.replace(/[^0-9]/g,'')
+          if(value) {
+            value = Number(value)
+            if(value === 0){
+              value = ""
+            }
+          }
+        }
+        return value
+      },
         /** 接受传过来的数据 */
         receiveCheckedData(data) {
             this.itemList = data

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

@@ -497,7 +497,7 @@ export default {
         let data = res.data
         let status = false;
         this.clientStatusType = 1
-        for (let i = 0; i < data.length; i++) {
+        /*for (let i = 0; i < data.length; i++) {
           if (this.clientStatusType === 2) {
             break
           }
@@ -507,7 +507,7 @@ export default {
               this.clientStatusType = 2
             }
           })
-        }
+        }*/
       })
     },
     /** 查看数据组实时数据 */
@@ -524,12 +524,12 @@ export default {
           message: '当前数据组未被配置在采集器中，无实时数据！',
           type: 'warning'
         })
-      } else if (this.clientStatusType === 1) {
+      } /*else if (this.clientStatusType === 1) {
         this.$message({
           message: '当前数据组未进行采集，无实时数据！',
           type: 'warning'
         })
-      }
+      }*/
       this.getItemValueById()
       this.timer = setInterval(() => {
         this.getItemValueById()

industry-system/cqcy-ei-influxdb/src/main/java/com/cqcy/ei/influxdb/service/impl/QueryServiceImpl.java

@@ -39,7 +39,13 @@ public class QueryServiceImpl implements QueryService {
                 measurement += "_" + DateUtil.year(date) + "_" + (DateUtil.month(date) + 1);
             }
         }
-        return queryMapper.getItemDataByLast(endTime.toInstant().getEpochSecond(), startTime.toInstant().getEpochSecond(), items, dataSource, bucket, measurement);
+        //System.err.println("endTime.toInstant().getEpochSecond():" + endTime.toInstant().getEpochSecond());
+        //System.err.println("startTime.toInstant().getEpochSecond():" + startTime.toInstant().getEpochSecond() );
+        //System.err.println("items:" + items.toString());
+        //System.err.println("dataSource:" + dataSource);
+        //System.err.println("bucket:" + bucket);
+        //System.err.println("measurement:" + measurement);
+        return queryMapper.getItemDataByLast(endTime.toInstant().getEpochSecond(), startTime.toInstant().getEpochSecond() - 2, items, dataSource, bucket, measurement);
     }
 
     @Override