diff --git a/npminstall-debug.log b/npminstall-debug.log index 5ce589f..b5b5536 100644 --- a/npminstall-debug.log +++ b/npminstall-debug.log @@ -1,5 +1,5 @@ { - root: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', + root: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', registry: 'https://registry.npmmirror.com', pkgs: [], production: false, @@ -8,7 +8,7 @@ env: { npm_config_registry: 'https://registry.npmmirror.com', npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\lyg\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\lyg\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}', - npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v18.16.0 win32 x64', + npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v16.18.1 win32 x64', npm_config_cache: 'C:\\Users\\lyg\\.npminstall_tarball', NODE: 'C:\\Program Files\\nodejs\\node.exe', npm_node_execpath: 'C:\\Program Files\\nodejs\\node.exe', @@ -42,8 +42,8 @@ npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp', npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips', npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs', - npm_rootpath: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', - INIT_CWD: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front' + npm_rootpath: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', + INIT_CWD: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front' }, binaryMirrors: { ENVS: { @@ -179,7 +179,7 @@ disableFallbackStore: false, workspacesMap: Map(0) {}, enableWorkspace: false, - workspaceRoot: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', + workspaceRoot: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', isWorkspaceRoot: true, isWorkspacePackage: false, offline: false, diff --git a/npminstall-debug.log b/npminstall-debug.log index 5ce589f..b5b5536 100644 --- a/npminstall-debug.log +++ b/npminstall-debug.log @@ -1,5 +1,5 @@ { - root: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', + root: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', registry: 'https://registry.npmmirror.com', pkgs: [], production: false, @@ -8,7 +8,7 @@ env: { npm_config_registry: 'https://registry.npmmirror.com', npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\lyg\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\lyg\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}', - npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v18.16.0 win32 x64', + npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v16.18.1 win32 x64', npm_config_cache: 'C:\\Users\\lyg\\.npminstall_tarball', NODE: 'C:\\Program Files\\nodejs\\node.exe', npm_node_execpath: 'C:\\Program Files\\nodejs\\node.exe', @@ -42,8 +42,8 @@ npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp', npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips', npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs', - npm_rootpath: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', - INIT_CWD: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front' + npm_rootpath: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', + INIT_CWD: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front' }, binaryMirrors: { ENVS: { @@ -179,7 +179,7 @@ disableFallbackStore: false, workspacesMap: Map(0) {}, enableWorkspace: false, - workspaceRoot: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', + workspaceRoot: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', isWorkspaceRoot: true, isWorkspacePackage: false, offline: false, diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 5e68512..766d961 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -190,6 +190,7 @@ productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }], manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }], manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }], + checkDestination: [{ required: true, message: '检定去向必选', trigger: ['blur', 'change'] }], productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }], // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }], purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }], @@ -249,7 +250,7 @@ setTimeout(() => { ruleForm.value.equipmentName = equipmentName ruleForm.value.model = model - }) + }, 10) setTimeout(() => { isFrist.value = false }, 500) @@ -292,7 +293,6 @@ fetchDict() // 监听设备名称下拉框,修改规格型号和辅助字段 watch(() => ruleForm.value.equipmentName, (newVal) => { - console.log() if (!($route.path.includes('detail') || isFrist.value) && newVal) { ruleForm.value.helpInstruction = '' ruleForm.value.model = '' @@ -507,6 +507,7 @@ testTask.value = [''] // 获取当前用户所在单位 fetchDept() + fetchSelectData() } else { const openSubmission = () => { @@ -532,6 +533,7 @@ directorId.value = ruleForm.value.directorId openSubmission() fetchDept() + fetchSelectData() loading.value = false }) } @@ -541,14 +543,15 @@ directorId.value = ruleForm.value.directorId openSubmission() fetchDept() + fetchSelectData() loading.value = false }) } } } onMounted(async () => { - fetchSelectData() initDialog() + // fetchSelectData() }) // 关闭弹窗 const close = () => { diff --git a/npminstall-debug.log b/npminstall-debug.log index 5ce589f..b5b5536 100644 --- a/npminstall-debug.log +++ b/npminstall-debug.log @@ -1,5 +1,5 @@ { - root: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', + root: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', registry: 'https://registry.npmmirror.com', pkgs: [], production: false, @@ -8,7 +8,7 @@ env: { npm_config_registry: 'https://registry.npmmirror.com', npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\lyg\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\lyg\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}', - npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v18.16.0 win32 x64', + npm_config_user_agent: 'npminstall/7.12.0 npm/? node/v16.18.1 win32 x64', npm_config_cache: 'C:\\Users\\lyg\\.npminstall_tarball', NODE: 'C:\\Program Files\\nodejs\\node.exe', npm_node_execpath: 'C:\\Program Files\\nodejs\\node.exe', @@ -42,8 +42,8 @@ npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp', npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips', npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs', - npm_rootpath: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', - INIT_CWD: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front' + npm_rootpath: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', + INIT_CWD: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front' }, binaryMirrors: { ENVS: { @@ -179,7 +179,7 @@ disableFallbackStore: false, workspacesMap: Map(0) {}, enableWorkspace: false, - workspaceRoot: 'D:\\项目\\西昌计量-受检\\code\\xc-metering-front', + workspaceRoot: 'D:\\project\\西昌计量-受检\\code\\xc-metering-front', isWorkspaceRoot: true, isWorkspacePackage: false, offline: false, diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 5e68512..766d961 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -190,6 +190,7 @@ productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }], manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }], manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }], + checkDestination: [{ required: true, message: '检定去向必选', trigger: ['blur', 'change'] }], productDate: [{ trigger: ['blur', 'change'], validator: validateProductDate }], // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }], purchaseDate: [{ trigger: ['blur', 'change'], validator: validatePurchaseDate }], @@ -249,7 +250,7 @@ setTimeout(() => { ruleForm.value.equipmentName = equipmentName ruleForm.value.model = model - }) + }, 10) setTimeout(() => { isFrist.value = false }, 500) @@ -292,7 +293,6 @@ fetchDict() // 监听设备名称下拉框,修改规格型号和辅助字段 watch(() => ruleForm.value.equipmentName, (newVal) => { - console.log() if (!($route.path.includes('detail') || isFrist.value) && newVal) { ruleForm.value.helpInstruction = '' ruleForm.value.model = '' @@ -507,6 +507,7 @@ testTask.value = [''] // 获取当前用户所在单位 fetchDept() + fetchSelectData() } else { const openSubmission = () => { @@ -532,6 +533,7 @@ directorId.value = ruleForm.value.directorId openSubmission() fetchDept() + fetchSelectData() loading.value = false }) } @@ -541,14 +543,15 @@ directorId.value = ruleForm.value.directorId openSubmission() fetchDept() + fetchSelectData() loading.value = false }) } } } onMounted(async () => { - fetchSelectData() initDialog() + // fetchSelectData() }) // 关闭弹窗 const close = () => { diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue index 72ab7f3..8af39b0 100644 --- a/src/views/tested/device/info/components/showPhoto.vue +++ b/src/views/tested/device/info/components/showPhoto.vue @@ -68,7 +68,7 @@ {{ item.minioFileName }} - x + X @@ -110,16 +110,22 @@ } .close { + // font-size: 24px; position: absolute; top: -20px; right: -10px; display: none; z-index: 99; - height: 40px; - width: 40px; - color: rgb(121 118 115); + height: 30px; + width: 30px; + color: rgb(245 235 228); // background-color: #ccc; + // text-align: center; + /* stylelint-disable-next-line alpha-value-notation */ + background-color: rgba($color: #000, $alpha: 0.3); + border-radius: 50%; text-align: center; + line-height: 30px; } // &::before { // content: "x";