测试前

src/api/duty/gwDingXing.js

@@ -47,4 +47,52 @@ export function add_post_target(data) {
     data
   })
 }
+// 编辑岗位指标
+export function dit_post_target(data) {
+  return request({
+    url: '/postpc/dit_post_target',
+    method: 'post',
+    data
+  })
+}
+// 获取岗位指标关联部门相关岗位及提报人
+export function get_target_about_depart_to_post_man(data) {
+  return request({
+    url: '/postpc/get_target_about_depart_to_post_man',
+    method: 'post',
+    data
+  })
+}
+// 根据指标添加岗位细则
+export function add_post_target_cont(data) {
+  return request({
+    url: '/postpc/add_post_target_cont',
+    method: 'post',
+    data
+  })
+}
+// 根据指标获取岗位定性指标细则列表
+export function posttargetsunlist(data) {
+  return request({
+    url: '/postpc/posttargetsunlist',
+    method: 'post',
+    data
+  })
+}
+// 获取指标细则内容
+export function getdetailscont(data) {
+  return request({
+    url: '/postpc/getdetailscont',
+    method: 'post',
+    data
+  })
+}
+// 编辑定性指标细则内容
+export function editdeatilscont(data) {
+  return request({
+    url: '/postpc/editdeatilscont',
+    method: 'post',
+    data
+  })
+}
 

src/api/duty/gwFangan.js

@@ -0,0 +1,59 @@
+import request from '@/utils/requestFile'
+// 获取岗位方案内容列表
+export function get_post_scheme(data) {
+  return request({
+    url: '/postpc/get_post_scheme',
+    method: 'post',
+    data
+  })
+}
+// 获取岗位考核方案列表
+export function get_scheme_list(data) {
+    return request({
+      url: '/postpc/get_scheme_list',
+      method: 'post',
+      data
+    })
+  }
+// 获取岗位考核方案列表
+export function getpostabouttarget(data) {
+    return request({
+      url: '/postpc/getpostabouttarget',
+      method: 'post',
+      data
+    })
+  }
+// 引用指标部门指标
+export function quote_department_target(data) {
+    return request({
+      url: '/postpc/quote_department_target',
+      method: 'post',
+      data
+    })
+  }
+// 提交岗位考核方案
+export function submit_post_scheme(data) {
+    return request({
+      url: '/postpc/submit_post_scheme',
+      method: 'post',
+      data
+    })
+  }
+// 编辑方案版本状态或删除
+export function edit_scheme_state_of_del(data) {
+    return request({
+      url: '/postpc/edit_scheme_state_of_del',
+      method: 'post',
+      data
+    })
+  }
+// 获取复制岗位考核方案
+export function get_copy_sheme_infor(data) {
+    return request({
+      url: '/postpc/get_copy_sheme_infor',
+      method: 'post',
+      data
+    })
+  }
+
+

src/api/duty/projectNew.js

@@ -186,3 +186,11 @@ export function get_post_target(data) {
     data
   })
 }
+// 获取岗位子栏目详情
+export function get_sun_target_info(data) {
+  return request({
+    url: '/postpc/get_sun_target_info',
+    method: 'post',
+    data
+  })
+}

src/router/index.js

