工种bug修复

public/chengdu/detail.html

@@ -22,7 +22,7 @@
       <span onclick="history.go(-1)" class="cd_back_home_text">回到首页</span>
       <img src="images/cd_head_bg.png" alt="" class="cd_img_bg" />
       <span style="font-size: 28px;" id="name"></span>
-      <span class="cd_title_left_calendar">2023.12.10-2023.12.28</span>
+      <span class="cd_title_left_calendar">2024.3</span>
       <img src="images/cd_calendar_icon.png" class="cd_title_right_calendar_icon" />
       <img src="images/cd_right_corner.png" alt="" class="cd_title_right" />
     </div>

public/chengdu/index.html

@@ -21,7 +21,7 @@
       <img src="images/cd_left_corner.png" alt="" class="cd_title_left" />
       <img src="images/cd_head_bg.png" alt="" class="cd_img_bg" />
       <span id="name">德阳市劳动力需求大数据平台</span>
-      <span class="cd_title_left_calendar">2023.12.10-2023.12.28</span>
+      <span class="cd_title_left_calendar">2024.3</span>
       <img src="images/cd_calendar_icon.png" class="cd_title_right_calendar_icon" />
       <img src="images/cd_right_corner.png" alt="" class="cd_title_right" />
     </div>

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 // 线的完全程度
                 }
               },

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) {
+          if(item.id == row.skillIds[0]) {
-            row.skillNames = item.name
+            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,
+              worktypeIds: row.skillIds[0],
-              skillIds: row.skillIds,
+              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,
+          worktypeIds: row.skillIds[0],
-          skillIds: row.skillIds,
+          worktypeNames: row.worktypeNames,
+          skillIds: row.skillIds[1],
           skillNames: row.skillNames,
           missionDesc: row.missionDesc,
           userNature: row.userNature,

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",
+                prop: "skillIds",
-                type: "tree",
+                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 ids = [];
-      let name = [];
+      // let name = [];
-      this.selectedSkills.forEach((ele) => {
+      // this.selectedSkills.forEach((ele) => {
-        ids.push(ele.id);
+      //   ids.push(ele.id);
-        name.push(ele.name);
+      //   name.push(ele.name);
-      });
+      // });
-      let skillIds = ids.join(",");
+      // let skillIds = ids.join(",");
-      let skillNames = name.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,
+              worktypeIds: row.skillIds[0],
-              skillIds: skillIds,
+              worktypeNames: row.worktypeNames,
-              skillNames: skillNames,
+              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,
+          worktypeIds: row.skillIds[0],
-          skillIds: skillIds,
+          worktypeNames: row.worktypeNames,
-          skillNames: skillNames,
+          skillIds: row.skillIds[1],
+          skillNames: row.skillNames,
           jobDescription: row.jobDescription,
           userNature: row.userNature,
           sex: row.sex,

src/views/util/mission-view.vue

@@ -57,6 +57,7 @@
             <el-col span="12">
               <el-form-item>
                 <label slot="label">工&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种：</label>
+                {{ model.worktypeNames }} /
                 {{ model.skillNames }}
               </el-form-item>
             </el-col>

src/views/util/work-view.vue

@@ -59,6 +59,7 @@
               <el-col span="12">
                 <el-form-item>
                   <label slot="label">工&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种：</label>
+                  {{ model.worktypeNames }} /
                   {{ model.skillNames }}
                 </el-form-item>
               </el-col>