diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue index 902ac5cf..909f9892 100644 --- a/src/views/pqs/supervise/technology/components/alarm.vue +++ b/src/views/pqs/supervise/technology/components/alarm.vue @@ -234,16 +234,17 @@ const tableStore = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', disabled: row => { - if (VITE_FLAG) { - return !(row.problemType == 2 || row.problemType == 4) - } - return true; + // if (VITE_FLAG) { + return !(row.problemType == 2 || row.problemType == 4) + // } + // return true; }, click: row => { if (row.problemType == 2) { - const match = row.filePath.match(/excelreport(\/[^?#]*)/) + // const match = row.filePath.match(/excelreport(\/[^?#]*)/) - window.open(window.location.origin + '/#/previewFile?' + match[1]) + // window.open(window.location.origin + '/#/previewFile?' + match[1]) + window.open(window.location.origin + '/#/previewFile?/' + row.absFilePath) } else { if (row.problemPath == null) { ElMessage({ @@ -251,7 +252,8 @@ const tableStore = new TableStore({ type: 'warning' }) } else { - window.open(window.location.origin + '/#/previewFile?/' + row.problemPath) + //window.open(window.location.origin + '/#/previewFile?/' + row.problemPath) + window.open(window.location.origin + '/#/previewFile?/' + row.absFilePath) // getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => { // // window.open(res.data.url) // }) diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue index d2bef5b0..ef1f4b12 100644 --- a/src/views/pqs/supervise/technology/components/earlyWarn.vue +++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue @@ -151,16 +151,17 @@ const tableStore = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', disabled: row => { - if (VITE_FLAG) { + // if (VITE_FLAG) { return row.problemType != 2; - } - return true; + // } + // return true; }, click: row => { - const match = row.filePath.match(/excelreport(\/[^?#]*)/) + // const match = row.filePath.match(/excelreport(\/[^?#]*)/) - window.open(window.location.origin + '/#/previewFile?' + match[1]) + // window.open(window.location.origin + '/#/previewFile?' + match[1]) + window.open(window.location.origin + '/#/previewFile?/' + row.absFilePath) } }, {