diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json deleted file mode 100644 index fe7f40f..0000000 --- a/.hbuilderx/launch.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ - // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 - "version" : "0.0", - "configurations" : [ - { - "app-plus" : - { - "launchtype" : "local" - }, - "default" : - { - "launchtype" : "local" - }, - "mp-weixin" : - { - "launchtype" : "local" - }, - "type" : "uniCloud" - }, - { - "playground" : "standard", - "type" : "uni-app:app-android" - } - ] -} diff --git a/.vite/deps/_metadata.json b/.vite/deps/_metadata.json deleted file mode 100644 index 8963583..0000000 --- a/.vite/deps/_metadata.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "hash": "5610b5a1", - "browserHash": "3deef0d9", - "optimized": { - "base-64": { - "src": "../../node_modules/base-64/base64.js", - "file": "base-64.js", - "fileHash": "768aae23", - "needsInterop": true - } - }, - "chunks": {} -} \ No newline at end of file diff --git a/.vite/deps/base-64.js b/.vite/deps/base-64.js deleted file mode 100644 index 6c66974..0000000 --- a/.vite/deps/base-64.js +++ /dev/null @@ -1,117 +0,0 @@ -var __getOwnPropNames = Object.getOwnPropertyNames; -var __commonJS = (cb, mod) => function __require() { - return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports; -}; - -// ../../../../Documents/HBuilderProjects/B404219-tianranqi/node_modules/base-64/base64.js -var require_base64 = __commonJS({ - "../../../../Documents/HBuilderProjects/B404219-tianranqi/node_modules/base-64/base64.js"(exports, module) { - (function(root) { - var freeExports = typeof exports == "object" && exports; - var freeModule = typeof module == "object" && module && module.exports == freeExports && module; - var freeGlobal = typeof global == "object" && global; - if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) { - root = freeGlobal; - } - var InvalidCharacterError = function(message) { - this.message = message; - }; - InvalidCharacterError.prototype = new Error(); - InvalidCharacterError.prototype.name = "InvalidCharacterError"; - var error = function(message) { - throw new InvalidCharacterError(message); - }; - var TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - var REGEX_SPACE_CHARACTERS = /[\t\n\f\r ]/g; - var decode = function(input) { - input = String(input).replace(REGEX_SPACE_CHARACTERS, ""); - var length = input.length; - if (length % 4 == 0) { - input = input.replace(/==?$/, ""); - length = input.length; - } - if (length % 4 == 1 || // http://whatwg.org/C#alphanumeric-ascii-characters - /[^+a-zA-Z0-9/]/.test(input)) { - error( - "Invalid character: the string to be decoded is not correctly encoded." - ); - } - var bitCounter = 0; - var bitStorage; - var buffer; - var output = ""; - var position = -1; - while (++position < length) { - buffer = TABLE.indexOf(input.charAt(position)); - bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer; - if (bitCounter++ % 4) { - output += String.fromCharCode( - 255 & bitStorage >> (-2 * bitCounter & 6) - ); - } - } - return output; - }; - var encode = function(input) { - input = String(input); - if (/[^\0-\xFF]/.test(input)) { - error( - "The string to be encoded contains characters outside of the Latin1 range." - ); - } - var padding = input.length % 3; - var output = ""; - var position = -1; - var a; - var b; - var c; - var buffer; - var length = input.length - padding; - while (++position < length) { - a = input.charCodeAt(position) << 16; - b = input.charCodeAt(++position) << 8; - c = input.charCodeAt(++position); - buffer = a + b + c; - output += TABLE.charAt(buffer >> 18 & 63) + TABLE.charAt(buffer >> 12 & 63) + TABLE.charAt(buffer >> 6 & 63) + TABLE.charAt(buffer & 63); - } - if (padding == 2) { - a = input.charCodeAt(position) << 8; - b = input.charCodeAt(++position); - buffer = a + b; - output += TABLE.charAt(buffer >> 10) + TABLE.charAt(buffer >> 4 & 63) + TABLE.charAt(buffer << 2 & 63) + "="; - } else if (padding == 1) { - buffer = input.charCodeAt(position); - output += TABLE.charAt(buffer >> 2) + TABLE.charAt(buffer << 4 & 63) + "=="; - } - return output; - }; - var base64 = { - "encode": encode, - "decode": decode, - "version": "1.0.0" - }; - if (typeof define == "function" && typeof define.amd == "object" && define.amd) { - define(function() { - return base64; - }); - } else if (freeExports && !freeExports.nodeType) { - if (freeModule) { - freeModule.exports = base64; - } else { - for (var key in base64) { - base64.hasOwnProperty(key) && (freeExports[key] = base64[key]); - } - } - } else { - root.base64 = base64; - } - })(exports); - } -}); -export default require_base64(); -/*! Bundled license information: - -base-64/base64.js: - (*! https://mths.be/base64 v1.0.0 by @mathias | MIT license *) -*/ -//# sourceMappingURL=base-64.js.map diff --git a/.vite/deps/base-64.js.map b/.vite/deps/base-64.js.map deleted file mode 100644 index 79b0703..0000000 --- a/.vite/deps/base-64.js.map +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": 3, - "sources": ["../../node_modules/base-64/base64.js"], - "sourcesContent": ["/*! https://mths.be/base64 v1.0.0 by @mathias | MIT license */\n;(function(root) {\n\n\t// Detect free variables `exports`.\n\tvar freeExports = typeof exports == 'object' && exports;\n\n\t// Detect free variable `module`.\n\tvar freeModule = typeof module == 'object' && module &&\n\t\tmodule.exports == freeExports && module;\n\n\t// Detect free variable `global`, from Node.js or Browserified code, and use\n\t// it as `root`.\n\tvar freeGlobal = typeof global == 'object' && global;\n\tif (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {\n\t\troot = freeGlobal;\n\t}\n\n\t/*--------------------------------------------------------------------------*/\n\n\tvar InvalidCharacterError = function(message) {\n\t\tthis.message = message;\n\t};\n\tInvalidCharacterError.prototype = new Error;\n\tInvalidCharacterError.prototype.name = 'InvalidCharacterError';\n\n\tvar error = function(message) {\n\t\t// Note: the error messages used throughout this file match those used by\n\t\t// the native `atob`/`btoa` implementation in Chromium.\n\t\tthrow new InvalidCharacterError(message);\n\t};\n\n\tvar TABLE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';\n\t// http://whatwg.org/html/common-microsyntaxes.html#space-character\n\tvar REGEX_SPACE_CHARACTERS = /[\\t\\n\\f\\r ]/g;\n\n\t// `decode` is designed to be fully compatible with `atob` as described in the\n\t// HTML Standard. http://whatwg.org/html/webappapis.html#dom-windowbase64-atob\n\t// The optimized base64-decoding algorithm used is based on @atk’s excellent\n\t// implementation. https://gist.github.com/atk/1020396\n\tvar decode = function(input) {\n\t\tinput = String(input)\n\t\t\t.replace(REGEX_SPACE_CHARACTERS, '');\n\t\tvar length = input.length;\n\t\tif (length % 4 == 0) {\n\t\t\tinput = input.replace(/==?$/, '');\n\t\t\tlength = input.length;\n\t\t}\n\t\tif (\n\t\t\tlength % 4 == 1 ||\n\t\t\t// http://whatwg.org/C#alphanumeric-ascii-characters\n\t\t\t/[^+a-zA-Z0-9/]/.test(input)\n\t\t) {\n\t\t\terror(\n\t\t\t\t'Invalid character: the string to be decoded is not correctly encoded.'\n\t\t\t);\n\t\t}\n\t\tvar bitCounter = 0;\n\t\tvar bitStorage;\n\t\tvar buffer;\n\t\tvar output = '';\n\t\tvar position = -1;\n\t\twhile (++position < length) {\n\t\t\tbuffer = TABLE.indexOf(input.charAt(position));\n\t\t\tbitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;\n\t\t\t// Unless this is the first of a group of 4 characters…\n\t\t\tif (bitCounter++ % 4) {\n\t\t\t\t// …convert the first 8 bits to a single ASCII character.\n\t\t\t\toutput += String.fromCharCode(\n\t\t\t\t\t0xFF & bitStorage >> (-2 * bitCounter & 6)\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t\treturn output;\n\t};\n\n\t// `encode` is designed to be fully compatible with `btoa` as described in the\n\t// HTML Standard: http://whatwg.org/html/webappapis.html#dom-windowbase64-btoa\n\tvar encode = function(input) {\n\t\tinput = String(input);\n\t\tif (/[^\\0-\\xFF]/.test(input)) {\n\t\t\t// Note: no need to special-case astral symbols here, as surrogates are\n\t\t\t// matched, and the input is supposed to only contain ASCII anyway.\n\t\t\terror(\n\t\t\t\t'The string to be encoded contains characters outside of the ' +\n\t\t\t\t'Latin1 range.'\n\t\t\t);\n\t\t}\n\t\tvar padding = input.length % 3;\n\t\tvar output = '';\n\t\tvar position = -1;\n\t\tvar a;\n\t\tvar b;\n\t\tvar c;\n\t\tvar buffer;\n\t\t// Make sure any padding is handled outside of the loop.\n\t\tvar length = input.length - padding;\n\n\t\twhile (++position < length) {\n\t\t\t// Read three bytes, i.e. 24 bits.\n\t\t\ta = input.charCodeAt(position) << 16;\n\t\t\tb = input.charCodeAt(++position) << 8;\n\t\t\tc = input.charCodeAt(++position);\n\t\t\tbuffer = a + b + c;\n\t\t\t// Turn the 24 bits into four chunks of 6 bits each, and append the\n\t\t\t// matching character for each of them to the output.\n\t\t\toutput += (\n\t\t\t\tTABLE.charAt(buffer >> 18 & 0x3F) +\n\t\t\t\tTABLE.charAt(buffer >> 12 & 0x3F) +\n\t\t\t\tTABLE.charAt(buffer >> 6 & 0x3F) +\n\t\t\t\tTABLE.charAt(buffer & 0x3F)\n\t\t\t);\n\t\t}\n\n\t\tif (padding == 2) {\n\t\t\ta = input.charCodeAt(position) << 8;\n\t\t\tb = input.charCodeAt(++position);\n\t\t\tbuffer = a + b;\n\t\t\toutput += (\n\t\t\t\tTABLE.charAt(buffer >> 10) +\n\t\t\t\tTABLE.charAt((buffer >> 4) & 0x3F) +\n\t\t\t\tTABLE.charAt((buffer << 2) & 0x3F) +\n\t\t\t\t'='\n\t\t\t);\n\t\t} else if (padding == 1) {\n\t\t\tbuffer = input.charCodeAt(position);\n\t\t\toutput += (\n\t\t\t\tTABLE.charAt(buffer >> 2) +\n\t\t\t\tTABLE.charAt((buffer << 4) & 0x3F) +\n\t\t\t\t'=='\n\t\t\t);\n\t\t}\n\n\t\treturn output;\n\t};\n\n\tvar base64 = {\n\t\t'encode': encode,\n\t\t'decode': decode,\n\t\t'version': '1.0.0'\n\t};\n\n\t// Some AMD build optimizers, like r.js, check for specific condition patterns\n\t// like the following:\n\tif (\n\t\ttypeof define == 'function' &&\n\t\ttypeof define.amd == 'object' &&\n\t\tdefine.amd\n\t) {\n\t\tdefine(function() {\n\t\t\treturn base64;\n\t\t});\n\t}\telse if (freeExports && !freeExports.nodeType) {\n\t\tif (freeModule) { // in Node.js or RingoJS v0.8.0+\n\t\t\tfreeModule.exports = base64;\n\t\t} else { // in Narwhal or RingoJS v0.7.0-\n\t\t\tfor (var key in base64) {\n\t\t\t\tbase64.hasOwnProperty(key) && (freeExports[key] = base64[key]);\n\t\t\t}\n\t\t}\n\t} else { // in Rhino or a web browser\n\t\troot.base64 = base64;\n\t}\n\n}(this));\n"], - "mappings": "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", - "names": [] -} diff --git a/.vite/deps/package.json b/.vite/deps/package.json deleted file mode 100644 index 3dbc1ca..0000000 --- a/.vite/deps/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "module" -} diff --git a/api/renyuan.js b/api/renyuan.js index 636b05a..6990e57 100644 --- a/api/renyuan.js +++ b/api/renyuan.js @@ -57,13 +57,14 @@ export function queryZyzgdjByRyLdhth(ldhth) { // 获取人员职业资格等级 }) } -// ryList: '/cxchrygxxtj/cxcHrYgxxtj/list', -// ryByXb: '/cxcRyData/countByXb', -// ryByNl: '/cxcRyData/countByNl', -// ryByXbTotal: '/cxcRyData/countByXbTotal', -// ryByNlTotal: '/cxcRyData/countByNlTotal', -// bmList: '/sys/sysDepart/queryTreeList' +export function queryJxkhByRyLdhth(ldhth) { // 绩效考核信息 + return https({ + url: '/cxc_rlzy.zb/cxcRlzyZb/listCxcRlzyJxkhByMainId', + method: 'get', + data: ldhth + }) +} export function cxcHrYgxxtj(parm) { // 获取员工信息统计 return https({ @@ -73,33 +74,9 @@ export function cxcHrYgxxtj(parm) { // 获取员工信息统计 }) } -export function cxcRyDatacountByXb(parm) { // 通过性别获取员工信息统计 +export function cxcRyDataTongji(url, parm) { // 员工信息统计 return https({ - url: '/cxcRyData/countByXb', - method: 'get', - data: parm - }) -} - -export function cxcRyDatacountByNl(parm) { // 通过年龄获取员工信息统计 - return https({ - url: '/cxcRyData/countByNl', - method: 'get', - data: parm - }) -} - -export function cxcRyDatacountByXbTotal(parm) { // 通过性别获取员工信息统计 - return https({ - url: '/cxcRyData/countByXbTotal', - method: 'get', - data: parm - }) -} - -export function cxcRyDatacountByNlTotal(parm) { // 通过年龄获取员工信息统计 - return https({ - url: '/cxcRyData/countByNlTotal', + url: url, method: 'get', data: parm }) diff --git a/bpm/leaveApplication/index.vue b/bpm/leaveApplication/index.vue index a9c86a6..4a79283 100644 --- a/bpm/leaveApplication/index.vue +++ b/bpm/leaveApplication/index.vue @@ -182,6 +182,14 @@ }).then((res) => { if (res.success) { step.value = res.result.records + step.value = step.value.map(item => { + if (item.name === 'start') { + item.name = '开始'; + } else if (item.name === 'end') { + item.name = '结束'; + } + return item; + }); } }) } diff --git a/manifest.json b/manifest.json index 57ec6a8..dbcf523 100644 --- a/manifest.json +++ b/manifest.json @@ -1,123 +1,122 @@ { - "name" : "数智产销", - "appid" : "__UNI__9F097F0", - "description" : "", - "versionName" : "1.1.1", - "versionCode" : 20250106, - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - "compatible" : { - "ignoreVersion" : true - }, - /* 模块配置 */ - "modules" : { - "Geolocation" : {}, - "Fingerprint" : {}, - "Camera" : {}, - "Barcode" : {} - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : { - "dSYMs" : false - }, - /* SDK配置 */ - "sdkConfigs" : { - "ad" : {}, - "geolocation" : { - "system" : { - "__platform__" : [ "android" ] - } - } - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - } - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "", - "setting" : { - "urlCheck" : false - }, - "usingComponents" : true - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "3" + "name": "数智产销", + "appid": "__UNI__9F097F0", + "description": "", + "versionName": "1.1.4.1", + "versionCode": 20250121, + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + "compatible": { + "ignoreVersion": true + }, + /* 模块配置 */ + "modules": { + "Geolocation": {}, + "Fingerprint": {}, + "Camera": {}, + "Barcode": {} + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": { + "dSYMs": false + }, + /* SDK配置 */ + "sdkConfigs": { + "ad": {}, + "geolocation": { + "system": { + "__platform__": ["android"] + } + } + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + } + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "", + "setting": { + "urlCheck": false + }, + "usingComponents": true + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "3" } -/* 模块配置 */ - +/* 模块配置 */ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..ed89a0e --- /dev/null +++ b/package-lock.json @@ -0,0 +1,95 @@ +{ + "name": "cxc-szcx-uniapp", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "@dcloudio/uni-ui": "^1.5.6", + "base-64": "^1.0.0", + "dayjs": "^1.11.13", + "echarts": "^5.6.0" + } + }, + "node_modules/@dcloudio/uni-ui": { + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.6.tgz", + "integrity": "sha512-jmb98PasFvZkrIDXGh94GbdWg2/jyhgs1HUG+bU8eyL7Ltias/5XBz4q8w9RXyWUfqepJRqapPA2IIQpLCuTIg==", + "license": "Apache-2.0" + }, + "node_modules/base-64": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz", + "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" + }, + "node_modules/dayjs": { + "version": "1.11.13", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz", + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" + }, + "node_modules/echarts": { + "version": "5.6.0", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz", + "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "2.3.0", + "zrender": "5.6.1" + } + }, + "node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", + "license": "0BSD" + }, + "node_modules/zrender": { + "version": "5.6.1", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz", + "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", + "license": "BSD-3-Clause", + "dependencies": { + "tslib": "2.3.0" + } + } + }, + "dependencies": { + "@dcloudio/uni-ui": { + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.6.tgz", + "integrity": "sha512-jmb98PasFvZkrIDXGh94GbdWg2/jyhgs1HUG+bU8eyL7Ltias/5XBz4q8w9RXyWUfqepJRqapPA2IIQpLCuTIg==" + }, + "base-64": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz", + "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" + }, + "dayjs": { + "version": "1.11.13", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz", + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" + }, + "echarts": { + "version": "5.6.0", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz", + "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", + "requires": { + "tslib": "2.3.0", + "zrender": "5.6.1" + } + }, + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, + "zrender": { + "version": "5.6.1", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz", + "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", + "requires": { + "tslib": "2.3.0" + } + } + } +} diff --git a/pages.json b/pages.json index 12326a4..f4248b9 100644 --- a/pages.json +++ b/pages.json @@ -230,7 +230,15 @@ { "path": "pages/views/renliziyuan/renyuanxinxi/tongji", "style": { - "navigationBarTitleText": "人员统计信息", + "navigationBarTitleText": "人员年龄分组统计信息", + "navigationBarTextStyle": "white" + + } + }, + { + "path": "pages/views/renliziyuan/renyuanxinxi/xbtongji", + "style": { + "navigationBarTitleText": "人员性别分组统计信息", "navigationBarTextStyle": "white" } diff --git a/pages/views/renliziyuan/renyuanxinxi/detail.vue b/pages/views/renliziyuan/renyuanxinxi/detail.vue index dd036d2..d399ae9 100644 --- a/pages/views/renliziyuan/renyuanxinxi/detail.vue +++ b/pages/views/renliziyuan/renyuanxinxi/detail.vue @@ -4,6 +4,45 @@ + + + + + + 序号 + + + + + 绩效考核年份 + + + + + 绩效考核成绩 + + + + + + + + + + {{index+1}} + + + + + {{item.nf}} + + + + {{item.khcj+"---"+item.khcj_dictText}} + + + + @@ -248,7 +287,8 @@ queryJtzycyByRyLdhth, queryXlxxByRyLdhth, queryGbxxByRyLdhth, - queryZyzgdjByRyLdhth + queryZyzgdjByRyLdhth, + queryJxkhByRyLdhth } from '@/api/renyuan.js' import { useStore @@ -268,10 +308,22 @@ const xlxxList = ref([]) // 人员其他子表信息-学历证书 const gbxxList = ref([]) // 人员其他子表信息-干部信息 const zyzgdjList = ref([]) // 人员其他子表信息-职业资格等级 + const jxkhxxList = ref([]) // 人员其他子表信息-绩效考核信息 function getChildTable() { console.log(ldhth.value) + + queryJxkhByRyLdhth({ + "ldhth": ldhth.value + }).then((res) => { + // console.log(res); + jxkhxxList.value = res.result.records + // console.log(jxkhxxList.value) + }).catch((err) => { + console.log(err); + }) + queryGbxxByRyLdhth({ "ldhth": ldhth.value }).then((res) => { @@ -327,20 +379,29 @@ xlxxList.value = [] if (res.result.records.length > 0) { var rress = res.result.records + // console.log(rress); for (let i = 0; i < rress.length; i++) { - if (rress[i].onexl == 1) { + if (rress[i].onexl == 1 & rress[i].zgxl == 1) { + rress[i].xllb = "第一学历" + xlxxList.value.push(JSON.parse(JSON.stringify(rress[i]))) + // console.log(xlxxList.value) + rress[i].xllb = "最高学历" + xlxxList.value.push(JSON.parse(JSON.stringify(rress[i]))) + // console.log(xlxxList.value) + } + if (rress[i].onexl == 1 & rress[i].zgxl != 1) { rress[i].xllb = "第一学历" xlxxList.value.push(rress[i]) + } - if (rress[i].zgxl == 1) { + if (rress[i].onexl != 1 & rress[i].zgxl == 1) { rress[i].xllb = "最高学历" xlxxList.value.push(rress[i]) } - } - } - console.log(xlxxList.value); + + } } }).catch((err) => { console.log(err); @@ -517,7 +578,9 @@ vertical-align: middle; border-bottom: 1px solid #919191; border-left: 1px solid #919191; - text-overflow: ellipsis; + text-align: center; + word-wrap: break-word; + overflow-wrap: break-word; } \ No newline at end of file diff --git a/pages/views/renliziyuan/renyuanxinxi/index.vue b/pages/views/renliziyuan/renyuanxinxi/index.vue index 7a820b5..112202c 100644 --- a/pages/views/renliziyuan/renyuanxinxi/index.vue +++ b/pages/views/renliziyuan/renyuanxinxi/index.vue @@ -8,28 +8,31 @@ - + + - - - \ No newline at end of file + diff --git a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue index 5c25ddf..94914d7 100644 --- a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue +++ b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue @@ -1,8 +1,7 @@ @@ -46,6 +46,8 @@ let selectDepartIDS = ref([]) //选中的级联单位ID数组 let tempSelectDepartID = ref("") //临时选择的单位ID + let departInfo = ref({}) //"单位的全部信息" + let $emit = defineEmits(['change']); const getDepartList = () => { @@ -59,17 +61,22 @@ }) } const onnodeclick = ((e) => { - // console.log(e) + departInfo.value = e; if (props.returnCodeOrID = "orgCode") { tempSelectDepartID.value = e.orgCode } else { tempSelectDepartID.value = e.value } + + }) + + const onchange = ((e) => { + $emit('change', e.detail.value[e.detail.value.length - 1].value, {}) }) const onpopupclosed = ((e) => { selectDepartID.value = tempSelectDepartID.value - $emit('change', selectDepartID.value) + $emit('change', selectDepartID.value, departInfo) }) onLoad((e) => { getDepartList(); diff --git a/uni_modules/trq-depart-select/readme.md b/uni_modules/trq-depart-select/readme.md index 621687b..7d5b2c3 100644 --- a/uni_modules/trq-depart-select/readme.md +++ b/uni_modules/trq-depart-select/readme.md @@ -1,5 +1,25 @@ # trq-depart-select +# 1.0.1 +更新，添加返回值，将整个机构对象返回父组件 +```javascript +const onpopupclosed = ((e) => { + selectDepartID.value = tempSelectDepartID.value + $emit('change', selectDepartID.value, departInfo) +}) +``` +增加选择到最后层级触发的change时间，返回数据到父组件的功能 +```javascript +const onchange = ((e) => { + $emit('change', e.detail.value[e.detail.value.length - 1].value, {}) +}) + +``` + + + + # 1.0 + 属性 returnCodeOrID 默认值 orgCode， 组件返回单位的orgCode， 不设置属性或设置为其他，组件返回 单位ID 事件：change 选择内容发生变化时发生，通过emit 返回给父组件 选择单位的ID或code