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

industry-admin/src/components/CommonTable/index.vue

@@ -7,7 +7,7 @@
         <!-- <el-table-column align="center" v-if="isShowCheckbox" type="selection" width="55"></el-table-column>
         <el-table-column align="center" v-if="isShowIndex" label="序号" type="index" width="60"> -->
         </el-table-column>
-        <el-table-column align="center" :prop="item.propName" :label="item.labelName" :width="item.width"
+        <el-table-column :align="item.align" :prop="item.propName" :label="item.labelName" :width="item.width"
             v-for="(item, index) in tableHeaderTitle" :key="index" :formatter="item.formatter">
         </el-table-column>
         <el-table-column v-if="tableOperate && tableOperate.length !== 0" label="操作" align="center">

industry-admin/src/views/device/deviceLedger/addItem.vue

@@ -145,7 +145,7 @@ export default {
         },
         /** 是否全部选中，已经选择的数据项监听 */
         checkChangeAllSelectedItem(flag) {
-            this.selectAllSelectedItem = flag
+            this.isSelectAllSelectedItem = flag
         },
         /** 选中已经选择的数据项的数据 */
         checkChangeSelectedItem(datas) {
@@ -224,7 +224,6 @@ export default {
             }
             // 重置选择
             this.isSelectAllSelectedItem = false;
-            this.selectAllSelectedItem(false);
         },
         /** 移除右侧全部数据 */
         removeAllBtnEvent() {

industry-admin/src/views/device/deviceLedger/index.vue

@@ -134,22 +134,27 @@ export default {
                 {
                     propName: "deviceType",
                     labelName: "设备分类",
+                    align: "center"
                 },
                 {
                     propName: "deviceName",
                     labelName: "设备名称",
+                    align: "center"
                 },
                 {
                     propName: "deviceNum",
                     labelName: "设备编号",
+                    align: "center"
                 },
                 {
                     propName: "buyTime",
                     labelName: "购买时间",
+                    align: "center"
                 },
                 {
                     propName: "devicePersonName",
                     labelName: "负责人",
+                    align: "center"
                 }
             ],
             tableData: [],

industry-admin/src/views/device/deviceType/index.vue

@@ -65,14 +65,17 @@ export default {
                 {
                     propName: "sortNum",
                     labelName: "排序号",
+                    align: "center"
                 },
                 {
                     propName: "deviceTypeRemark",
                     labelName: "备注",
+                    align: "center"
                 },
                 {
                     propName: "createTime",
                     labelName: "创建时间",
+                    align: "center"
                 }
             ],
             tableData: [],

industry-admin/src/views/fault/faultManage/index.vue

@@ -62,22 +62,27 @@ export default {
                 {
                     propName: "deviceName",
                     labelName: "设备名称",
+                    align: "center"
                 },
                 {
                     propName: "faultTime",
                     labelName: "故障时间",
+                    align: "center"
                 },
                 {
                     propName: "faultReason",
                     labelName: "故障原因",
+                    align: "center"
                 },
                 {
                     propName: "handlePersonName",
                     labelName: "处理人",
+                    align: "center"
                 },
                 {
                     propName: "handleTime",
                     labelName: "处理时间",
+                    align: "center"
                 }
             ],
             tableData: [],

industry-admin/src/views/largeScreen/deviceRunParam/index.vue

@@ -51,18 +51,22 @@ export default {
                 {
                     propName: "dataGroupName",
                     labelName: "数据组名称",
+                    align: "center"
                 },
                 {
                     propName: "sortNum",
                     labelName: "排序号",
+                    align: "center"
                 },
                 {
                     propName: "remark",
                     labelName: "备注",
+                    align: "center"
                 },
                 {
                     propName: "createTime",
                     labelName: "创建时间",
+                    align: "center"
                 }
             ],
             tableData: [],

industry-admin/src/views/largeScreen/mainRunParam/index.vue

@@ -61,18 +61,22 @@ export default {
                 {
                     propName: "dataGroupName",
                     labelName: "数据组名称",
+                    align: "center"
                 },
                 {
                     propName: "sortNum",
                     labelName: "排序号",
+                    align: "center"
                 },
                 {
                     propName: "remark",
                     labelName: "备注",
+                    align: "center"
                 },
                 {
                     propName: "createTime",
                     labelName: "创建时间",
+                    align: "center"
                 }
             ],
             tableData: [],

industry-admin/src/views/largeScreen/trafficChartParam/index.vue

@@ -71,6 +71,7 @@ export default {
                 {
                     propName: "trafficType",
                     labelName: "流量类型",
+                    align: "center",
                     formatter: (row, column, cellValue, index) => {
                         let trafficType = row.trafficType
                         for (let a of this.trafficTypeList) {
@@ -83,18 +84,22 @@ export default {
                 {
                     propName: "dataGroupName",
                     labelName: "数据组名称",
+                    align: "center"
                 },
                 {
                     propName: "sortNum",
                     labelName: "排序号",
+                    align: "center"
                 },
                 {
                     propName: "remark",
                     labelName: "备注",
+                    align: "center"
                 },
                 {
                     propName: "createTime",
                     labelName: "创建时间",
+                    align: "center"
                 }
             ],
             tableData: [],

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

@@ -144,7 +144,7 @@ export default {
         },
         /** 是否全部选中，已经选择的数据项监听 */
         checkChangeAllSelectedItem(flag) {
-            this.selectAllSelectedItem = flag
+            this.isSelectAllSelectedItem = flag
         },
         /** 选中已经选择的数据项的数据 */
         checkChangeSelectedItem(datas) {
@@ -223,7 +223,6 @@ export default {
             }
             // 重置选择
             this.isSelectAllSelectedItem = false;
-            this.selectAllSelectedItem(false);
         },
         /** 移除右侧全部数据 */
         removeAllBtnEvent() {

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

@@ -73,7 +73,6 @@
                         <el-form-item>
                             <el-button type="primary" plain icon="el-icon-search" size="mini"
                                 @click="queryData">查询</el-button>
-                            <el-button ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
                             <el-button type="primary" plain icon="el-icon-folder-opened" size="mini"
                                 @click="exportData">导出</el-button>
                         </el-form-item>
@@ -86,7 +85,7 @@
         <ChooseItem ref="chooseItem" @receiveCheckedData="receiveCheckedData"></ChooseItem>
         <!-- 统计图 -->
         <div class="lineChartContant" v-on:mouseover="mouseOver()" v-on:mouseout="mouseOut()">
-            <div id="lineChart" class="lineChart" />
+            <div ref="chart" class="lineChart" />
         </div>
     </div>
 </template>
@@ -136,6 +135,8 @@ export default {
                 startTime: null,
                 endTime: null
             },
+            chooseStartTime: null,
+            chooseEndTime: null,
             chartFormRules: {
 
                 frequencyValue: [
@@ -163,9 +164,8 @@ export default {
 
                 ],
             },
-            chooseStartTime: null,
-            chooseEndTime: null,
             //charts
+            chart: null,
             //背景颜色
             backgroundColor: '#394056',
             //统计图标题
@@ -285,9 +285,8 @@ export default {
         /** 查询数据 */
         queryData() {
             //每次查询的时候，将统计图初清空，定时器清空
-            clearInterval(this.timer)
-            this.timer = null
-            this.chart = null
+            this.stopTimer()
+            this.destroyChart()
             if (this.chartForm.idList.length == 0) {
                 this.$message({
                     message: '请选择数据项',
@@ -343,14 +342,6 @@ export default {
                 this.initChart()
             }
         },
-        /** 重置 */
-        resetQuery() {
-            this.$refs['chartForm'].resetFields();
-            this.state = false
-            clearInterval(this.timer)
-            this.timer = null
-            this.chart = null
-        },
         /** 通过数据项id，开始结束时间获取相应的数据 */
         getItemListValue(callback) {
             if (this.chooseStartTime == this.chooseEndTime) {
@@ -372,7 +363,7 @@ export default {
             const loading = showLoading(this, "加载中，请稍候···")
             this.getItemListValue((res) => {
                 let data = res.data
-                this.chart = echarts.init(document.getElementById('lineChart'))
+                this.chart = echarts.init(this.$refs.chart)
                 let legendData = []
                 let seriesData = []
                 for (let a of data) {
@@ -385,6 +376,9 @@ export default {
                         symbol: 'circle',
                         symbolSize: 5,
                         showSymbol: false,
+                        itemStyle: {
+                            color: this.getColor()
+                        },
                         lineStyle: {
                             normal: {
                                 width: 1
@@ -399,7 +393,7 @@ export default {
                     let b = '<div style="display:inline;">'
                     for (let a of params) {
                         b += '<div><span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:' + a.color + ';"></span><span style="color:' + a.color + '">'
-                            + a.seriesName + ': ' + a.data + '</span></div>'
+                            + a.name + '    ' + a.seriesName + ': ' + a.data + '</span></div>'
                     }
                     b += '</div>'
                     return b
@@ -425,6 +419,17 @@ export default {
                 loading.close()
             })
         },
+        /** 生成颜色方法 */
+        getColor() {
+            const r = this.colorRandom(128, 255)
+            const g = this.colorRandom(0, 63)
+            const b = this.colorRandom(128, 255)
+            return "rgb(" + r + ", " + g + ", " + b + ")"
+        },
+        /** 颜色数字随机方法 */
+        colorRandom(minValue, maxValue) {
+            return Math.floor((Math.random() * (maxValue - minValue)) + minValue)
+        },
         /** 鼠标移入事件 */
         mouseOver() {
             if (this.state) {
@@ -437,6 +442,14 @@ export default {
                 this.startTimer()
             }
         },
+        /** 清除统计图 */
+        destroyChart() {
+            if (!this.chart) {
+                return
+            }
+            this.chart.dispose()
+            this.chart = null
+        },
         /** 清除定时器 */
         stopTimer() {
             clearInterval(this.timer)

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

@@ -55,6 +55,7 @@ export default {
         {
           propName: "groupName",
           labelName: "数据组名称",
+          align: "center"
         },
         // {
         //   propName: "readMode",
@@ -63,6 +64,7 @@ export default {
         {
           propName: "createTime",
           labelName: "创建时间",
+          align: "center"
         }
       ],
       tableData: [],

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

@@ -51,22 +51,27 @@ export default {
                 {
                     propName: "levelName",
                     labelName: "报警名称",
+                    align: "center"
                 },
                 {
                     propName: "alarmColor",
                     labelName: "报警颜色",
+                    align: "center"
                 },
                 {
                     propName: "sortNum",
                     labelName: "排序号",
+                    align: "center"
                 },
                 {
                     propName: "alarmRemark",
                     labelName: "备注",
+                    align: "center"
                 },
                 {
                     propName: "createTime",
                     labelName: "创建时间",
+                    align: "center"
                 }
             ],
             tableData: [],
@@ -111,7 +116,7 @@ export default {
                 this.tableTotal = res.data.count
                 this.tableData = res.data.alarmLevelList
             }).catch((e) => {
-               
+
             })
         },
         /** 新增报警级别事件 */
@@ -146,7 +151,7 @@ export default {
                         this.getAlarmLevelPage()
                     }
                 }).catch((e) => {
-                    
+
                 })
             })
         },

industry-system/industry-da/src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 server:
   port: 8081
 file:
-  path: F:/upload/chuanyi/
-  commonPath: F:/upload/file/
+  path: D:/upload/chuanyi/
+  commonPath: D:/upload/file/
 
 spring:
   servlet: