diff --git a/babel.config.js b/babel.config.js index e955840..cc15c24 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,6 @@ +// module.exports = { +// presets: ["@vue/cli-plugin-babel/preset"], +// }; module.exports = { - presets: [ - '@vue/cli-plugin-babel/preset' - ] -} + plugins: ["@babel/plugin-transform-optional-chaining"], +}; diff --git a/package-lock.json b/package-lock.json index 8ad227e..ddaccb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -911,14 +911,22 @@ } }, "@babel/plugin-transform-optional-chaining": { - "version": "7.23.4", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz", - "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz", + "integrity": "sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", "@babel/plugin-syntax-optional-chaining": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", + "dev": true + } } }, "@babel/plugin-transform-parameters": { diff --git a/package.json b/package.json index 22e457b..1425b93 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "devDependencies": { "@babel/core": "^7.12.16", "@babel/eslint-parser": "^7.12.16", + "@babel/plugin-transform-optional-chaining": "^7.24.1", "@vue/cli-plugin-babel": "~5.0.0", "@vue/cli-plugin-eslint": "~5.0.0", "@vue/cli-plugin-router": "~5.0.0", diff --git a/src/views/activityList/index.vue b/src/views/activityList/index.vue index 513d971..b92fdfb 100644 --- a/src/views/activityList/index.vue +++ b/src/views/activityList/index.vue @@ -171,6 +171,8 @@ export default { console.log(`当前列数据字段:${dataField}`); console.log(`当前列数据值:${columnData}`); this.copyToClipboard(columnData.join("\n")); + console.log(columnData); + this.activityForm.cmdidArr = columnData.join("\n"); }, copyToClipboard(text) { const textArea = document.createElement("textarea"); diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue index b7e5936..8525534 100644 --- a/src/views/homePage/components/tableMain.vue +++ b/src/views/homePage/components/tableMain.vue @@ -1002,10 +1002,10 @@ export default { created() {}, methods: { tableRowSetting({ row }) { - console.log(row); + //console.log(row); if (row.raw_report.msgs.hasOwnProperty("freeROM")) { - console.log(row.raw_report.msgs.freeROM); - console.log(parseInt(row.raw_report.msgs.freeROM)); + // console.log(row.raw_report.msgs.freeROM); + // console.log(parseInt(row.raw_report.msgs.freeROM)); if (parseInt(row.raw_report.msgs.freeROM) < 40) { return "has-color"; } diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue index 9a65a3e..51b1e3e 100644 --- a/src/views/homePage/index.vue +++ b/src/views/homePage/index.vue @@ -364,22 +364,22 @@ export default { }; var oidObj = { name: "oid", - value: this.formdata.oidInput, + value: this.formdata.oidInput.trim(), invertVal: this.formdata.oidCheck, }; var cmdidObj = { name: "cmdid", - value: this.formdata.cmdidInput, + value: this.formdata.cmdidInput.trim(), invertVal: this.formdata.cmdidCheck, }; var cmaObj = { name: "cma", - value: this.formdata.cmaInput, + value: this.formdata.cmaInput.trim(), invertVal: this.formdata.cmaCheck, }; var versionObj = { name: "version", - value: this.formdata.versionInput, + value: this.formdata.versionInput.trim(), invertVal: this.formdata.versionCheck, }; let arrayOfObjects = [nonmntnedObj, protocolObj, activityObj]; @@ -403,6 +403,7 @@ export default { params["frev" + (k + 1)] = arrayOfObjects[k].invertVal; } console.log(params); + localStorage.setItem("searchParams", JSON.stringify(params)); // 停止之前的定时器 if (this.intervalId) { clearInterval(this.intervalId); diff --git a/src/views/report/index.vue b/src/views/report/index.vue index e099298..c4464f6 100644 --- a/src/views/report/index.vue +++ b/src/views/report/index.vue @@ -54,6 +54,7 @@ apk版本:{{ item.cmd.fileName }} 命令:{{ cmdCn[item.cmdName] }}命令:{{ item.cmdDesc }} + 命令预计拿走时间: