From df5f642136603847aa545952749fb41b5134527b Mon Sep 17 00:00:00 2001
From: zxy <353513737@qq.com>
Date: Thu, 29 Feb 2024 20:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A7=8Dbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/chengdu/detail.html | 2 +-
public/chengdu/index.html | 2 +-
public/chengdu/js/index.js | 2 +-
.../tenant/mission/Dialog/CopyMission.vue | 26 +++++++---
src/views/tenant/works/Dialog/CopyMission.vue | 51 +++++++++++++------
src/views/util/mission-view.vue | 1 +
src/views/util/work-view.vue | 1 +
7 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/public/chengdu/detail.html b/public/chengdu/detail.html
index 1fabb0c..71eefde 100644
--- a/public/chengdu/detail.html
+++ b/public/chengdu/detail.html
@@ -22,7 +22,7 @@
回到首页
- 2023.12.10-2023.12.28
+ 2024.3
diff --git a/public/chengdu/index.html b/public/chengdu/index.html
index 2a511c1..b5bd523 100644
--- a/public/chengdu/index.html
+++ b/public/chengdu/index.html
@@ -21,7 +21,7 @@
德阳市劳动力需求大数据平台
- 2023.12.10-2023.12.28
+ 2024.3
diff --git a/public/chengdu/js/index.js b/public/chengdu/js/index.js
index 79dd10d..b209116 100644
--- a/public/chengdu/js/index.js
+++ b/public/chengdu/js/index.js
@@ -664,7 +664,7 @@ function getData2() {
offset: 1, color: '#F58158'
}], false),
width: 3, // 线的宽度
- opacity: 0.5, // 线的透明度
+ opacity: 1, // 线的透明度
curveness: 0.1 // 线的完全程度
}
},
diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue
index 519d0b8..ef3758c 100644
--- a/src/views/tenant/mission/Dialog/CopyMission.vue
+++ b/src/views/tenant/mission/Dialog/CopyMission.vue
@@ -477,7 +477,7 @@ export default {
{
label: "工种",
prop: "skillIds",
- type: "tree",
+ type: "cascader",
search: true,
display: true,
dicUrl: `/api/jobslink-api/tenant/worktypes/base/list?type=1`,
@@ -487,6 +487,7 @@ export default {
props: {
label: "name",
value: "id",
+ children: "child"
},
rules: [
{
@@ -974,8 +975,17 @@ export default {
});
if(this.skillArr && this.skillArr.length > 0) {
this.skillArr.forEach(item => {
- if(item.id == row.skillIds) {
- row.skillNames = item.name
+ if(item.id == row.skillIds[0]) {
+ console.log(row.skillIds[0])
+ row.worktypeNames = item.name
+ if(item.child && item.child.length > 0) {
+ item.child.forEach(item2 => {
+ if(item2.id == row.skillIds[1]) {
+ console.log(row.skillIds[1])
+ row.skillNames = item2.name;
+ }
+ })
+ }
}
})
}
@@ -993,8 +1003,9 @@ export default {
wageUnitCategory: row.wageUnitCategory,
tradeId: row.tradeId,
tradeNames: this.obj.tradeNames,
- worktypeIds: row.skillIds,
- skillIds: row.skillIds,
+ worktypeIds: row.skillIds[0],
+ worktypeNames: row.worktypeNames,
+ skillIds: row.skillIds[1],
skillNames: row.skillNames,
missionDesc: row.missionDesc,
userNature: row.userNature,
@@ -1044,8 +1055,9 @@ export default {
wage: row.wage,
wageUnitCategory: row.wageUnitCategory,
tradeId: row.tradeId,
- worktypeIds: row.skillIds,
- skillIds: row.skillIds,
+ worktypeIds: row.skillIds[0],
+ worktypeNames: row.worktypeNames,
+ skillIds: row.skillIds[1],
skillNames: row.skillNames,
missionDesc: row.missionDesc,
userNature: row.userNature,
diff --git a/src/views/tenant/works/Dialog/CopyMission.vue b/src/views/tenant/works/Dialog/CopyMission.vue
index 6947292..27f5caf 100644
--- a/src/views/tenant/works/Dialog/CopyMission.vue
+++ b/src/views/tenant/works/Dialog/CopyMission.vue
@@ -172,6 +172,7 @@ const validateTel = (rule, value, callback) => {
export default {
data() {
return {
+ skillArr: [],
id: "",
title: "",
type: "",
@@ -554,8 +555,8 @@ export default {
},
{
label: "岗位名",
- prop: "worktypeIds",
- type: "tree",
+ prop: "skillIds",
+ type: "cascader",
search: true,
display: true,
dicUrl: `/api/jobslink-api/tenant/worktypes/base/list?type=2`,
@@ -565,6 +566,7 @@ export default {
props: {
label: "name",
value: "id",
+ children: "child"
},
rules: [
{
@@ -1000,6 +1002,7 @@ export default {
// 获取岗位名
getWorkTypes(2).then(res => {
console.log(res)
+ this.skillArr = res.data.data;
})
},
closed() {
@@ -1040,14 +1043,28 @@ export default {
});
}else{
row.address = this.$refs.selectMap.addressLocation;
- let ids = [];
- let name = [];
- this.selectedSkills.forEach((ele) => {
- ids.push(ele.id);
- name.push(ele.name);
- });
- let skillIds = ids.join(",");
- let skillNames = name.join(",");
+ // let ids = [];
+ // let name = [];
+ // this.selectedSkills.forEach((ele) => {
+ // ids.push(ele.id);
+ // name.push(ele.name);
+ // });
+ // let skillIds = ids.join(",");
+ // let skillNames = name.join(",");
+ if(this.skillArr && this.skillArr.length > 0) {
+ this.skillArr.forEach(item => {
+ if(item.id == row.skillIds[0]) {
+ row.worktypeNames = item.name
+ if(item.child && item.child.length > 0) {
+ item.child.forEach(item2 => {
+ if(item2.id == row.skillIds[1]) {
+ row.skillNames = item2.name;
+ }
+ })
+ }
+ }
+ })
+ }
if (this.type === "add" || this.type === "copy") {
this.$jlEvent("trialCheck")
.then(() => {
@@ -1062,9 +1079,10 @@ export default {
wageUnitCategory: row.wageUnitCategory,
tradeId: row.tradeId,
tradeNames: this.obj.tradeNames,
- worktypeIds: row.worktypeIds,
- skillIds: skillIds,
- skillNames: skillNames,
+ worktypeIds: row.skillIds[0],
+ worktypeNames: row.worktypeNames,
+ skillIds: row.skillIds[1],
+ skillNames: row.skillNames,
jobDescription: row.jobDescription,
userNature: row.userNature,
sex: row.sex,
@@ -1114,9 +1132,10 @@ export default {
wageUnitCategory: row.wageUnitCategory,
tradeId: row.tradeId,
tradeNames: this.obj.tradeNames,
- worktypeIds: row.worktypeIds,
- skillIds: skillIds,
- skillNames: skillNames,
+ worktypeIds: row.skillIds[0],
+ worktypeNames: row.worktypeNames,
+ skillIds: row.skillIds[1],
+ skillNames: row.skillNames,
jobDescription: row.jobDescription,
userNature: row.userNature,
sex: row.sex,
diff --git a/src/views/util/mission-view.vue b/src/views/util/mission-view.vue
index c5388a4..f275e64 100644
--- a/src/views/util/mission-view.vue
+++ b/src/views/util/mission-view.vue
@@ -57,6 +57,7 @@
+ {{ model.worktypeNames }} /
{{ model.skillNames }}
diff --git a/src/views/util/work-view.vue b/src/views/util/work-view.vue
index afe512c..eb72ec8 100644
--- a/src/views/util/work-view.vue
+++ b/src/views/util/work-view.vue
@@ -59,6 +59,7 @@
+ {{ model.worktypeNames }} /
{{ model.skillNames }}