@@ -340,7 +340,7 @@ export const constantRoutes = [
       // UserHome 将被渲染到 User 的 <router-view> 内部
       { 
         path: 'departmentalAssessment',
-        component: () => import('@/views/assessmentProgram/departmentalAssessment'),
+        component: () => import('@/views/assessmentProgram/departmentBase'),
         meta: { title: '部门考核'}
       },
       { 

src/views/assessmentProgram/departmentBase.vue

@@ -0,0 +1,465 @@
+<template>
+    <!-- 考核指标录入 -->
+    <div class="dashboard-container">
+      
+      <div class="gva-table-box">
+        <el-container>
+          <!-- 左侧内容 -->
+          <el-aside
+            width="300px"
+            style="border-right: 1px solid rgb(220, 223, 230);height: 850px"
+          >
+            <el-tree
+              :data="GovthreeList2"
+              :props="defaultProps1"
+              @node-click="handleNodeClick"
+            ></el-tree>
+          </el-aside>
+          <el-aside
+            width="200px"
+            style="border-right: 1px solid rgb(220, 223, 230);height: 850px"
+          >
+            <el-tree
+              :data="postList"
+              :props="defaultProps1"
+              @node-click="NodePostClick"
+            ></el-tree>
+          </el-aside>
+          <!-- 右侧内容 -->
+          <el-main style="padding: 10px">
+            <div v-if="tableGWShow">
+              <gwDepartmentalAssessment :gwFromList="gwFromList"></gwDepartmentalAssessment>
+            </div>
+            <div v-if="tableBMShow">
+              <departmentalAssessment :bmId="bmId"></departmentalAssessment>
+            </div>
+          </el-main>
+        </el-container>
+      </div>
+      
+    </div>
+  </template>
+  
+  <script>
+  import { govthree, positionlist } from "@/api/personnel/post";
+  import { dutyclasslist } from "@/api/duty/dimension";
+  import departmentalAssessment from "@/views/assessmentProgram/departmentalAssessment.vue";
+  import gwDepartmentalAssessment from "@/views/assessmentProgram/gwDepartmentalAssessment.vue";
+  import {
+    posttargetlist,
+    addtarget,
+    gettargetinfo,
+    eiteassessinfo,
+    eitetarget,
+    deltarget,
+    editposttarget,
+    editstate,
+    addposttarget,
+  } from "@/api/duty/project";
+  import { getgroupdepartmap, getgroupuser } from "@/api/duty/group";
+  export default {
+    components: {
+        departmentalAssessment,
+        gwDepartmentalAssessment
+    },
+    name: "Dashboard",
+    data() {
+      return {
+        gwFromList:{
+          gwId:1,
+          bmId:1
+        },
+        tableGWShow: false,
+        tableBMShow: true,
+        gwId:1,
+        bmId:1,
+        GovthreeList2: [],
+        defaultProps1: {
+          children: "child",
+          label: "name",
+        },
+        grouplistBackup: [],
+        grouplist: [],
+        props: {
+          checkStrictly: true,
+          value: "id",
+          label: "name",
+          children: "children",
+          emitPath: false,
+          // multiple: true
+        },
+        userProps: {
+          value: "key",
+          label: "name",
+          children: "govlist",
+          emitPath: false,
+          multiple: true,
+        },
+        dutyclasslist: {},
+        searchList: {
+          page: 1,
+          pagesize: 10000,
+        },
+        // 查询详情的数据
+        editFrom: {},
+        // 修改状态提交数据
+        switchFrom: {},
+        // 删除数据提交
+        deleFrom: {},
+        // 编辑时数据
+        editAdd: {
+          unittitle: "",
+          parentId: "",
+        },
+        assessList: {},
+        // 添加数据
+        form: {
+          share: 2,
+          cycleattr: 1,
+          scoringmethod: 1,
+        },
+        // 弹窗变量
+        dialogFormVisible: false,
+        // 修改弹窗
+        editDialogFormVisible: false,
+        total: 0,
+        postListAdd: [],
+        postList: [],
+        tableData: [],
+        // 条件查询变量
+        searchInfo: {
+          page: 1,
+          pagesize: 10,
+        },
+        // 条件查询变量
+        abc: {
+          aaa: "111",
+          bbb: "222",
+        },
+      };
+    },
+    created() {
+      console.log(this.$store.state.user.token);
+      if (this.$store.state.user.token == "") {
+        this.$router.push("/login");
+      }
+      // 页面渲染时获取初始数据
+      this.getDataList();
+      this.getDutyclasslist();
+      this.getSystemadminlist();
+      this.getGrouplist();
+      this.getGovthree2();
+    },
+    methods: {
+      // 点击岗位列表
+      NodePostClick(val) {
+          this.gwId=val.id
+          this.gwFromList.gwId=val.id
+          this.gwFromList.orgid=val.administrativeorganization
+          this.tableGWShow=true
+          this.tableBMShow=false
+          console.log('岗位')
+        console.log(this.gwFromList);
+      },
+      // 获取岗位
+      async getPost(val) {
+        const from = {
+          organization: val.toString(),
+          page: 1,
+          pagesize: 10,
+        };
+        const res = await positionlist(from);
+        this.postList = res.data.list;
+      },
+      // 点击行政组织树
+      handleNodeClick(val) {
+        // this.searchInfo.organization=val.id
+        // this.searchInfo.organization=this.searchInfo.organization.toString()
+        this.getPost(val.id);
+        this.bmId=val.id
+        this.gwFromList.bmId=val.id
+        console.log('行政组织')
+        this.tableGWShow=false
+        this.tableBMShow=true
+        console.log(val);
+      },
+      // 添加时点击行政组织
+      async departChange(val) {
+        console.log(val);
+        // this.searchInfo.organization=val.id
+        // this.searchInfo.organization=this.searchInfo.organization.toString()
+        const from = {
+          organization: val.toString(),
+          page: 1,
+          pagesize: 10,
+        };
+        const res = await positionlist(from);
+        this.postListAdd = res.data.list;
+        console.log(val);
+      },
+      //   获取行政组织二级树
+      async getGovthree2() {
+        const res = await govthree();
+        this.GovthreeList2 = res.data[0].child;
+        console.log("this.GovthreeList2");
+        console.log(res.data[0].child);
+      },
+      // 获取员工列表
+      async getSystemadminlist() {
+        const from = {
+          level: 4,
+        };
+        const res = await getgroupuser(from);
+        this.grouplistBackup = res.data;
+        this.grouplistBackup.forEach((item) => {
+          if (item.govlist != null) {
+            // 即：this.digui(item);在这地方添加的
+            item.govlist.forEach((items) => {
+              // 下面的就是执行递归的方法，因为我是从第二层才开始需要往下挖的，所以这里多了个forEach,如果从第一层起，从item就好了，即：this.digui(item);在上面添加
+              this.digui(items); // 这里是源头，把一个对象开始递归，开始循环
+              // 如果想看完整数据，那么是在这里打印数据哦
+              console.log(items, "看我查看完整的数据哦");
+              // 因为上一步递归时，就已经把循环children的动作做完了，这里是验收递归方法的地方。
+            });
+          } else {
+            item.govlist = item.child;
+            // 如果第一层没有子项做的操作。。。。。
+          }
+        });
+        console.log(this.grouplistBackup);
+      },
+      // 获取部门
+      async getGrouplist() {
+        const res = await getgroupdepartmap();
+        this.grouplist = res.data;
+      },
+      // 获取考核纬度列表
+      async getDutyclasslist() {
+        const res = await dutyclasslist(this.searchList);
+        this.dutyclasslist = res.data.list;
+      },
+      //删除操作
+      async deleteOperate(row) {
+        this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(async () => {
+          this.deleFrom.state = 3;
+          this.deleFrom.id = row.id;
+          this.deleFrom.id = this.deleFrom.id.toString();
+          const res = await editstate(this.deleFrom);
+          if (res.code === 0) {
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+  
+            this.getDataList();
+          }
+        });
+      },
+      // 树形结构递归
+      digui(item) {
+        // 一层一层往下面执行，循环，直到不满足情况的条件下，会自动跳出这个递归方法，然后又到上面方法的源头处，开始执行下一个对象。。。
+        if (item.govlist != null) {
+          // 因为三级联动的数据格式是value和label,所以需要自己手动添加，没有的忽略。
+          item.govlist.forEach((ff) => {
+            // 这里就是判断他的children下面还有没有值，有的话我就要往下挖，就又开始自己调用自己了
+            this.digui(ff);
+          });
+        } else {
+          // 这里就是判断，如果我这一层的children下面没有东西的时候该做什么操作
+          // 要添加value和label,否则会看不到标签名字和值
+          // --------------------------分割线---------------------------------
+  
+          item.govlist = item.child;
+        }
+        // 到这里为止，不能在这里打印数据，不然数据就是个断层的，因为在这里打印的数据是当前循环的这一层的数据，如果想看完整数据效果，那么就需要在递归方法第一次调用的地方打印需要递归的值，即上一个方法中。
+      },
+      // 新增按钮
+      showAdd() {
+        this.dialogFormVisible = true;
+        console.log(this.dialogFormVisible);
+      },
+      // 编辑按钮
+      async showEdit(row) {
+        this.editFrom.outid = row.outid;
+        const res = await gettargetinfo(this.editFrom);
+        this.editAdd = res.data;
+        console.log("this.editAdd");
+        console.log(this.editAdd);
+        this.editDialogFormVisible = true;
+      },
+      // 开关状态监听
+      async changeVal(val, id) {
+        this.switchFrom.id = id;
+        this.switchFrom.id = this.switchFrom.id.toString();
+        if (val == 1) {
+          this.switchFrom.state = 1;
+          const res = await editstate(this.switchFrom);
+          if (res.code === 0) {
+            this.$message({
+              type: "success",
+              message: "修改状态成功",
+              showClose: true,
+            });
+            this.getDataList();
+          }
+        } else {
+          this.switchFrom.state = 2;
+          const res = await editstate(this.switchFrom);
+          if (res.code === 0) {
+            this.$message({
+              type: "success",
+              message: "修改状态成功",
+              showClose: true,
+            });
+            this.getDataList();
+          }
+        }
+      },
+      // 重置搜索条件
+      onReset() {
+        this.searchInfo = {};
+      },
+      // 条件搜索
+      onSubmit() {
+        this.searchInfo.page = 1;
+        this.searchInfo.pagesize = 10;
+        this.getDataList();
+      },
+      // 日期时间戳转日期格式
+      formatDate(nS) {
+        return new Date(parseInt(nS) * 1000)
+          .toLocaleString()
+          .replace(/:\d{1,2}$/, " ");
+      },
+  
+      // 提交按钮
+      async enterDialog() {
+        this.$refs.addForm.validate(async (valid) => {
+          if (valid) {
+            this.form.relevantDepartments =
+              this.form.relevantDepartments.toString();
+            if (this.form.departmentsPost != null) {
+              this.form.departmentsPost = this.form.departmentsPost.map(String);
+            }
+            this.form.cycleattr = parseInt(this.form.cycleattr);
+            const res = await addposttarget(this.form);
+            if (res.code === 0) {
+              this.$message({
+                type: "success",
+                message: "添加成功",
+                showClose: true,
+              });
+            }
+            this.getDataList();
+            this.closeDialog();
+          }
+        });
+      },
+  
+      // 编辑提交按钮
+      async editEnterDialog() {
+        this.$refs.editForm.validate(async (valid) => {
+          if (valid) {
+            if (this.editAdd.relevantdepartmentsmap != null) {
+              this.editAdd.relevantdepartments =
+                this.editAdd.relevantdepartmentsmap.map(String);
+            }
+            if (this.editAdd.relevantdepartmentsmap == null) {
+              this.editAdd.relevantdepartments =
+                this.editAdd.relevantdepartments.split(",");
+            }
+            if (this.editAdd.visiblerangedepartmap == null) {
+              this.editAdd.visiblerange = this.editAdd.visiblerange.split(",");
+            }
+            if (this.editAdd.visiblerangegroupmap == null) {
+              this.editAdd.visiblerangegroup =
+                this.editAdd.visiblerangegroup.split(",");
+            }
+            console.log(this.editAdd.relevantdepartments);
+            if (this.editAdd.share == 1) {
+              this.editAdd.relevantdepartments = [];
+              this.editAdd.relevantdepartmentsmap = [];
+              this.$delete(this.editAdd, "relevantdepartments");
+              this.$delete(this.editAdd, "relevantdepartmentsmap");
+            }
+            this.editAdd.report = this.editAdd.reportmap;
+            this.editAdd.dimension = this.editAdd.dimensionidstr;
+            this.editAdd.cycleattr = parseInt(this.editAdd.cycleattr);
+            const res = await eitetarget(this.editAdd);
+            if (res.code === 0) {
+              this.$message({
+                type: "success",
+                message: "编辑成功",
+                showClose: true,
+              });
+            }
+            this.getDataList();
+            this.editCloseDialog();
+          }
+        });
+      },
+      // 添加框关闭
+      closeDialog() {
+        console.log("closeDialog");
+        this.initForm();
+        this.dialogFormVisible = false;
+      },
+      // 修改框关闭
+      editCloseDialog() {
+        this.editInitForm();
+        this.editDialogFormVisible = false;
+      },
+      // 添加重置表单
+      initForm() {
+        console.log("initForm");
+        this.$refs.addForm.resetFields();
+        this.form = {};
+        console.log(this.form);
+      },
+      // 修改重置表单
+      editInitForm() {
+        this.$refs.editForm.resetFields();
+        this.editAdd = {};
+      },
+      // 改变pageSize
+      handleSizeChange(val) {
+        this.searchInfo.pagesize = val;
+        this.getDataList(this.searchInfo);
+      },
+      // 改变page
+      handleCurrentChange(val) {
+        this.searchInfo.page = val;
+        this.getDataList(this.searchInfo);
+      },
+      // 获取初始数据
+      async getDataList() {
+        if (this.searchInfo.relevantdepartments != null) {
+          this.searchInfo.relevantdepartments =
+            this.searchInfo.relevantdepartments.map(String);
+        }
+        const res = await posttargetlist(this.searchInfo);
+        this.tableData = res.data.list;
+        this.total = res.data.total;
+        this.searchInfo.page = res.data.page;
+        this.searchInfo.pagesize = res.data.pageSize;
+      },
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  .dashboard {
+    &-container {
+      margin: 30px;
+    }
+    &-text {
+      font-size: 30px;
+      line-height: 46px;
+    }
+  }
+  </style>
+  

src/views/assessmentProgram/departmentalAssessment.vue

@@ -48,9 +48,9 @@
       </div>
       <el-container>
         <!-- 左侧内容 -->
-        <el-aside width="300px">
+        <!-- <el-aside width="300px">
           <el-tree :data="GovthreeList2" :props="defaultProps1" @node-click="handleNodeClick"></el-tree>
-        </el-aside>
+        </el-aside> -->
         <!-- 右侧内容 -->
         <el-main style="padding:10px">
             <el-table border :data="versionData" :span-method="versionSpanMethod">
@@ -664,6 +664,7 @@ import {
 } from '@/api/duty/group'
 export default {
   name: 'Dashboard',
+  props:['bmId'],
   components: {
     projectDialog
   },
@@ -879,6 +880,14 @@ export default {
   },
   // 监听数据
   watch: {
+    bmId(){
+      console.log("bmid变化")
+      console.log(this.bmId)
+      // const list = []
+      // list.push(this.gwId)
+      this.searchVersion.deaprtid=this.bmId.toString()
+      this.getVersionDataList()
+    },
     methodList() {
       this.$nextTick(() => {
         this.methodSpanArr=[],

src/views/assessmentProgram/qualitativeIndicatorsBase.vue

@@ -65,6 +65,7 @@ export default {
   name: "Dashboard",
   data() {
     return {
+      
       gwFromList:{
         gwId:1,
         bmId:1

src/views/basicInfo/gwProject.vue

@@ -188,7 +188,7 @@
         <el-form-item label="指标名称" prop="title">
           <el-input v-model="form.title" autocomplete="off" />
         </el-form-item>
-        <el-form-item label="关联部门" prop="relevantDepartments">
+        <!-- <el-form-item label="关联部门" prop="relevantDepartments">
           <el-cascader
             filterable
             clearable
@@ -198,7 +198,7 @@
             :props="props"
             @change="departChange"
           ></el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="相关岗位" prop="departmentsPost">
           <el-select
             clearable
@@ -232,7 +232,7 @@
                   placeholder="请选择"
                 >
                   <el-option
-                    v-for="item in postListAdd"
+                    v-for="item in postList"
                     :key="item.idstr"
                     :label="item.name"
                     :value="item.idstr"
@@ -337,14 +337,14 @@
       <el-form
         ref="editForm"
         :model="editAdd"
-        :rules="editRules"
+        
         label-width="150px"
       >
 
         <el-form-item label="指标名称" prop="title">
           <el-input v-model="editAdd.title" autocomplete="off" />
         </el-form-item>
-        <el-form-item label="关联部门" prop="relevantDepartments">
+        <!-- <el-form-item label="关联部门" prop="relevantDepartments">
           <el-cascader
             filterable
             clearable
@@ -354,7 +354,7 @@
             :props="props"
             @change="departChange"
           ></el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="岗位/人员" prop="departmentsPost">
            <el-table
             :data="editAdd.relevantpostsman"
@@ -371,7 +371,7 @@
                   placeholder="请选择"
                 >
                   <el-option
-                    v-for="item in postListAdd"
+                    v-for="item in postList"
                     :key="item.idstr"
                     :label="item.name"
                     :value="item.idstr"
@@ -400,12 +400,12 @@
               prop="address"
               label="操作">
                 <template slot-scope="scope">
-                  <el-button @click="jiaArr" type="primary" icon="el-icon-plus" circle size="mini"></el-button>
+                  <el-button @click="jiaEditArr" type="primary" icon="el-icon-plus" circle size="mini"></el-button>
                   <el-button
                       icon="el-icon-delete"
                       size="small"
                       type="text"
-                      @click="deleteRulesList(scope)"
+                      @click="deleteEditRulesList(scope)"
                     >删除</el-button>
                 </template>
             </el-table-column>
@@ -413,7 +413,7 @@
         </el-form-item>
         <el-form-item label="指标维度" prop="dimension">
           <el-select
-            v-model="editAdd.dimension"
+            v-model="editAdd.dimensionstr"
             clearable
             placeholder="请选择考核维度"
           >
@@ -487,16 +487,17 @@ import {
   addposttarget,
 } from "@/api/duty/project";
 import { getgroupdepartmap, getgroupuser } from "@/api/duty/group";
-import { add_post_target } from "@/api/duty/gwDingXing";
+import { add_post_target,dit_post_target } from "@/api/duty/gwDingXing";
 import { get_post_target } from '@/api/duty/projectNew'
 export default {
   components: {
     project,
   },
   name: "Dashboard",
-  props:['gwId'],
+  props:['gwId','gwFromList'],
   data() {
     return {
+      
       // 岗位人员联动数据源
       relevantpostsman:[{
         // 岗位id
@@ -634,10 +635,21 @@ export default {
     this.getSystemadminlist();
     this.getGrouplist();
     this.getGovthree2();
-    console.log("this.gwId")
+    this.getPost(this.gwFromList.bmId)
-    console.log(this.gwId)
   },
   watch:{
+    gwFromList:{
+        handler(newVal){
+          console.log("newVal");
+          console.log(newVal);
+          // const list = []
+          // list.push(this.gwFromList.gwId.toString())
+          
+          this.getPost(this.gwFromList.bmId)
+          this.getDataList()
+      },
+      deep: true
+    },
     gwId(){
       console.log("bmid变化")
       console.log(this.gwId)
@@ -648,6 +660,31 @@ export default {
     },
   },
   methods: {
+    
+    // 获取下拉岗位列表
+    async selectPostlist(){
+      const from = {
+        page:1,
+        pagesize:100000,
+        type:1
+      }
+      const res = await posttargetlist(from)
+      console.log(res.data)
+      this.selectdutyList=res.data.list
+    },
+    // 编辑时删除
+    deleteEditRulesList(row){
+      this.editAdd.relevantpostsman.splice(row.$index,1);
+    },
+    // 编辑时添加人员数据
+    jiaEditArr(){
+      this.editAdd.relevantpostsman.push({
+              // 岗位id
+              id:'',
+              // 多人员列表
+              operator:[]
+            })
+    },
     // 添加岗位人员数据
     jiaArr(){
       this.relevantpostsman.push({
@@ -670,10 +707,12 @@ export default {
       const from = {
         organization: val.toString(),
         page: 1,
-        pagesize: 10,
+        pagesize: 1000000,
       };
       const res = await positionlist(from);
       this.postList = res.data.list;
+      console.log("岗位列表")
+      console.log(this.postList)
     },
     // 点击行政组织树
     handleNodeClick(val) {
@@ -717,7 +756,7 @@ export default {
             // 下面的就是执行递归的方法，因为我是从第二层才开始需要往下挖的，所以这里多了个forEach,如果从第一层起，从item就好了，即：this.digui(item);在上面添加
             this.digui(items); // 这里是源头，把一个对象开始递归，开始循环
             // 如果想看完整数据，那么是在这里打印数据哦
-            console.log(items, "看我查看完整的数据哦");
+            // console.log(items, "看我查看完整的数据哦");
             // 因为上一步递归时，就已经把循环children的动作做完了，这里是验收递归方法的地方。
           });
         } else {
@@ -790,7 +829,7 @@ export default {
       console.log(this.editAdd);
       this.editAdd.relevantDepartments=this.editAdd.reledepart
       this.departChange(this.editAdd.relevantDepartments)
-      this.editAdd.dimension=this.editAdd.dimension.toString()
+      
       this.editDialogFormVisible = true;
     },
     // 开关状态监听
@@ -842,8 +881,9 @@ export default {
     async enterDialog() {
       this.$refs.addForm.validate(async (valid) => {
         if (valid) {
-          this.form.relevantDepartments =
+
-            this.form.relevantDepartments.toString();
+           this.form.relevantDepartments =this.gwFromList.bmId.toString()
+          
           if (this.form.departmentsPost != null) {
             this.form.departmentsPost = this.form.departmentsPost.map(String);
           }
@@ -869,32 +909,26 @@ export default {
     async editEnterDialog() {
       this.$refs.editForm.validate(async (valid) => {
         if (valid) {
-          if (this.editAdd.relevantdepartmentsmap != null) {
+          // if (this.editAdd.relevantdepartmentsmap != null) {
-            this.editAdd.relevantdepartments =
+          //   this.editAdd.relevantdepartments = this.editAdd.relevantdepartmentsmap.map(String);
-              this.editAdd.relevantdepartmentsmap.map(String);
+          // }
-          }
+          // if (this.editAdd.relevantdepartmentsmap == null) {
-          if (this.editAdd.relevantdepartmentsmap == null) {
+          //   this.editAdd.relevantdepartments = this.editAdd.relevantdepartments.split(",");
-            this.editAdd.relevantdepartments =
+          // }
-              this.editAdd.relevantdepartments.split(",");
+          // if (this.editAdd.visiblerangedepartmap == null) {
-          }
+          //   this.editAdd.visiblerange = this.editAdd.visiblerange.split(",");
-          if (this.editAdd.visiblerangedepartmap == null) {
+          // }
-            this.editAdd.visiblerange = this.editAdd.visiblerange.split(",");
+          // if (this.editAdd.visiblerangegroupmap == null) {
-          }
+          //   this.editAdd.visiblerangegroup = this.editAdd.visiblerangegroup.split(",");
-          if (this.editAdd.visiblerangegroupmap == null) {
+          // }
-            this.editAdd.visiblerangegroup =
+          
-              this.editAdd.visiblerangegroup.split(",");
-          }
-          console.log(this.editAdd.relevantdepartments);
           if (this.editAdd.share == 1) {
             this.editAdd.relevantdepartments = [];
             this.editAdd.relevantdepartmentsmap = [];
-            this.$delete(this.editAdd, "relevantdepartments");
-            this.$delete(this.editAdd, "relevantdepartmentsmap");
           }
-          this.editAdd.report = this.editAdd.reportmap;
+          this.editAdd.id=this.editAdd.id.toString()
-          this.editAdd.dimension = this.editAdd.dimensionidstr;
+          this.editAdd.dimension=this.editAdd.dimensionstr
-          this.editAdd.cycleattr = parseInt(this.editAdd.cycleattr);
+          const res = await dit_post_target(this.editAdd);
-          const res = await eitetarget(this.editAdd);
           if (res.code === 0) {
             this.$message({
               type: "success",
@@ -948,10 +982,10 @@ export default {
     },
     // 获取初始数据
     async getDataList() {
-      if (this.searchInfo.relevantdepartments != null) {
+      // if (this.searchInfo.relevantdepartments != null) {
-        this.searchInfo.relevantdepartments =
+      //   this.searchInfo.relevantdepartments =
-          this.searchInfo.relevantdepartments.map(String);
+      //     this.searchInfo.relevantdepartments.map(String);
-      }
+      // }
       const res = await posttargetlist(this.searchInfo);
       this.tableData = res.data.list;
       this.total = res.data.total;

src/views/basicInfo/projectBase.vue

@@ -29,7 +29,7 @@
         <!-- 右侧内容 -->
         <el-main style="padding: 10px">
           <div v-if="tableGWShow">
-            <gwProject :gwId="gwId"></gwProject>
+            <gwProject :gwFromList="gwFromList"></gwProject>
           </div>
           <div v-if="tableBMShow">
             <project :bmId="bmId"></project>
@@ -66,6 +66,10 @@ export default {
   name: "Dashboard",
   data() {
     return {
+      gwFromList:{
+        gwId:1,
+        bmId:1
+      },
       tableGWShow: false,
       tableBMShow: true,
       gwId:1,
@@ -150,11 +154,12 @@ export default {
   methods: {
     // 点击岗位列表
     NodePostClick(val) {
-      console.log('gangwei')
+      this.gwId=val.id
-        this.gwId=val.id
+        this.gwFromList.gwId=val.id
         this.tableGWShow=true
         this.tableBMShow=false
-      console.log(val);
+        console.log('岗位')
+      console.log(this.gwFromList);
     },
     // 获取岗位
     async getPost(val) {
@@ -173,6 +178,7 @@ export default {
       this.getPost(val.id);
       console.log('bumen ')
       this.bmId=val.id
+      this.gwFromList.bmId=val.id
       this.tableGWShow=false
       this.tableBMShow=true
       console.log(val);

src/views/basicInfo/target.vue

@@ -46,7 +46,7 @@
         <el-table-column align="left" label="部门" prop="dimensiontitle"/>
         <el-table-column align="left" label="年度" prop="year"/>
         <el-table-column align="left" label="考核指标" prop="targettitle"/>
-        <el-table-column align="left" label="考核指标" prop="type">
+        <el-table-column align="left" label="考核周期" prop="type">
           <template #default="scope">
             <el-tag v-if="scope.row.type==1">年度</el-tag>
             <el-tag v-if="scope.row.type==2">季度</el-tag>
@@ -292,7 +292,7 @@
                     :data="yue"
                     style="width:85%;margin: 0 auto;">
                     <el-table-column
-                        label="月份"
+                        label="考核期间"
                         align="center"
                         >
                         <template slot-scope="scope">
@@ -400,7 +400,7 @@
           :data="jiangzhiList"
           style="width: 100%">
           <el-table-column
-              label="月份"
+              label="考核期间"
               align="center"
               >
               <template slot-scope="scope">
@@ -454,7 +454,7 @@
           :data="jiangList"
           style="width: 100%">
           <el-table-column
-              label="月份"
+              label="考核期间"
               align="center"
               >
               <template slot-scope="scope">

src/views/frontPage/index.vue

@@ -259,7 +259,10 @@ export default {
           data: []
         },
         yAxis: {
-          type: 'value'
+           type: 'value',
+           min:90,  //取0为最小刻度
+          
+          scale:true
         },
           tooltip: {
           trigger: 'axis',