From 1c2cb3d1157daca17f2131b5cfe03560b8b60b4d Mon Sep 17 00:00:00 2001 From: jinna Date: Fri, 24 Apr 2026 13:03:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E5=B7=A1=E6=A3=80=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 7 + .../hearingDialog - 副本.vue | 299 ++++++++++++++++++ .../equipmentInspectionTask/index.vue | 17 +- .../safetyInspectionTask/index.vue | 22 +- vite.config.mjs | 4 +- ....timestamp-1769577605162-d8f5fd10d8099.mjs | 158 +++++++++ yarn.lock | 5 + 7 files changed, 494 insertions(+), 18 deletions(-) create mode 100644 src/views/productionDisposition/hearingDialog - 副本.vue create mode 100644 vite.config.mjs.timestamp-1769577605162-d8f5fd10d8099.mjs diff --git a/package-lock.json b/package-lock.json index 5c4880d8..cbbc3f6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "js-base64": "^3.7.4", "js-cookie": "^3.0.0", "js-md5": "^0.7.3", + "jsbarcode": "^3.12.3", "jspdf": "^3.0.4", "nprogress": "^0.2.0", "pinyin": "^4.0.0", @@ -5734,6 +5735,12 @@ "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==", "license": "MIT" }, + "node_modules/jsbarcode": { + "version": "3.12.3", + "resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.12.3.tgz", + "integrity": "sha512-CuHU9hC6dPsHF5oVFMo8NW76uQVjH4L22CsP4hW+dNnGywJHC/B0ThA1CTDVLnxKLrrpYdicBLnd2xsgTfRnvg==", + "license": "MIT" + }, "node_modules/jsbn": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz", diff --git a/src/views/productionDisposition/hearingDialog - 副本.vue b/src/views/productionDisposition/hearingDialog - 副本.vue new file mode 100644 index 00000000..810ab51c --- /dev/null +++ b/src/views/productionDisposition/hearingDialog - 副本.vue @@ -0,0 +1,299 @@ + + + \ No newline at end of file diff --git a/src/views/safetyManagement/equipmentInspectionTask/index.vue b/src/views/safetyManagement/equipmentInspectionTask/index.vue index 575bd413..9921aa7c 100644 --- a/src/views/safetyManagement/equipmentInspectionTask/index.vue +++ b/src/views/safetyManagement/equipmentInspectionTask/index.vue @@ -143,9 +143,9 @@ export default { search: true, display: false, hide: true, - type: 'datetime', - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'date', + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', searchRange: true, startPlaceholder: "开始时间", endPlaceholder: "结束时间", @@ -245,14 +245,17 @@ export default { this.loading = true; const requestParams = Object.assign({}, params, this.query); // 后端要字符串类型 - if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime)) { - + if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime) && requestParams.queryLaunchTime.length > 0) { + requestParams.queryLaunchTime[0] = requestParams.queryLaunchTime[0].length == 10 ? requestParams.queryLaunchTime[0] + ' 00:00:00' : requestParams.queryLaunchTime[0] + requestParams.queryLaunchTime[1] = requestParams.queryLaunchTime[1].length == 10 ? requestParams.queryLaunchTime[1] + ' 23:59:59' : requestParams.queryLaunchTime[1] requestParams.queryLaunchTime = requestParams.queryLaunchTime.join(','); } - if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime)) { - + if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime) && requestParams.queryTestTime.length > 0) { + requestParams.queryTestTime[0] = requestParams.queryTestTime[0].length == 10 ? requestParams.queryTestTime[0] + ' 00:00:00' : requestParams.queryTestTime[0] + requestParams.queryTestTime[1] = requestParams.queryTestTime[1].length == 10 ? requestParams.queryTestTime[1] + ' 23:59:59' : requestParams.queryTestTime[1] requestParams.queryTestTime = requestParams.queryTestTime.join(','); } + console.log('查询参数:', requestParams) getList(page.currentPage, page.pageSize, requestParams).then( (res) => { this.data = res.data.data.records; diff --git a/src/views/safetyManagement/safetyInspectionTask/index.vue b/src/views/safetyManagement/safetyInspectionTask/index.vue index b398cd47..75f4b918 100644 --- a/src/views/safetyManagement/safetyInspectionTask/index.vue +++ b/src/views/safetyManagement/safetyInspectionTask/index.vue @@ -122,9 +122,9 @@ export default { search: true, display: false, hide:true, - type: 'datetime', - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'date', + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', searchRange: true, }, { @@ -151,9 +151,9 @@ export default { filter: true, search: true, hide:true, - type: "datetime", - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: "date", + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', searchRange: true, }, { @@ -208,12 +208,16 @@ export default { this.loading = true; const requestParams = Object.assign({}, params, this.query); // 后端要字符串类型 - if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime)) { + console.log('查询参数:', requestParams) + if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime) && requestParams.queryLaunchTime.length > 0) { + requestParams.queryLaunchTime[0] = requestParams.queryLaunchTime[0].length == 10 ? requestParams.queryLaunchTime[0] + ' 00:00:00' : requestParams.queryLaunchTime[0] + requestParams.queryLaunchTime[1] = requestParams.queryLaunchTime[1].length == 10 ? requestParams.queryLaunchTime[1] + ' 23:59:59' : requestParams.queryLaunchTime[1] requestParams.queryLaunchTime = requestParams.queryLaunchTime.join(','); } - if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime)) { - + if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime) && requestParams.queryTestTime.length > 0) { + requestParams.queryTestTime[0] = requestParams.queryTestTime[0].length == 10 ? requestParams.queryTestTime[0] + ' 00:00:00' : requestParams.queryTestTime[0] + requestParams.queryTestTime[1] = requestParams.queryTestTime[1].length == 10 ? requestParams.queryTestTime[1] + ' 23:59:59' : requestParams.queryTestTime[1] requestParams.queryTestTime = requestParams.queryTestTime.join(','); } getList(page.currentPage, page.pageSize, requestParams).then( diff --git a/vite.config.mjs b/vite.config.mjs index d03c2316..5ce28471 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -64,9 +64,9 @@ export default ({ mode, command }) => { // target: 'http://192.168.0.127:80',//外协本地 // target: 'http://192.168.0.126:80',//举手本地 - // target: 'http://192.168.0.115:80',//工作台消息本地 + target: 'http://192.168.0.115:80',//工作台消息本地 // target: 'http://192.168.1.5:82', - target: "http://192.168.0.4", + // target: "http://192.168.0.4", // target: 'http://49.232.74.228:82', // target: "http://192.168.1.4:82", // target: 'https://saber3.bladex.cn/api', diff --git a/vite.config.mjs.timestamp-1769577605162-d8f5fd10d8099.mjs b/vite.config.mjs.timestamp-1769577605162-d8f5fd10d8099.mjs new file mode 100644 index 00000000..386fc8e1 --- /dev/null +++ b/vite.config.mjs.timestamp-1769577605162-d8f5fd10d8099.mjs @@ -0,0 +1,158 @@ +// vite.config.mjs +import { defineConfig, loadEnv } from "file:///D:/project/vue/jonhon-mes-web%20-%20ware/node_modules/vite/dist/node/index.js"; +import { resolve } from "path"; +import path from "path"; + +// vite/plugins/index.js +import vue from "file:///D:/project/vue/jonhon-mes-web%20-%20ware/node_modules/@vitejs/plugin-vue/dist/index.mjs"; + +// vite/plugins/auto-import.js +import autoImport from "file:///D:/project/vue/jonhon-mes-web%20-%20ware/node_modules/unplugin-auto-import/dist/vite.js"; +function createAutoImport() { + return autoImport({ + imports: ["vue", "vue-router", "vuex"], + dts: false + }); +} + +// vite/plugins/compression.js +import compression from "file:///D:/project/vue/jonhon-mes-web%20-%20ware/node_modules/vite-plugin-compression/dist/index.mjs"; +function createCompression(env) { + const { VITE_BUILD_COMPRESS } = env; + const plugin = []; + if (VITE_BUILD_COMPRESS) { + const compressList = VITE_BUILD_COMPRESS.split(","); + if (compressList.includes("gzip")) { + plugin.push( + compression({ + ext: ".gz", + deleteOriginFile: false + }) + ); + } + if (compressList.includes("brotli")) { + plugin.push( + compression({ + ext: ".br", + algorithm: "brotliCompress", + deleteOriginFile: false + }) + ); + } + } + return plugin; +} + +// vite/plugins/setup-extend.js +import setupExtend from "file:///D:/project/vue/jonhon-mes-web%20-%20ware/node_modules/vite-plugin-vue-setup-extend/dist/index.mjs"; +function createSetupExtend() { + return setupExtend(); +} + +// vite/plugins/index.js +function createVitePlugins(viteEnv, isBuild = false) { + const vitePlugins = [vue()]; + vitePlugins.push(createAutoImport()); + vitePlugins.push(createSetupExtend()); + isBuild && vitePlugins.push(...createCompression(viteEnv)); + return vitePlugins; +} + +// vite.config.mjs +import { createSvgIconsPlugin } from "file:///D:/project/vue/jonhon-mes-web%20-%20ware/node_modules/vite-plugin-svg-icons/dist/index.mjs"; +var __vite_injected_original_dirname = "D:\\project\\vue\\jonhon-mes-web - ware"; +var vite_config_default = ({ mode, command }) => { + const env = loadEnv(mode, process.cwd()); + const { VITE_APP_ENV, VITE_APP_BASE } = env; + const isProd = VITE_APP_ENV === "production"; + const buildConfig = { + target: "esnext", + minify: isProd ? "terser" : "esbuild" + // 根据环境选择压缩工具 + }; + if (isProd) { + buildConfig.terserOptions = { + compress: { + drop_console: true, + // 删除 console + drop_debugger: true + // 删除 debugger + }, + format: { + comments: false + // 删除所有注释 + } + }; + buildConfig.rollupOptions = { + output: { + manualChunks: { + "element-plus": ["element-plus"], + "@smallwei/avue": ["@smallwei/avue"] + } + } + }; + } + return defineConfig({ + base: VITE_APP_BASE, + define: { + __VUE_I18N_FULL_INSTALL__: true, + __VUE_I18N_LEGACY_API__: true, + __INTLIFY_PROD_DEVTOOLS__: false + }, + server: { + port: 2888, + proxy: { + "/api": { + // target: 'http://192.168.1.5:82', + // target: "http://192.168.1.4:82", + // target:'http://49.232.74.228:82', + // target: "http://192.168.0.120", + //target: 'https://saber3.bladex.cn/api', + // target: 'http://49.232.74.228:82', + target: "http://192.168.0.114", + // target: "http://192.168.0.117:80", + // target: "http://192.168.0.112:80", + // target: "http://192.168.0.114", //坤哥后台 + // target: 'http:49.232.74.228:49', + // target: 'http://49.232.74.228', //测试环境的地址 + changeOrigin: true, + rewrite: (path2) => path2.replace(/^\/api/, "") + } + } + }, + resolve: { + alias: { + "~": resolve(__vite_injected_original_dirname, "./"), + "@": resolve(__vite_injected_original_dirname, "./src"), + components: resolve(__vite_injected_original_dirname, "./src/components"), + styles: resolve(__vite_injected_original_dirname, "./src/styles"), + utils: resolve(__vite_injected_original_dirname, "./src/utils") + } + }, + css: { + preprocessorOptions: { + scss: { + api: "modern-compiler", + additionalData: `@use "@/styles/variables.scss" as *;` + } + } + }, + plugins: [ + createVitePlugins(env, command === "build"), + createSvgIconsPlugin({ + iconDirs: [path.resolve(process.cwd(), "src/assets/svg")], + symbolId: "icon-[dir]-[name]" + }) + ], + build: buildConfig, + optimizeDeps: { + esbuildOptions: { + target: "esnext" + } + } + }); +}; +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.mjs", "vite/plugins/index.js", "vite/plugins/auto-import.js", "vite/plugins/compression.js", "vite/plugins/setup-extend.js"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\";const __vite_injected_original_filename = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite.config.mjs\";const __vite_injected_original_import_meta_url = \"file:///D:/project/vue/jonhon-mes-web%20-%20ware/vite.config.mjs\";import { defineConfig, loadEnv } from 'vite';\r\nimport { resolve } from 'path';\r\n\r\nimport path from 'path';\r\nimport createVitePlugins from './vite/plugins';\r\nimport { createSvgIconsPlugin } from 'vite-plugin-svg-icons';\r\n// https://vitejs.dev/config/\r\nexport default ({ mode, command }) => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  const { VITE_APP_ENV, VITE_APP_BASE } = env;\r\n  // \u5224\u65AD\u662F\u6253\u751F\u4EA7\u73AF\u5883\u5305\r\n  const isProd = VITE_APP_ENV === 'production';\r\n\r\n  // \u6839\u636E\u662F\u5426\u751F\u4EA7\u73AF\u5883\uFF0C\u52A8\u6001\u8BBE\u7F6E\u538B\u7F29\u914D\u7F6E\r\n  const buildConfig = {\r\n    target: 'esnext',\r\n    minify: isProd ? 'terser' : 'esbuild', // \u6839\u636E\u73AF\u5883\u9009\u62E9\u538B\u7F29\u5DE5\u5177\r\n  };\r\n\r\n  // \u5982\u679C\u662F\u751F\u4EA7\u73AF\u5883\uFF0C\u6DFB\u52A0Terser\u7684\u914D\u7F6E\r\n  if (isProd) {\r\n    buildConfig.terserOptions = {\r\n      compress: {\r\n        drop_console: true, // \u5220\u9664 console\r\n        drop_debugger: true, // \u5220\u9664 debugger\r\n      },\r\n      format: {\r\n        comments: false, // \u5220\u9664\u6240\u6709\u6CE8\u91CA\r\n      },\r\n    };\r\n    buildConfig.rollupOptions = {\r\n      output: {\r\n        manualChunks: {\r\n          'element-plus': ['element-plus'],\r\n          '@smallwei/avue': ['@smallwei/avue'],\r\n        },\r\n      },\r\n    };\r\n  }\r\n  return defineConfig({\r\n    base: VITE_APP_BASE,\r\n    define: {\r\n      __VUE_I18N_FULL_INSTALL__: true,\r\n      __VUE_I18N_LEGACY_API__: true,\r\n      __INTLIFY_PROD_DEVTOOLS__: false,\r\n    },\r\n    server: {\r\n      port: 2888,\r\n      proxy: {\r\n        '/api': {\r\n          // target: 'http://192.168.1.5:82',\r\n          // target: \"http://192.168.1.4:82\",\r\n          // target:'http://49.232.74.228:82',\r\n          // target: \"http://192.168.0.120\",\r\n          //target: 'https://saber3.bladex.cn/api',\r\n          // target: 'http://49.232.74.228:82', \r\n          target: \"http://192.168.0.114\",\r\n          // target: \"http://192.168.0.117:80\",\r\n          // target: \"http://192.168.0.112:80\",\r\n          // target: \"http://192.168.0.114\", //\u5764\u54E5\u540E\u53F0\r\n          // target: 'http:49.232.74.228:49',\r\n          // target: 'http://49.232.74.228', //\u6D4B\u8BD5\u73AF\u5883\u7684\u5730\u5740\r\n          changeOrigin: true,\r\n          rewrite: path => path.replace(/^\\/api/, ''),\r\n        },\r\n      },\r\n    },\r\n    resolve: {\r\n      alias: {\r\n        '~': resolve(__dirname, './'),\r\n        '@': resolve(__dirname, './src'),\r\n        components: resolve(__dirname, './src/components'),\r\n        styles: resolve(__dirname, './src/styles'),\r\n        utils: resolve(__dirname, './src/utils'),\r\n      },\r\n    },\r\n\r\n    css: {\r\n      preprocessorOptions: {\r\n        scss: {\r\n          api: 'modern-compiler',\r\n          additionalData: `@use \"@/styles/variables.scss\" as *;`,\r\n        },\r\n      },\r\n    },\r\n    plugins: [\r\n      createVitePlugins(env, command === 'build'),\r\n      createSvgIconsPlugin({\r\n        iconDirs: [path.resolve(process.cwd(), 'src/assets/svg')],\r\n        symbolId: 'icon-[dir]-[name]',\r\n      }),\r\n    ],\r\n    build: buildConfig,\r\n    optimizeDeps: {\r\n      esbuildOptions: {\r\n        target: 'esnext',\r\n      },\r\n    },\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite\\\\plugins\\\\index.js\";const __vite_injected_original_import_meta_url = \"file:///D:/project/vue/jonhon-mes-web%20-%20ware/vite/plugins/index.js\";import vue from '@vitejs/plugin-vue';\r\n\r\nimport createAutoImport from './auto-import';\r\nimport createCompression from './compression';\r\nimport createSetupExtend from './setup-extend';\r\n\r\nexport default function createVitePlugins(viteEnv, isBuild = false) {\r\n  const vitePlugins = [vue()];\r\n  vitePlugins.push(createAutoImport());\r\n  vitePlugins.push(createSetupExtend());\r\n  isBuild && vitePlugins.push(...createCompression(viteEnv));\r\n  return vitePlugins;\r\n}", "const __vite_injected_original_dirname = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite\\\\plugins\\\\auto-import.js\";const __vite_injected_original_import_meta_url = \"file:///D:/project/vue/jonhon-mes-web%20-%20ware/vite/plugins/auto-import.js\";import autoImport from 'unplugin-auto-import/vite';\r\n\r\nexport default function createAutoImport() {\r\n  return autoImport({\r\n    imports: ['vue', 'vue-router', 'vuex'],\r\n    dts: false,\r\n  });\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite\\\\plugins\\\\compression.js\";const __vite_injected_original_import_meta_url = \"file:///D:/project/vue/jonhon-mes-web%20-%20ware/vite/plugins/compression.js\";import compression from 'vite-plugin-compression';\r\n\r\nexport default function createCompression(env) {\r\n  const { VITE_BUILD_COMPRESS } = env;\r\n  const plugin = [];\r\n  if (VITE_BUILD_COMPRESS) {\r\n    const compressList = VITE_BUILD_COMPRESS.split(',');\r\n    if (compressList.includes('gzip')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.gz',\r\n          deleteOriginFile: false,\r\n        })\r\n      );\r\n    }\r\n    if (compressList.includes('brotli')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.br',\r\n          algorithm: 'brotliCompress',\r\n          deleteOriginFile: false,\r\n        })\r\n      );\r\n    }\r\n  }\r\n  return plugin;\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\project\\\\vue\\\\jonhon-mes-web - ware\\\\vite\\\\plugins\\\\setup-extend.js\";const __vite_injected_original_import_meta_url = \"file:///D:/project/vue/jonhon-mes-web%20-%20ware/vite/plugins/setup-extend.js\";import setupExtend from 'vite-plugin-vue-setup-extend';\r\n\r\nexport default function createSetupExtend() {\r\n  return setupExtend();\r\n}\r\n"],
  "mappings": ";AAA4S,SAAS,cAAc,eAAe;AAClV,SAAS,eAAe;AAExB,OAAO,UAAU;;;ACHwT,OAAO,SAAS;;;ACAJ,OAAO,gBAAgB;AAE7V,SAAR,mBAAoC;AACzC,SAAO,WAAW;AAAA,IAChB,SAAS,CAAC,OAAO,cAAc,MAAM;AAAA,IACrC,KAAK;AAAA,EACP,CAAC;AACH;;;ACPqV,OAAO,iBAAiB;AAE9V,SAAR,kBAAmC,KAAK;AAC7C,QAAM,EAAE,oBAAoB,IAAI;AAChC,QAAM,SAAS,CAAC;AAChB,MAAI,qBAAqB;AACvB,UAAM,eAAe,oBAAoB,MAAM,GAAG;AAClD,QAAI,aAAa,SAAS,MAAM,GAAG;AACjC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AACA,QAAI,aAAa,SAAS,QAAQ,GAAG;AACnC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,WAAW;AAAA,UACX,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;;;AC1BuV,OAAO,iBAAiB;AAEhW,SAAR,oBAAqC;AAC1C,SAAO,YAAY;AACrB;;;AHEe,SAAR,kBAAmC,SAAS,UAAU,OAAO;AAClE,QAAM,cAAc,CAAC,IAAI,CAAC;AAC1B,cAAY,KAAK,iBAAiB,CAAC;AACnC,cAAY,KAAK,kBAAkB,CAAC;AACpC,aAAW,YAAY,KAAK,GAAG,kBAAkB,OAAO,CAAC;AACzD,SAAO;AACT;;;ADPA,SAAS,4BAA4B;AALrC,IAAM,mCAAmC;AAOzC,IAAO,sBAAQ,CAAC,EAAE,MAAM,QAAQ,MAAM;AACpC,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,QAAM,EAAE,cAAc,cAAc,IAAI;AAExC,QAAM,SAAS,iBAAiB;AAGhC,QAAM,cAAc;AAAA,IAClB,QAAQ;AAAA,IACR,QAAQ,SAAS,WAAW;AAAA;AAAA,EAC9B;AAGA,MAAI,QAAQ;AACV,gBAAY,gBAAgB;AAAA,MAC1B,UAAU;AAAA,QACR,cAAc;AAAA;AAAA,QACd,eAAe;AAAA;AAAA,MACjB;AAAA,MACA,QAAQ;AAAA,QACN,UAAU;AAAA;AAAA,MACZ;AAAA,IACF;AACA,gBAAY,gBAAgB;AAAA,MAC1B,QAAQ;AAAA,QACN,cAAc;AAAA,UACZ,gBAAgB,CAAC,cAAc;AAAA,UAC/B,kBAAkB,CAAC,gBAAgB;AAAA,QACrC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,SAAO,aAAa;AAAA,IAClB,MAAM;AAAA,IACN,QAAQ;AAAA,MACN,2BAA2B;AAAA,MAC3B,yBAAyB;AAAA,MACzB,2BAA2B;AAAA,IAC7B;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,OAAO;AAAA,QACL,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,UAON,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,UAMR,cAAc;AAAA,UACd,SAAS,CAAAA,UAAQA,MAAK,QAAQ,UAAU,EAAE;AAAA,QAC5C;AAAA,MACF;AAAA,IACF;AAAA,IACA,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAK,QAAQ,kCAAW,IAAI;AAAA,QAC5B,KAAK,QAAQ,kCAAW,OAAO;AAAA,QAC/B,YAAY,QAAQ,kCAAW,kBAAkB;AAAA,QACjD,QAAQ,QAAQ,kCAAW,cAAc;AAAA,QACzC,OAAO,QAAQ,kCAAW,aAAa;AAAA,MACzC;AAAA,IACF;AAAA,IAEA,KAAK;AAAA,MACH,qBAAqB;AAAA,QACnB,MAAM;AAAA,UACJ,KAAK;AAAA,UACL,gBAAgB;AAAA,QAClB;AAAA,MACF;AAAA,IACF;AAAA,IACA,SAAS;AAAA,MACP,kBAAkB,KAAK,YAAY,OAAO;AAAA,MAC1C,qBAAqB;AAAA,QACnB,UAAU,CAAC,KAAK,QAAQ,QAAQ,IAAI,GAAG,gBAAgB,CAAC;AAAA,QACxD,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AAAA,IACA,OAAO;AAAA,IACP,cAAc;AAAA,MACZ,gBAAgB;AAAA,QACd,QAAQ;AAAA,MACV;AAAA,IACF;AAAA,EACF,CAAC;AACH;",
  "names": ["path"]
}
 diff --git a/yarn.lock b/yarn.lock index 083b20bb..0565419b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2792,6 +2792,11 @@ js-md5@^0.7.3: resolved "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz" integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ== +jsbarcode@^3.12.3: + version "3.12.3" + resolved "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.12.3.tgz" + integrity sha512-CuHU9hC6dPsHF5oVFMo8NW76uQVjH4L22CsP4hW+dNnGywJHC/B0ThA1CTDVLnxKLrrpYdicBLnd2xsgTfRnvg== + jsbn@^1.1.0: version "1.1.0" resolved "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz"