ldeyun/cxc-szcx-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/ldeyun' into yzqUniapp

Browse Source 
# Conflicts:
#	.env.development
#	manifest.json
#	package-lock.json
#	pages/views/renliziyuan/renyuanxinxi/taizhang.vue
This commit is contained in:
yangzhq68909 2025-01-23 18:00:35 +08:00
commit 7d871f7151
7 changed files with 298 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -1,3 +1,3 @@
# 开发环境
# 请求接口地址
VITE_REQUEST_BASE_URL = https://36.112.48.190
VITE_REQUEST_BASE_URL = http://10.75.166.6:8080

9
api/renyuan.js
View File

@ -57,6 +57,15 @@ export function queryZyzgdjByRyLdhth(ldhth) { // 获取人员职业资格等级
})
}
export function queryJxkhByRyLdhth(ldhth) { // 绩效考核信息
return https({
url: '/cxc_rlzy.zb/cxcRlzyZb/listCxcRlzyJxkhByMainId',
method: 'get',
data: ldhth
})
}
// ryList: '/cxchrygxxtj/cxcHrYgxxtj/list',
// ryByXb: '/cxcRyData/countByXb',
// ryByNl: '/cxcRyData/countByNl',

3
manifest.json
View File

@ -3,7 +3,7 @@
"appid": "__UNI__9F097F0",
"description": "",
"versionName": "1.1.4",
"versionCode" : 20250123,
"versionCode": 20250121,
"transformPx": false,
/* 5+App特有相关 */
"app-plus": {
@ -120,4 +120,3 @@
"vueVersion": "3"
}
/* 模块配置 */

95
package-lock.json generated Normal file
View File

@ -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"
}
}
}
}

8
pages/login/login.vue
View File

@ -98,10 +98,10 @@
});
/*生产环境 begin */
loginApi({
username: un,
password: pw,
ip: getDeviceIp()
// loginApi({
// username: un,
// password: pw,
// ip: getDeviceIp()
/*生产环境 end */
/*开发环境 begin */

73
pages/views/renliziyuan/renyuanxinxi/detail.vue
View File

@ -4,6 +4,45 @@
<view style="padding: 10px 10px 10px 10px;">
<uni-title title="基本信息" type="h1" color="blue"></uni-title>
<yjly-row-cell :cellData="cellData" :rowDataCount="3"></yjly-row-cell>
<uni-title title="年度绩效考核" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="4">
<view class="titleStyle">
序号
</view>
</uni-col>
<uni-col :span="10">
<view class="titleStyle">
绩效考核年份
</view>
</uni-col>
<uni-col :span="10">
<view class="titleStyle">
绩效考核成绩
</view>
</uni-col>
</uni-row>
<uni-row>
<view v-for="(item,index) in jxkhxxList">
<uni-col :span="4">
<view class="dataStyle">
{{index+1}}
</view>
</uni-col>
<uni-col :span="10">
<view class="dataStyle">
{{item.nf}}
</view>
</uni-col><uni-col :span="10">
<view class="dataStyle">
{{item.khcj+"---"+item.khcj_dictText}}
</view>
</uni-col>
</view>
</uni-row>
<uni-title title="工作简历" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="4">
@ -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);

9
pages/views/renliziyuan/renyuanxinxi/taizhang.vue
View File

@ -99,12 +99,6 @@
width: 70,
align: 'center'
},
// {
// name: 'gzdw',
// label: '单位',
// align: 'center',
// width: 150
// },
{
name: 'xb_dictText',
label: '性别',
@ -120,6 +114,7 @@
{
name: 'operation',
type: 'operation',
width: 60,
fixed: true,
label: '操作',
align: 'center',
@ -140,7 +135,7 @@
})
function detail(record) {
// console.log(record)
uni.navigateTo({
url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record))
})