diff --git a/package.json b/package.json index f113438..da59c93 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "axios": "0.27.2", "clipboard": "^2.0.11", "echarts": "5.4.3", - "element-plus": "2.4.3", + "element-plus": "^2.11.2", "file-saver": "2.0.5", "fuse.js": "6.6.2", "jquery": "^3.7.1", diff --git a/src/api/checkCode/index.ts b/src/api/checkCode/index.ts index 76c6580..7d4bdd2 100644 --- a/src/api/checkCode/index.ts +++ b/src/api/checkCode/index.ts @@ -82,4 +82,5 @@ export function reportFsresult(query?: Object) { method: 'post', data: query, }); -} \ No newline at end of file +} + diff --git a/src/api/mzcx/index.ts b/src/api/mzcx/index.ts new file mode 100644 index 0000000..eb676e4 --- /dev/null +++ b/src/api/mzcx/index.ts @@ -0,0 +1,80 @@ +//@ts-ignore js语法检查忽略 +import request from '@/utils/request'; + + +// 查询条码类别 +export function feeitemclassList(query?: Object) { + return request({ + url: 'feeitemclass/query', + method: 'get', + params: query, + }); +} +// 报告领取规则 +export function rptgetrules(query?: Object) { + return request({ + url: '/rptgetrule/query', + method: 'get', + params: query, + }); +} +// 新增条码类别 +export function feeitemclassAdd(query?: Object) { + return request({ + url: '/feeitemclass/add', + method: 'post', + data: query, + }); +} +// 修改条码类别 +export function feeitemclassUpdate(query?: Object) { + return request({ + url: '/feeitemclass/update', + method: 'post', + data: query, + }); +} +// 删除条码类别 +export function feeitemclassDel(query?: Object) { + return request({ + url: '/feeitemclass/del', + method: 'delete', + params: query, + }); +} + + + + +// 收费项目维护列表 +export function xmfeeList(query?: Object) { + return request({ + url: 'xmfee/query', + method: 'get', + params: query, + }); +} +// 收费项目新增 +export function xmfeeadd(query?: Object) { + return request({ + url: 'xmfee/addXmfee', + method: 'post', + data: query, + }); +} +// 收费项目修改 +export function xmfeeUpdate(query?: Object) { + return request({ + url: 'xmfee/update', + method: 'post', + data: query, + }); +} +// 收费项目删除 +export function xmfeeDel(query?: Object) { + return request({ + url: 'xmfee/del', + method: 'delete', + params: query, + }); +} \ No newline at end of file diff --git a/src/utils/classCom.ts b/src/utils/classCom.ts index 0773b35..1dbc1f5 100644 --- a/src/utils/classCom.ts +++ b/src/utils/classCom.ts @@ -12,13 +12,14 @@ function decimalToHexColor(decimal: number | string): string { // 统一转换为数字类型 const num = typeof decimal === 'string' ? parseFloat(decimal) : decimal; + if (isNaN(num)) { return '#FFFFFF'; } // 十进制转十六进制并转为大写 let hex = Math.floor(num).toString(16).toUpperCase(); - + let rgbHex = '' // 确保十六进制字符串为6位,不足则补0 if (hex.length < 6) { hex = hex.padStart(6, '0'); @@ -28,11 +29,18 @@ function decimalToHexColor(decimal: number | string): string { const r = hex.substring(4, 6); const g = hex.substring(2, 4); const b = hex.substring(0, 2); - const rgbHex = r + g + b; - + rgbHex = r + g + b; return `#${rgbHex}`; } + +// 处理颜色转换为十进制数字 +const convertHexToNumber = (hex: string) => { + if (!hex) return + hex = hex.replace('#', ''); + const bgr = hex.slice(4, 6) + hex.slice(2, 4) + hex.slice(0, 2); + return parseInt(bgr, 16); +}; /** * 根据背景色计算对比度文字颜色(黑/白) * @param bgColor 十六进制背景色(如#FFFF80) @@ -79,5 +87,5 @@ function base64ToBlob(base64: string) { } -export const classCom = { decimalToHexColor, getContrastTextColor, printPDF } +export const classCom = { decimalToHexColor, convertHexToNumber, getContrastTextColor, printPDF } diff --git a/src/views/dictionary/blood/index copy.vue b/src/views/dictionary/blood/index copy.vue deleted file mode 100644 index b337763..0000000 --- a/src/views/dictionary/blood/index copy.vue +++ /dev/null @@ -1,296 +0,0 @@ - - - - - diff --git a/src/views/dictionary/blood/index.vue b/src/views/dictionary/blood/index.vue deleted file mode 100644 index 362ad18..0000000 --- a/src/views/dictionary/blood/index.vue +++ /dev/null @@ -1,529 +0,0 @@ - - - - - diff --git a/src/views/liswork/dict/index.vue b/src/views/liswork/dict/index.vue index d03e3a0..ef2f576 100644 --- a/src/views/liswork/dict/index.vue +++ b/src/views/liswork/dict/index.vue @@ -67,8 +67,6 @@ watch(zdlbmc, (val) => { }) const filterNode = (value, data) => { - console.log(value, data); - if (!value) return true return data.zdmc.includes(value) } diff --git a/src/views/mzcx/blood/index.vue b/src/views/mzcx/blood/index.vue new file mode 100644 index 0000000..147b7fd --- /dev/null +++ b/src/views/mzcx/blood/index.vue @@ -0,0 +1,636 @@ + + + + + diff --git a/src/views/mzcx/charge/index.vue b/src/views/mzcx/charge/index.vue new file mode 100644 index 0000000..b3660f1 --- /dev/null +++ b/src/views/mzcx/charge/index.vue @@ -0,0 +1,711 @@ + + + + + diff --git a/tsconfig.json b/tsconfig.json index e1705a2..57039f8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -32,7 +32,6 @@ // "allowUnknownInTemplate": true // 允许模板中使用未知属性 // } }, - "jsx": "preserve", "types": ["element-plus/global"], "include": ["src/**/*","src/**/*.ts", "src/**/*.vue","src/**/**/*.vue", "src/**/*.tsx", "src/**/*.d.ts", "auto-imports.d.ts"], // **表示任意目录,而 * 表示任意文件。这表明 src 目录中的所有文件都将被编译 "exclude": ["node_modules", "dist"] ,// 指示不需要编译的文件目录