Merge remote-tracking branch 'origin/master'

chuanyi_client2/src/components/LeftMenu/index.vue

@@ -262,8 +262,8 @@ export default {
           { validator: this.testKeyByUser }
         ],
         ipPassword: [
-          // { required: true, message: '密码不能为空', trigger: 'blur' },
-          // { validator: this.testKeyByUser }
+          { required: true, message: '密码不能为空', trigger: 'blur' },
+          { validator: this.testKeyByUser }
         ]
       }
       // ***************** 表单校验结束 *****************
@@ -311,12 +311,12 @@ export default {
     /** 表单验证判断：用户名称和密码 */
     testKeyByUser(rule, value, callback) {
       if (!value && this.connForm.isAnonymous === 0) {
-        callback(new Error('帐号不能为空'))
-        // if (rule.field === 'ipUserName') {
-        //   callback(new Error('帐号不能为空'))
-        // } else {
-        //   callback(new Error('密码不能为空'))
-        // }
+        // callback(new Error('帐号不能为空'))
+        if (rule.field === 'ipUserName') {
+          callback(new Error('帐号不能为空'))
+        } else {
+          callback(new Error('密码不能为空'))
+        }
       } else {
         callback()
       }
@@ -522,10 +522,10 @@ export default {
           if (showMsg) this.showMsg('帐号不能为空！')
           return false
         }
-        // if (!this.connForm.ipPassword) {
-        //   if (showMsg) this.showMsg('密码不能为空！')
-        //   return false
-        // }
+        if (!this.connForm.ipPassword) {
+          if (showMsg) this.showMsg('密码不能为空！')
+          return false
+        }
         if (!this.connForm.clsId) {
           if (showMsg) this.showMsg('请选择驱动！')
           return false
@@ -540,10 +540,10 @@ export default {
             if (showMsg) this.showMsg('帐号不能为空！')
             return false
           }
-          // if (!this.connForm.ipPassword) {
-          //   if (showMsg) this.showMsg('密码不能为空！')
-          //   return false
-          // }
+          if (!this.connForm.ipPassword) {
+            if (showMsg) this.showMsg('密码不能为空！')
+            return false
+          }
         }
       }
       return true

chuanyi_client2/src/utils/cqcyCode.js

@@ -4,6 +4,8 @@ export default {
     'port': '8081',
     'host': '192.168.1.99',
 
+    'printServerVersion': '1.0.0',
+    'getPrintServerVersion': 'http://localhost:8084/api/appVersion',
     'checkPrintServerInstated': 'http://localhost:8084/api/testInstalled',
     'showPrintServerConfig': 'http://localhost:8084/api/settingShow',
 

chuanyi_client2/src/views/login.vue

@@ -116,7 +116,7 @@ export default {
       loginForm: {
         username: "",
         password: "",
-        ip: "127.0.0.1",
+        ip: "",
         port: "8081",
         rememberMe: false,
         code: "",
@@ -178,7 +178,11 @@ export default {
       if (!key.test(value)) {
         callback(new Error('IP 地址不合法'))
       } else {
-        callback()
+        if (value.startsWith('127.')) {
+          callback(new Error('禁止使用本机 IP 地址段'))
+        } else {
+          callback()
+        }
       }
     },
     /** 表单验证判断：端口 */

chuanyi_client2/src/views/my_report/index.vue

@@ -596,6 +596,7 @@ export default {
       cronVal: '',
       cronList: [],
       reportId: null,
+      reportTableId: null,
       reportTemplateList: [],
       dataModelList: [],
       chooseReportTemplate: null,
@@ -614,7 +615,7 @@ export default {
       searchValue: null,
       searchTxt: '',
       searchHistoryTxt: '',
-      sessionName: 'device_report_index',
+      sessionName: 'device_report_index_',
       reportOptions: [{
         label: '所有报表',
         value: -1
@@ -737,7 +738,7 @@ export default {
   destroyed() {
     if (this.reportIntervalTag) {
       clearInterval(this.reportIntervalTag)
-      sessionStorage.removeItem(this.sessionName)
+      // sessionStorage.removeItem(this.sessionName + this.reportTableId)
     }
     luckysheet.destroy()
   },
@@ -1260,6 +1261,12 @@ export default {
       option.celldata.map(item => {
         if (item.v.v) {
           item.v.v = String(item.v.v).trim()
+          if (item.v.ct && item.v.ct.t && item.v.ct.t === 'd') {
+            item.v.ct = {
+              fa: "@",
+              t: "s",
+            }
+          }
           // 替换${xxx}内部数据
           if (item.v.v.match(/\${([^}]+)}/g)) {
             luckysheet.setCellValue(item.r, item.c, '')
@@ -1305,24 +1312,27 @@ export default {
       }
       // 设备报表
       if (type == 5 || type == 6) {
+        let startTimeList = [];
         tableItemList.forEach((tableItem, i) => {
           let standby = tableItem.standby ? JSON.parse(tableItem.standby) : {}
           let dataIndex = standby.index != null ? standby.index : -1
           let valueList = tableItem.valueList ? tableItem.valueList.split(',') : []
           let xAxis = tableItem.xaxis
           let yAxis = tableItem.yaxis
+          this.reportTableId = tableInfo.id
           // 序号、时间处理
           if (tableItem.timeItemType == 0) { // 序号、开始时间
             let valueIndexList = tableItem.valueIndexList ? tableItem.valueIndexList.split(',') : []
             this.deviceReportUpdateData('${index}', valueIndexList, false)
             let valueTimeList = tableItem.valueTimeList ? tableItem.valueTimeList.split(',') : []
             valueTimeList = withDateFormatLength(valueTimeList)
+            startTimeList = valueTimeList;
             this.deviceReportUpdateData('${startTime}', valueTimeList, false)
           }
           if (tableItem.timeItemType == 1) { // 结束时间
             let valueTimeList = tableItem.valueTimeList ? tableItem.valueTimeList.split(',') : []
             valueTimeList = withDateFormatLength(valueTimeList)
-            this.deviceReportUpdateData('${stopTime}', valueTimeList, tableInfo.isGenCountTime == 1)
+            this.deviceReportUpdateData('${stopTime}', valueTimeList, tableInfo.isGenCountTime == 1, startTimeList)
           }
           if (valueList.length == 0) {
             luckysheet.setCellValue(xAxis, yAxis, '')
@@ -1355,8 +1365,8 @@ export default {
       this.updateLocalExcelContent()
     },
     /** 设备报表时间特殊处理 */
-    deviceReportUpdateData(field, dataList, hasCalc) {
-      let indexPos = sessionStorage.getItem(this.sessionName)
+    deviceReportUpdateData(field, dataList, hasCalc, startTimeList) {
+      let indexPos = sessionStorage.getItem(this.sessionName + this.reportTableId)
       if (indexPos) {
         let pos = indexPos.split(',')
         if (field == '${index}') {
@@ -1377,7 +1387,8 @@ export default {
           dataList.forEach((v, j) => {
             luckysheet.setCellValue(yAxis + j, xAxis, v)
             if (hasCalc) {
-              let startDate = luckysheet.getCellValue(yAxis + j, xAxis - 1)
+              let startDate = startTimeList[j]
+              // let startDate = luckysheet.getCellValue(yAxis + j, xAxis - 1)
               let minutes = this.calculateMinutes(startDate, v)
               luckysheet.setCellValue(yAxis + j, xAxis + 1, minutes)
             }
@@ -1395,7 +1406,7 @@ export default {
               let yAxis = item.r
               let xAxis = item.c
               if (field == '${index}') {
-                sessionStorage.setItem(this.sessionName, yAxis + ',' + xAxis)
+                sessionStorage.setItem(this.sessionName + this.reportTableId, yAxis + ',' + xAxis)
                 dataList.forEach((v, j) => {
                   luckysheet.setCellValue(yAxis + j, xAxis, j + 1)
                 })
@@ -1726,7 +1737,7 @@ export default {
     pollingReportData() {
       if (this.reportIntervalTag) {
         clearInterval(this.reportIntervalTag)
-        sessionStorage.removeItem(this.sessionName)
+        // sessionStorage.removeItem(this.sessionName + this.reportTableId)
       }
       if (this.showReportTableType == 0 || this.showReportTableType == 1 || this.showReportTableType == 5) {
         this.reportIntervalTag = setInterval(() => {
@@ -1739,7 +1750,7 @@ export default {
       if (!this.chooseMyReport || !this.chooseMyReport.id) {
         if (this.reportIntervalTag) {
           clearInterval(this.reportIntervalTag)
-          sessionStorage.removeItem(this.sessionName)
+          // sessionStorage.removeItem(this.sessionName + this.reportTableId)
         }
         return
       }
@@ -1776,7 +1787,7 @@ export default {
       }).catch((e) => {
         if (this.reportIntervalTag) {
           clearInterval(this.reportIntervalTag)
-          sessionStorage.removeItem(this.sessionName)
+          // sessionStorage.removeItem(this.sessionName + this.reportTableId)
         }
         loading.close()
         showAlertWin(this, null, e)
@@ -2336,7 +2347,7 @@ export default {
     cancelSaveReport() {
       if (this.reportIntervalTag) {
         clearInterval(this.reportIntervalTag)
-        sessionStorage.removeItem(this.sessionName)
+        // sessionStorage.removeItem(this.sessionName + this.reportTableId)
       }
       luckysheet.destroy()
 

chuanyi_client2/src/views/run_config/index.vue

@@ -710,6 +710,7 @@ export default {
       cronVal: '',
       cronList: [],
       reportId: null,
+      reportTableId: null,
       reportTemplateList: [],
       dataModelList: [],
       chooseReportTemplate: null,
@@ -738,7 +739,7 @@ export default {
       searchValue: null,
       searchTxt: '',
       searchHistoryTxt: '',
-      sessionName: 'device_report_index',
+      sessionName: 'device_report_index_',
       reportOptions: [{
         label: '所有报表',
         value: -1
@@ -861,7 +862,7 @@ export default {
   destroyed() {
     if (this.reportIntervalTag) {
       clearInterval(this.reportIntervalTag)
-      sessionStorage.removeItem(this.sessionName)
+      // sessionStorage.removeItem(this.sessionName + this.reportTableId)
     }
     luckysheet.destroy()
   },
@@ -1394,6 +1395,12 @@ export default {
       option.celldata.map(item => {
         if (item.v.v) {
           item.v.v = String(item.v.v).trim()
+          if (item.v.ct && item.v.ct.t && item.v.ct.t === 'd') {
+            item.v.ct = {
+              fa: "@",
+              t: "s",
+            }
+          }
           // 替换${xxx}内部数据
           if (item.v.v.match(/\${([^}]+)}/g)) {
             luckysheet.setCellValue(item.r, item.c, '')
@@ -1439,24 +1446,27 @@ export default {
       }
       // 设备报表
       if (type == 5 || type == 6) {
+        let startTimeList = [];
         tableItemList.forEach((tableItem, i) => {
           let standby = tableItem.standby ? JSON.parse(tableItem.standby) : {}
           let dataIndex = standby.index != null ? standby.index : -1
           let valueList = tableItem.valueList ? tableItem.valueList.split(',') : []
           let xAxis = tableItem.xaxis
           let yAxis = tableItem.yaxis
+          this.reportTableId = tableInfo.id
           // 序号、时间处理
           if (tableItem.timeItemType == 0) { // 序号、开始时间
             let valueIndexList = tableItem.valueIndexList ? tableItem.valueIndexList.split(',') : []
             this.deviceReportUpdateData('${index}', valueIndexList, false)
             let valueTimeList = tableItem.valueTimeList ? tableItem.valueTimeList.split(',') : []
             valueTimeList = withDateFormatLength(valueTimeList)
+            startTimeList = valueTimeList;
             this.deviceReportUpdateData('${startTime}', valueTimeList, false)
           }
           if (tableItem.timeItemType == 1) { // 结束时间
             let valueTimeList = tableItem.valueTimeList ? tableItem.valueTimeList.split(',') : []
             valueTimeList = withDateFormatLength(valueTimeList)
-            this.deviceReportUpdateData('${stopTime}', valueTimeList, tableInfo.isGenCountTime == 1)
+            this.deviceReportUpdateData('${stopTime}', valueTimeList, tableInfo.isGenCountTime == 1, startTimeList)
           }
           if (valueList.length == 0) {
             luckysheet.setCellValue(xAxis, yAxis, '')
@@ -1489,29 +1499,36 @@ export default {
       this.updateLocalExcelContent()
     },
     /** 设备报表时间特殊处理 */
-    deviceReportUpdateData(field, dataList, hasCalc) {
-      let indexPos = sessionStorage.getItem(this.sessionName)
+    deviceReportUpdateData(field, dataList, hasCalc, startTimeList) {
+      let indexPos = sessionStorage.getItem(this.sessionName + this.reportTableId)
+      console.log(123,this.reportId)
+      console.log(666,indexPos)
       if (indexPos) {
+        console.log(6,field)
         let pos = indexPos.split(',')
         if (field == '${index}') {
           let yAxis = parseInt(pos[0])
           let xAxis = parseInt(pos[1])
+          console.log(777,dataList)
           dataList.forEach((v, j) => {
             luckysheet.setCellValue(yAxis + j, xAxis, j + 1)
           })
         } else if (field == '${startTime}') {
           let yAxis = parseInt(pos[0])
           let xAxis = parseInt(pos[1]) + 1
+          console.log(888,dataList)
           dataList.forEach((v, j) => {
             luckysheet.setCellValue(yAxis + j, xAxis, v)
           })
         } else if (field == '${stopTime}') {
           let yAxis = parseInt(pos[0])
           let xAxis = parseInt(pos[1]) + 2
+          console.log(999,dataList)
           dataList.forEach((v, j) => {
             luckysheet.setCellValue(yAxis + j, xAxis, v)
             if (hasCalc) {
-              let startDate = luckysheet.getCellValue(yAxis + j, xAxis - 1)
+              // let startDate = luckysheet.getCellValue(yAxis + j, xAxis - 1)
+              let startDate = startTimeList[j]
               let minutes = this.calculateMinutes(startDate, v)
               luckysheet.setCellValue(yAxis + j, xAxis + 1, minutes)
             }
@@ -1529,11 +1546,14 @@ export default {
               let yAxis = item.r
               let xAxis = item.c
               if (field == '${index}') {
-                sessionStorage.setItem(this.sessionName, yAxis + ',' + xAxis)
+                console.log(1,field)
+                sessionStorage.setItem(this.sessionName + this.reportTableId, yAxis + ',' + xAxis)
                 dataList.forEach((v, j) => {
                   luckysheet.setCellValue(yAxis + j, xAxis, j + 1)
                 })
               } else {
+                console.log(111,field)
+                console.log(111,dataList)
                 dataList.forEach((v, j) => {
                   luckysheet.setCellValue(yAxis + j, xAxis, v)
                   if (hasCalc) {
@@ -1918,7 +1938,7 @@ export default {
     pollingReportData() {
       if (this.reportIntervalTag) {
         clearInterval(this.reportIntervalTag)
-        sessionStorage.removeItem(this.sessionName)
+        // sessionStorage.removeItem(this.sessionName + this.reportTableId)
       }
       if (this.showReportTableType == 0 || this.showReportTableType == 1 || this.showReportTableType == 5) {
         this.reportIntervalTag = setInterval(() => {
@@ -1931,7 +1951,7 @@ export default {
       if (!this.chooseMyReport || !this.chooseMyReport.id) {
         if (this.reportIntervalTag) {
           clearInterval(this.reportIntervalTag)
-          sessionStorage.removeItem(this.sessionName)
+          // sessionStorage.removeItem(this.sessionName + this.reportTableId)
         }
         return
       }
@@ -1968,7 +1988,7 @@ export default {
       }).catch((e) => {
         if (this.reportIntervalTag) {
           clearInterval(this.reportIntervalTag)
-          sessionStorage.removeItem(this.sessionName)
+          // sessionStorage.removeItem(this.sessionName + this.reportTableId)
         }
         loading.close()
         showAlertWin(this, null, e)
@@ -2619,7 +2639,7 @@ export default {
     cancelSaveReport() {
       if (this.reportIntervalTag) {
         clearInterval(this.reportIntervalTag)
-        sessionStorage.removeItem(this.sessionName)
+        // sessionStorage.removeItem(this.sessionName + this.reportTableId)
       }
       luckysheet.destroy()