diff --git a/push-op-ui(1).bat b/push-op-ui(1).bat deleted file mode 100644 index bae3fb2..0000000 --- a/push-op-ui(1).bat +++ /dev/null @@ -1,28 +0,0 @@ -@echo off -echo --------------------------------自定义参数，启动前先修改-------------------------------------- -set imageURI=140.249.53.142:30002/op-lanju/ld-op-front -::echo 获取当前日期字符串 -for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c -::echo 获取当前时间字符串 -for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b -::echo 如当前小时小于10，将空格替换为0 -set T=%T: =0% -::echo 显示输出日期时间字符串 -set imageVersion=%D%%T% -::输出发版信息 -echo 镜像库地址:%imageURI% -echo 镜像版本:%imageVersion% -echo --------------------------------执行打包-------------------------------- -call npm run build:prod - -dir -echo --------------------------------docker login...------------------------------- -docker logout 140.249.53.142:30002 -docker login 140.249.53.142:30002 -u deploy -p Deploy@2022 -echo --------------------------------docker build...------------------------------- -docker build -t %imageURI%:%imageVersion% . -echo --------------------------------docker push...-------------------------------- -docker push %imageURI%:%imageVersion% -@pause - -::docker pull 192.168.3.157:8001/library/nginx:1.20-alpine \ No newline at end of file diff --git a/push-op-ui.bat b/push-op-ui.bat deleted file mode 100644 index 89edade..0000000 --- a/push-op-ui.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo off -echo --------------------------------自定义参数，启动前先修改-------------------------------------- -set imageURI=192.168.202.36:30002/op-lanju/op-ui -::echo 获取当前日期字符串 -for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c -::echo 获取当前时间字符串 -for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b -::echo 如当前小时小于10，将空格替换为0 -set T=%T: =0% -::echo 显示输出日期时间字符串 -set imageVersion=%D%%T% -::输出发版信息 -echo 镜像库地址:%imageURI% -echo 镜像版本:%imageVersion% -echo --------------------------------执行打包-------------------------------- -call npm run build:prod - -dir -echo --------------------------------docker login...------------------------------- -docker login 192.168.202.36:30002 -u deploy -p Deploy@2023 -echo --------------------------------docker build...------------------------------- -docker build -t %imageURI%:%imageVersion% . -echo --------------------------------docker push...-------------------------------- -docker push %imageURI%:%imageVersion% -@pause - -::docker pull 192.168.3.157:8001/library/nginx:1.20-alpine \ No newline at end of file diff --git a/src/views/mes/processFinish/index.vue b/src/views/mes/processFinish/index.vue index 3a199f0..b3fdd92 100644 --- a/src/views/mes/processFinish/index.vue +++ b/src/views/mes/processFinish/index.vue @@ -40,9 +40,9 @@ @keyup.enter.native="handleQuery" /> - + - + - - + @@ -80,9 +83,11 @@ - + + + @@ -232,6 +237,35 @@ export default { this.download('mes/reportWork/processFinishExport', { ...this.queryParams }, `processFinish_${new Date().getTime()}.xlsx`) + }, + getSummaries(param) { + const { columns, data } = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '鍚堣'; + return; + } + const values = data.map(item => Number(item[column.property])); + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] += ''; + if(sums[index] > 1000000){ + sums[index] = ''; + } + } else { + sums[index] = '';//N/A + } + }); + + return sums; } } };