From b5177b6b827fbe1777cd99dc0456436345cd4dbe Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 23 May 2024 09:30:31 +0800 Subject: [PATCH] youhua --- src/components/header.vue | 4 +- src/views/homePage/components/tableMain.vue | 651 +++++++++++--------- 2 files changed, 349 insertions(+), 306 deletions(-) diff --git a/src/components/header.vue b/src/components/header.vue index 82f0af9..0d54195 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -19,8 +19,8 @@ - - 系统 + {{ userName }} + diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue index c34df01..a503364 100644 --- a/src/views/homePage/components/tableMain.vue +++ b/src/views/homePage/components/tableMain.vue @@ -100,9 +100,11 @@ scope.row.list[0].estimatedPublishTime * 1000 - newupdatatime > 0 " > - {{ - cmdCn[scope.row.list[0].name] - }}{{ cmdCn[scope.row.list[0].name] }}{{ scope.row.list[0].desc }} {{ - scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("oid") + scope.row.mntnStatus.reportMap !== null && + scope.row.mntnStatus.reportMap.hasOwnProperty("oid") ? scope.row.mntnStatus.reportMap.oid : "" }} @@ -127,15 +130,19 @@ - + - + - + {{ formatLastHeartbeat(scope.row.mntnStatus.rawReportTime) }}{{ formatLastHeartbeat(scope.row.mntnStatus.rawReportTime) }} @@ -216,9 +229,12 @@ :sort-method="picSort" > @@ -251,28 +268,34 @@ :sort-method="sortnumberOfHb" > @@ -281,11 +304,11 @@ @@ -326,38 +349,45 @@ - {{ - scope.row.mntnStatus.reportMap!==null&&scope.row.mntnStatus.reportMap.hasOwnProperty("signature1") - ? scope.row.mntnStatus.reportMap.signature1.split("/")[0] - :"" - }} - + {{ + scope.row.mntnStatus.reportMap !== null && + scope.row.mntnStatus.reportMap.hasOwnProperty("signature1") + ? scope.row.mntnStatus.reportMap.signature1.split("/")[0] + : "" + }} @@ -388,11 +418,11 @@ > @@ -416,20 +446,21 @@ @@ -443,28 +474,30 @@ > @@ -476,11 +509,11 @@ > 确 定 - - +
取 消 - 确 定 + 确 定
@@ -854,15 +889,9 @@ :close-on-click-modal="false" width="30%" > - + - +
@@ -871,8 +900,8 @@
- - + @@ -898,40 +927,37 @@ - - - + - + - + - 选取文件 - + 选取文件 + - +
取 消 确 定 @@ -1018,8 +1044,8 @@ export default { 65285: "河南全景", 65286: "河南郑州", 65290: "河南统一视频v2020", - 65298:"宁夏", - 2:"南网" + 65298: "宁夏", + 2: "南网", }, multipleSelection: [], @@ -1051,10 +1077,8 @@ export default { notecheck: false, lastIpcheck: false, //运维操作列表 - operateOptions:[ - - ], - + operateOptions: [], + formIssue: { operate: "", }, //运维操作 @@ -1114,7 +1138,7 @@ export default { upgradationform: { upVal: "", }, - + selectUpObj: {}, upgradationRules: { upVal: [ @@ -1231,11 +1255,11 @@ export default { ], }, //上传文件base64 - pushFileVisible:false, + pushFileVisible: false, fileList: [], - pushFileForm:{ - name:"", - fileData:"", + pushFileForm: { + name: "", + fileData: "", }, pushFileRules: { name: [ @@ -1246,14 +1270,12 @@ export default { }, ], }, - }; }, mounted() { this.loadLocalStorage(); this.calculateHeight(this.showFlag); window.addEventListener("resize", this.calculateHeight(this.showFlag)); - }, computed: { // 使用计算属性来扩展数据，为每个项目添加 isEditing 字段 @@ -1277,22 +1299,22 @@ export default { }, }, created() { - this.getCmdOptionsFun() + this.getCmdOptionsFun(); }, methods: { //获取命令列表 - getCmdOptionsFun(){ + getCmdOptionsFun() { getCmdActionApi() - .then((res) => { - console.log(res); - this.operateOptions = res.data - //this.operateOptions = this.operateOptions.concat(res.data); - }) - .catch((err) => {}); + .then((res) => { + console.log(res); + this.operateOptions = res.data; + //this.operateOptions = this.operateOptions.concat(res.data); + }) + .catch((err) => {}); + }, + formatLastHeartbeat(timestamp) { + return this.$moment(timestamp * 1000).format("YYYY-MM-DD HH:mm:ss"); }, - formatLastHeartbeat(timestamp) { - return this.$moment(timestamp * 1000).format("YYYY-MM-DD HH:mm:ss"); - }, calculateHeight(val) { console.log(val); this.showFlag = val; @@ -1309,106 +1331,127 @@ export default { }, //判断磁盘空间 tableRowSetting({ row }) { - if (!row.mntnStatus || !row.mntnStatus.reportMap || !row.mntnStatus.reportMap.hasOwnProperty("freeROM")) { - // 如果freeROM属性不存在，返回默认类名 - return "no-color"; - } - const freeROMValue = row.mntnStatus.reportMap.freeROM; - const parsedValue = parseInt(freeROMValue, 10); // 使用基数10来确保解析为十进制数 - if (parsedValue < 50) { - return "has-color"; - } + if ( + !row.mntnStatus || + !row.mntnStatus.reportMap || + !row.mntnStatus.reportMap.hasOwnProperty("freeROM") + ) { + // 如果freeROM属性不存在，返回默认类名 + return "no-color"; + } + const freeROMValue = row.mntnStatus.reportMap.freeROM; + const parsedValue = parseInt(freeROMValue, 10); // 使用基数10来确保解析为十进制数 + if (parsedValue < 50) { + return "has-color"; + } }, //传图pic排序 - picSort(a, b) { - // 确保 a 和 b 都有 mntnStatus.reportMap 对象 - const aPic = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.pic) || 0; - const bPic = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.pic) || 0; - // 将 pic 转换为数字进行比较 - const numA = Number(aPic); - const numB = Number(bPic); - // 根据需要进行升序或降序排序 - // 这里假设你想要升序排序（从小到大） - return numA - numB; - // 如果你想要降序排序（从大到小），则返回 numB - numA + picSort(a, b) { + // 确保 a 和 b 都有 mntnStatus.reportMap 对象 + const aPic = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.pic) || 0; + const bPic = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.pic) || 0; + // 将 pic 转换为数字进行比较 + const numA = Number(aPic); + const numB = Number(bPic); + // 根据需要进行升序或降序排序 + // 这里假设你想要升序排序（从小到大） + return numA - numB; + // 如果你想要降序排序（从大到小），则返回 numB - numA }, //心跳次数排序 sortnumberOfHb(a, b) { - const aNum = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.numberOfHb) || 0; - const bNum = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.numberOfHb) || 0; - const numA = Number(aNum); - const numB = Number(bNum); - return numA - numB; + const aNum = + (a.mntnStatus.reportMap && a.mntnStatus.reportMap.numberOfHb) || 0; + const bNum = + (b.mntnStatus.reportMap && b.mntnStatus.reportMap.numberOfHb) || 0; + const numA = Number(aNum); + const numB = Number(bNum); + return numA - numB; }, //成功和失败 sortSuccess(a, b) { - const aNum = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.success) || 0; - const bNum = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.success) || 0; - const numA = Number(aNum); - const numB = Number(bNum); - return numA - numB; + const aNum = + (a.mntnStatus.reportMap && a.mntnStatus.reportMap.success) || 0; + const bNum = + (b.mntnStatus.reportMap && b.mntnStatus.reportMap.success) || 0; + const numA = Number(aNum); + const numB = Number(bNum); + return numA - numB; }, sortFailure(a, b) { - const aNum = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.failure) || 0; - const bNum = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.failure) || 0; - const numA = Number(aNum); - const numB = Number(bNum); - return numA - numB; + const aNum = + (a.mntnStatus.reportMap && a.mntnStatus.reportMap.failure) || 0; + const bNum = + (b.mntnStatus.reportMap && b.mntnStatus.reportMap.failure) || 0; + const numA = Number(aNum); + const numB = Number(bNum); + return numA - numB; }, //网络错误 sortNumbersErr(a, b) { - const aNum = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.networkError) || 0; - const bNum = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.networkError) || 0; - const numA = Number(aNum); - const numB = Number(bNum); - return numA - numB; + const aNum = + (a.mntnStatus.reportMap && a.mntnStatus.reportMap.networkError) || 0; + const bNum = + (b.mntnStatus.reportMap && b.mntnStatus.reportMap.networkError) || 0; + const numA = Number(aNum); + const numB = Number(bNum); + return numA - numB; }, //重启次数 sortRebootTimes(a, b) { - const aNum = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.rebootTimes) || 0; - const bNum = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.rebootTimes) || 0; - const numA = Number(aNum); - const numB = Number(bNum); - return numA - numB; - + const aNum = + (a.mntnStatus.reportMap && a.mntnStatus.reportMap.rebootTimes) || 0; + const bNum = + (b.mntnStatus.reportMap && b.mntnStatus.reportMap.rebootTimes) || 0; + const numA = Number(aNum); + const numB = Number(bNum); + return numA - numB; }, //I1重启次数 sortI1Reb(a, b) { - const aNum = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.i1RebootTimes) || 0; - const bNum = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.i1RebootTimes) || 0; - const numA = Number(aNum); - const numB = Number(bNum); - return numA - numB; + const aNum = + (a.mntnStatus.reportMap && a.mntnStatus.reportMap.i1RebootTimes) || 0; + const bNum = + (b.mntnStatus.reportMap && b.mntnStatus.reportMap.i1RebootTimes) || 0; + const numA = Number(aNum); + const numB = Number(bNum); + return numA - numB; }, - + sortfreeNumbers(a, b) { - // 确保 a 和 b 都有 mntnStatus.reportMap 对象，并且提取 pic 值 - const aFree = a.mntnStatus.reportMap && a.mntnStatus.reportMap.freeROM; - const bFree = b.mntnStatus.reportMap && b.mntnStatus.reportMap.freeROM; - // 定义一个函数来将百分比字符串转换为数值，或者如果值为 null 或非百分比字符串，则返回 0 - function parsePercentage(value) { - if (value === null || typeof value !== 'string' || !value.endsWith('%')) { - return 0; - } - // 去除百分比符号，并将剩余的字符串转换为数值 - const numberValue = parseFloat(value.slice(0, -1)); - if (isNaN(numberValue)) { - return 0; - } - return numberValue; - } - - // 转换 pic 值为数值进行比较 - const numA = parsePercentage(aFree); - const numB = parsePercentage(bFree); - // 这里假设你想要升序排序（从小到大） - return numA - numB + // 确保 a 和 b 都有 mntnStatus.reportMap 对象，并且提取 pic 值 + const aFree = a.mntnStatus.reportMap && a.mntnStatus.reportMap.freeROM; + const bFree = b.mntnStatus.reportMap && b.mntnStatus.reportMap.freeROM; + // 定义一个函数来将百分比字符串转换为数值，或者如果值为 null 或非百分比字符串，则返回 0 + function parsePercentage(value) { + if ( + value === null || + typeof value !== "string" || + !value.endsWith("%") + ) { + return 0; + } + // 去除百分比符号，并将剩余的字符串转换为数值 + const numberValue = parseFloat(value.slice(0, -1)); + if (isNaN(numberValue)) { + return 0; + } + return numberValue; + } + + // 转换 pic 值为数值进行比较 + const numA = parsePercentage(aFree); + const numB = parsePercentage(bFree); + // 这里假设你想要升序排序（从小到大） + return numA - numB; }, sortNote(a, b) { // 确保 a和b都是字符串，如果不是，则转换为字符串 - const aValue = a.mntnStatus.comment === null ? "" : String(a.mntnStatus.comment); - const bValue = b.mntnStatus.comment === null ? "" : String(b.mntnStatus.comment); + const aValue = + a.mntnStatus.comment === null ? "" : String(a.mntnStatus.comment); + const bValue = + b.mntnStatus.comment === null ? "" : String(b.mntnStatus.comment); // const aValue = typeof a === "string" ? a : String(a); // const bValue = typeof b === "string" ? b : String(b); // 处理null值，将它们视为最低优先级 @@ -1421,7 +1464,7 @@ export default { sensitivity: "base", }); }, - + //获取运维勾选和快心跳勾选个数 getNumber() { console.log(this.tableData); @@ -1460,7 +1503,7 @@ export default { this.$parent.exportTable(); }, //导出表格 - + // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据 getRowKey(row) { return row.id; @@ -1534,7 +1577,7 @@ export default { UpdateMaintainMode(val, row) { console.log("运维"); console.log(val, row); - + cmdSendApi({ action: "mntn", termIds: [row.id], @@ -1628,7 +1671,7 @@ export default { case 1: console.log("重启"); var params = { - action:"yw_cmd_android_reboot", + action: "yw_cmd_android_reboot", termIds: this.idArray, }; this.changeIssue(params); @@ -1636,7 +1679,7 @@ export default { case 2: console.log("重启MCU"); var params = { - action:"yw_cmd_mcu_reboot", + action: "yw_cmd_mcu_reboot", termIds: this.idArray, }; this.changeIssue(params); @@ -1656,7 +1699,7 @@ export default { case 6: console.log("上传日志"); var params = { - action:"yw_cmd_upload_i1_zip_log", + action: "yw_cmd_upload_i1_zip_log", //url: "http://180.166.218.222:40101/upload/", termIds: this.idArray, }; @@ -1675,7 +1718,7 @@ export default { case 9: console.log("停止frpc"); var params = { - action:"yw_cmd_stop_frpc", + action: "yw_cmd_stop_frpc", termIds: this.idArray, }; this.changeIssue(params); @@ -1683,7 +1726,7 @@ export default { case 10: console.log("停止老化测试"); var params = { - action:"i1_cmd_stop_aging_test", + action: "i1_cmd_stop_aging_test", termIds: this.idArray, }; this.changeIssue(params); @@ -1696,7 +1739,7 @@ export default { case 12: console.log("删除文件"); this.deleteFileVisible = true; - return; + return; case 13: console.log("上传文件base64"); this.pullFileVisible = true; @@ -1704,7 +1747,7 @@ export default { case 14: console.log("下载文件base64"); this.pushFileVisible = true; - return; + return; } }, //执行操作 @@ -1724,7 +1767,7 @@ export default { this.$refs.ieRuleForm.validate((valid) => { if (valid) { var params = { - action:"i1_cmd_set_i1_server_ip_port", + action: "i1_cmd_set_i1_server_ip_port", ip: this.ieform.ip, port: this.ieform.port, termIds: this.idArray, @@ -1740,7 +1783,7 @@ export default { this.$refs.operationRuleForm.validate((valid) => { if (valid) { var params = { - action:"i1_cmd_set_xy_yw_ip_port", + action: "i1_cmd_set_xy_yw_ip_port", ip: this.operationform.ip, port: this.operationform.port, termIds: this.idArray, @@ -1756,7 +1799,7 @@ export default { this.$refs.heartBeatRuleForm.validate((valid) => { if (valid) { var params = { - action:"i1_cmd_set_i1_heart_beat_time", + action: "i1_cmd_set_i1_heart_beat_time", hb: this.heartBeatform.heart, termIds: this.idArray, }; @@ -1767,23 +1810,23 @@ export default { }, //获取升级apkList getUpgradeList() { - upgradeListApi({type:0}) + upgradeListApi({ type: 0 }) .then((res) => { console.log(res); - this.upOptions = res.data + this.upOptions = res.data; }) .catch((err) => {}); }, - //获取Ota升级apkList - getUpgradeOtaList() { - upgradeListApi({type:1}) + //获取Ota升级apkList + getUpgradeOtaList() { + upgradeListApi({ type: 1 }) .then((res) => { console.log(res); - this.upOptionsOta = res.data + this.upOptionsOta = res.data; }) .catch((err) => {}); }, - + selectChanged(val) { console.log(val); // 找到选中项的整个object对象 @@ -1805,7 +1848,7 @@ export default { this.$refs.upgradationRuleForm.validate((valid) => { if (valid) { var params = { - action:"upgrade", + action: "upgrade", url: this.upgradationform.upVal, md5: this.selectUpObj.md5, fn: this.selectUpObj.fileName, @@ -1816,12 +1859,12 @@ export default { } }); }, - //升级OTa确定阿 - handleupgradationOta() { + //升级OTa确定阿 + handleupgradationOta() { this.$refs.upgradationRuleFormOta.validate((valid) => { if (valid) { var params = { - action:"yw_upd_ota", + action: "yw_upd_ota", url: this.upgradationformOta.upVal, md5: this.selectUpObjOta.md5, fn: this.selectUpObjOta.fileName, @@ -1852,7 +1895,7 @@ export default { this.$refs.frpcRuleForm.validate((valid) => { if (valid) { var params = { - action:"yw_cmd_start_frpc", + action: "yw_cmd_start_frpc", server_addr: this.frpcform.server_addr, server_port: this.frpcform.server_port, local_ip: this.frpcform.local_ip, @@ -1869,32 +1912,32 @@ export default { }, //删除文件 - handleDelete(){ + handleDelete() { console.log(this.$refs.delFileFormref); this.$refs.delFileFormref.validate((valid) => { if (valid) { var params = { - action:"del_file", + action: "del_file", path: this.delFileForm.delFile, termIds: this.idArray, }; - console.log(params) + console.log(params); this.changeIssue(params); this.deleteFileVisible = false; } }); }, //下载文件 - handlePull(){ + handlePull() { console.log(this.$refs.pullFileFormref); this.$refs.pullFileFormref.validate((valid) => { if (valid) { var params = { - action:"upload_file", + action: "upload_file", path: this.pullFileForm.pullFile, termIds: this.idArray, }; - console.log(params) + console.log(params); this.changeIssue(params); this.pullFileVisible = false; } @@ -1902,47 +1945,49 @@ export default { }, //上传文件 - beforeUpload(file) { - console.log(file) - return new Promise((resolve, reject) => { - const reader = new FileReader(); - reader.readAsDataURL(file); - reader.onload = (e) => { - console.log("asdasdad",e) - this.pushFileForm.fileData = e.target.result; // Base64 编码的数据 - const base64Index = this.pushFileForm.fileData.indexOf('base64,'); - if (base64Index > 0) { - // 提取base64编码部分 - const base64Data = this.pushFileForm.fileData.substring(base64Index + 7); // 7 是 "base64," 的长度 - this.pushFileForm.fileData = base64Data; // 保存Base64编码部分 - this.sendToBackend(this.pushFileForm.fileData); - resolve(true); - } else { - // 如果找不到"base64,"，则可能不是预期的格式 - reject(new Error('Invalid data URL format')); - } - }; - reader.onerror = error => { - reject(error); - }; - }); - }, - sendToBackend(base64Data){ + beforeUpload(file) { + console.log(file); + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.readAsDataURL(file); + reader.onload = (e) => { + console.log("asdasdad", e); + this.pushFileForm.fileData = e.target.result; // Base64 编码的数据 + const base64Index = this.pushFileForm.fileData.indexOf("base64,"); + if (base64Index > 0) { + // 提取base64编码部分 + const base64Data = this.pushFileForm.fileData.substring( + base64Index + 7 + ); // 7 是 "base64," 的长度 + this.pushFileForm.fileData = base64Data; // 保存Base64编码部分 + this.sendToBackend(this.pushFileForm.fileData); + resolve(true); + } else { + // 如果找不到"base64,"，则可能不是预期的格式 + reject(new Error("Invalid data URL format")); + } + }; + reader.onerror = (error) => { + reject(error); + }; + }); + }, + sendToBackend(base64Data) { this.$refs.pushFileFormref.validate((valid) => { if (valid) { var params = { - action:"download_file", + action: "download_file", path: this.pushFileForm.name, - content:base64Data, + content: base64Data, termIds: this.idArray, }; - console.log(params) + console.log(params); this.changeIssue(params); this.pushFileVisible = false; } }); }, - handlePush(){ + handlePush() { this.$refs.upload.submit(); }, @@ -2435,8 +2480,8 @@ export default { font-weight: normal; } } - .pushBoxDialog{ - .el-dialog__body{ + .pushBoxDialog { + .el-dialog__body { height: 172px; } .upload-demo { @@ -2469,7 +2514,6 @@ export default { } } } - } } .contenBoxMsg { @@ -2485,6 +2529,5 @@ export default { font-size: 12px; font-style: normal; } - }