diff --git a/apiRc/login.js b/apiRc/login.js index c085b13..eb70902 100644 --- a/apiRc/login.js +++ b/apiRc/login.js @@ -1,7 +1,7 @@ /* * @Date: 2025-10-31 11:06:15 * @LastEditors: shirlwang - * @LastEditTime: 2025-11-03 15:51:28 + * @LastEditTime: 2025-12-16 16:29:33 */ import request from '@/utilsRc/request' @@ -13,6 +13,14 @@ export function login(data) { params: data, }) } +// 登录方法 +export function loginByUserId(data) { + return request({ + method: 'get', + url: '/ksSso/getTjmhTokenById?userId='+data, + // params: data, + }) +} export function smsLogin(data) { return request({ method: 'post', diff --git a/apiRc/user/user.js b/apiRc/user/user.js index a40ac31..7e9279b 100644 --- a/apiRc/user/user.js +++ b/apiRc/user/user.js @@ -1,14 +1,14 @@ /* * @Date: 2025-01-XX - * @LastEditors: - * @LastEditTime: + * @LastEditors: shirlwang + * @LastEditTime: 2025-12-16 16:35:06 */ import request from '@/utilsRc/request' // 获取用户信息(职业规划推荐用) export function appUserInfo() { return request({ - fullUrl: 'http://222.80.110.161:11111/api/ks/app/user/appUserInfo', + fullUrl: 'http://222.80.110.161:80/api/ks/app/user/appUserInfo', method: 'get' }) } diff --git a/common/globalFunction.js b/common/globalFunction.js index f97113a..dab1430 100644 --- a/common/globalFunction.js +++ b/common/globalFunction.js @@ -51,7 +51,7 @@ const prePage = () => { } // export const urls ='http://10.110.145.145/images/train/' -export const urls ='http://222.80.110.161:11111/images/train/' +export const urls ='http://222.80.110.161:80/images/train/' /** * 页面跳转封装,支持 query 参数传递和返回回调 diff --git a/packageB/apiRc/policy/index.js b/packageB/apiRc/policy/index.js new file mode 100644 index 0000000..df350eb --- /dev/null +++ b/packageB/apiRc/policy/index.js @@ -0,0 +1,9 @@ +import request from "@/utilsRc/request"; +//政策列表 +export function getPolicyList(queryParams) { + return request({ + url: "/portal/policyInfo/portalList", + method: "get", + params: queryParams, + }); +} \ No newline at end of file diff --git a/packageB/login2.vue b/packageB/login2.vue new file mode 100644 index 0000000..2c8ece3 --- /dev/null +++ b/packageB/login2.vue @@ -0,0 +1,301 @@ + + + + + \ No newline at end of file diff --git a/packageB/priority/helpFilter.vue b/packageB/priority/helpFilter.vue index 948a7d8..1f8d495 100644 --- a/packageB/priority/helpFilter.vue +++ b/packageB/priority/helpFilter.vue @@ -158,7 +158,7 @@ - + @@ -226,12 +226,17 @@ const handleReset = () =>{ getDataList('refresh') } onMounted(async () => { - await loadLevelData('201'); + // await loadLevelData('201'); }); -onLoad(() => { - getDictionary() - // getDeptOptions() - getDataList('refresh'); +onLoad(async () => { + let token=uni.getStorageSync('fourLevelLinkage-token') + if(token){ + await loadLevelData('201'); + getDictionary() + getDataList('refresh'); + }else{ + navTo('/packageB/login2'); + } }); function getDictionary(){ $api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => { @@ -256,7 +261,7 @@ function getTaskTypeLabelByValue(value) { // 加载某一级的数据(parentId 为空表示根) async function loadLevelData(parentId) { let header = { - 'Authorization': uni.getStorageSync('Padmin-Token'), + 'Authorization': uni.getStorageSync('fourLevelLinkage-token'), 'Content-Type': "application/x-www-form-urlencoded" }; let params = { parentId }; @@ -336,7 +341,7 @@ function findNodeByValue(nodes, value) { } function getDeptOptions(){ let header={ - 'Authorization':uni.getStorageSync('Padmin-Token'), + 'Authorization':uni.getStorageSync('fourLevelLinkage-token'), 'Content-Type': "application/x-www-form-urlencoded" } let params={ @@ -349,7 +354,7 @@ function getDataList(type = 'add') { let maxPage=Math.ceil(totalNum.value/pageSize.value) let params=({...formData}) let header={ - 'Authorization':uni.getStorageSync('Padmin-Token'), + 'Authorization':uni.getStorageSync('fourLevelLinkage-token'), 'Content-Type': "application/x-www-form-urlencoded" } if (type === 'refresh') { @@ -374,7 +379,11 @@ function getDataList(type = 'add') { } } function goFollow(item) { - navTo(`/packageB/priority/helpFollow?id=${item.goal_person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`); + navTo(`/packageB/priority/helpFollow?task_id=${item.task_id}&person_id=${item.person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`); +} +//智能推荐 +const goRecommend = (item) => { + navTo('/packageB/priority/recommend'); } diff --git a/packageB/priority/helpFollow.vue b/packageB/priority/helpFollow.vue index f1adc0a..7546523 100644 --- a/packageB/priority/helpFollow.vue +++ b/packageB/priority/helpFollow.vue @@ -105,7 +105,8 @@ const formData = reactive({ const personInfo=ref({ goalPersonId:'', name:'', - taskType:'' + taskType:'', + task_id:'' }) const followWays = ref([]) const followList = ref([]) @@ -161,11 +162,12 @@ const onDateChange = ( e) => { } function getFollowList(){ let header={ - 'Authorization':uni.getStorageSync('Padmin-Token'), + 'Authorization':uni.getStorageSync('fourLevelLinkage-token'), 'Content-Type': "application/x-www-form-urlencoded" } let params={ - goalPersonId:personInfo.value.goalPersonId + personId:personInfo.value.person_id, + taskId:personInfo.value.task_id } $api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => { console.log("resData",resData) @@ -209,7 +211,7 @@ const handleSubmit = () => { formRef.value?.validate() .then(() => { let header={ - 'Authorization':uni.getStorageSync('Padmin-Token') + 'Authorization':uni.getStorageSync('fourLevelLinkage-token') } formData.goalPersonId=personInfo.value.goalPersonId $api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => { @@ -245,9 +247,10 @@ const handleReset = () => { formData.nextContactDate = ''; } onLoad((options) => { - personInfo.value.goalPersonId=options.id + personInfo.value.person_id=options.person_id personInfo.value.name=options.name personInfo.value.taskType=options.taskType + personInfo.value.task_id=options.task_id getDictionary() getFollowList() }); diff --git a/packageB/priority/recommend.vue b/packageB/priority/recommend.vue new file mode 100644 index 0000000..d9fc6f7 --- /dev/null +++ b/packageB/priority/recommend.vue @@ -0,0 +1,413 @@ + + + + + \ No newline at end of file diff --git a/packageCa/utilCa/config.js b/packageCa/utilCa/config.js index 6400d7a..54dc437 100644 --- a/packageCa/utilCa/config.js +++ b/packageCa/utilCa/config.js @@ -2,9 +2,9 @@ let baseUrl = "" // #ifdef MP-WEIXIN // 编译项目,因为使用插件lime-echart,echart文件过大,需要非压缩代码方式编译,不然会很慢,发布的时候才压缩代码方式编译 if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') { - baseUrl = 'http://222.80.110.161:11111/career' // 开发环境 + baseUrl = 'http://222.80.110.161:80/career' // 开发环境 } else { - baseUrl = 'http://222.80.110.161:11111/career' // 生产环境 + baseUrl = 'http://222.80.110.161:80/career' // 生产环境 } // #endif diff --git a/packageRc/pages/daiban/daibandetail.vue b/packageRc/pages/daiban/daibandetail.vue index 7e9f3c0..3fc4d5e 100644 --- a/packageRc/pages/daiban/daibandetail.vue +++ b/packageRc/pages/daiban/daibandetail.vue @@ -412,7 +412,7 @@ @close="showTime = false" > --> - + diff --git a/packageRc/pages/needs/needDetail.vue b/packageRc/pages/needs/needDetail.vue index 4291010..0b00eef 100644 --- a/packageRc/pages/needs/needDetail.vue +++ b/packageRc/pages/needs/needDetail.vue @@ -1,7 +1,7 @@ diff --git a/packageRc/pages/needs/needsList.vue b/packageRc/pages/needs/needsList.vue index a636ab1..ae9d9fe 100644 --- a/packageRc/pages/needs/needsList.vue +++ b/packageRc/pages/needs/needsList.vue @@ -153,7 +153,7 @@ - +