diff --git a/src/api/duty/gwDingXing.js b/src/api/duty/gwDingXing.js
index 311d546..b93fa28 100644
--- a/src/api/duty/gwDingXing.js
+++ b/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
+  })
+}
 
diff --git a/src/api/duty/gwFangan.js b/src/api/duty/gwFangan.js
new file mode 100644
index 0000000..e9b9338
--- /dev/null
+++ b/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
+    })
+  }
+
+
diff --git a/src/api/duty/projectNew.js b/src/api/duty/projectNew.js
index 1693404..9fef262 100644
--- a/src/api/duty/projectNew.js
+++ b/src/api/duty/projectNew.js
@@ -185,4 +185,12 @@ export function get_post_target(data) {
     method: 'post',
     data
   })
+}
+// 获取岗位子栏目详情
+export function get_sun_target_info(data) {
+  return request({
+    url: '/postpc/get_sun_target_info',
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index db15ab2..b0458bb 100644
--- a/src/router/index.js
+++ b/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: '部门考核'}
       },
       { 
diff --git a/src/views/assessmentProgram/departmentBase.vue b/src/views/assessmentProgram/departmentBase.vue
new file mode 100644
index 0000000..40abd21
--- /dev/null
+++ b/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>
+  
\ No newline at end of file
diff --git a/src/views/assessmentProgram/departmentalAssessment.vue b/src/views/assessmentProgram/departmentalAssessment.vue
index 5aaad7f..215d3b1 100644
--- a/src/views/assessmentProgram/departmentalAssessment.vue
+++ b/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=[],
diff --git a/src/views/assessmentProgram/gwDepartmentalAssessment.vue b/src/views/assessmentProgram/gwDepartmentalAssessment.vue
new file mode 100644
index 0000000..7e501b5
--- /dev/null
+++ b/src/views/assessmentProgram/gwDepartmentalAssessment.vue
@@ -0,0 +1,1995 @@
+<template>
+    <!-- 部门考核录入 -->
+      <div class="dashboard-container">
+        <div class="gva-search-box">
+          <el-form ref="searchForm" :inline="true" :model="searchVersion">
+            <!-- <el-form-item label="所属公司">
+              <el-cascader filterable clearable v-model="searchVersion.group" :options="companyList" :show-all-levels="false" :props="props1" @change="selectGroup"></el-cascader>
+              
+            </el-form-item>
+            <el-form-item label="所属部门">
+              <el-cascader filterable clearable v-model="searchVersion.deaprtid" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader>
+              
+            </el-form-item> -->
+            <el-form-item label="年度">
+              <el-select v-model="searchVersion.year" placeholder="请选择">
+                <el-option
+                  v-for="item in yearList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+              <!-- <el-button size="mini" icon="el-icon-refresh" @click="onReset">重置</el-button> -->
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="gva-table-box">
+          <div class="gva-btn-list">
+            <!-- <el-button size="mini" type="primary" icon="el-icon-setting" @click="showDimension()">设置维度权重</el-button> -->
+            <el-button size="mini" type="primary" icon="el-icon-setting" @click="showIndex()">生成岗位考核方案</el-button>
+          </div>
+          <el-container>
+            <!-- 左侧内容 -->
+            <!-- <el-aside width="300px">
+              <el-tree :data="GovthreeList2" :props="defaultProps1" @node-click="handleNodeClick"></el-tree>
+            </el-aside> -->
+            <!-- 右侧内容 -->
+            <el-main style="padding:10px">
+                <el-table border :data="versionData" :span-method="versionSpanMethod">
+                  <el-table-column align="left" label="部门"> 
+                    <template #default="scope">
+                      {{scope.row.companyname}}{{scope.row.departmentname}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column align="left" label="年度" prop="year"/>
+                  <el-table-column align="left" label="版本号">
+                    <template #default="scope">
+                      {{scope.row.key}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column align="left" label="时间" prop="time"/>
+                  <el-table-column align="left" label="状态">
+                      <template #default="scope">
+                          <el-switch
+                              inline-prompt 
+                              active-text="正常" 
+                              inactive-text="禁止"
+                              v-model="scope.row.state"
+                              active-color="#13ce66"
+                              inactive-color="#ff4949"
+                              :active-value=1
+                              :inactive-value=2
+                              @change="changeVal($event,scope.row.id)"
+                              />
+                      </template>
+                  </el-table-column>
+                  <el-table-column align="left" fixed="right" label="操作" width="200">
+                    <template #default="scope">
+                      <el-button
+                        icon="el-icon-view"
+                        size="small"
+                        type="text"
+                        @click="showDetails(scope.row)"
+                      >查看详情</el-button>
+                      <el-button
+                        icon="el-icon-document-checked"
+                        size="small"
+                        type="text"
+                        @click="copyShow(scope.row)"
+                      >复制</el-button>
+                      <el-button
+                        icon="el-icon-delete"
+                        size="small"
+                        type="text"
+                        @click="deleteOperate(scope.row)"
+                      >删除</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+            </el-main>
+          </el-container>
+          
+          
+          </div>
+          <!-- 新增弹框 -->
+          <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增" width="100%">
+            <el-form ref="addForm" :model="form" :rules="rules" label-width="150px">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="所属公司" prop="title">
+                    <el-cascader filterable clearable v-model="form.group" :options="companyList" :show-all-levels="false" :props="props1" @change="selectGroup"></el-cascader>
+                    
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="所属部门" prop="title" v-if="form.group!=''">
+                    <el-cascader filterable clearable v-model="form.parentid" :options="departmentList" :show-all-levels="false" :props="props1" @change="selectDepartment"></el-cascader>
+                    <!-- <el-select multiple v-model="form.parentid" clearable placeholder="请选择" @change="selectDepartment">
+                      <el-option
+                        v-for="item in departmentList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select> -->
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="考核维度">
+                    <el-select v-model="form.dimension" clearable placeholder="请选择状态">
+                      <el-option
+                        v-for="item in dutyclasslist"
+                        :key="item.outId"
+                        :label="item.title"
+                        :value="item.outId">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <!-- <el-form-item label="所属部门" prop="title" v-if="form.group!=''">
+                    <el-select multiple v-model="form.parentid" clearable placeholder="请选择" @change="selectDepartment">
+                      <el-option
+                        v-for="item in departmentList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item> -->
+                </el-col>
+              </el-row>
+            <el-form-item v-if="form.parentid!=''">
+              <!-- 表格表单提交 -->
+                <el-table
+                    :data="indexList"
+                    style="width: 100%">
+                    
+                    <el-table-column
+                        label="名称"
+                        align="center"
+                        prop="title"
+                        >
+                    </el-table-column>
+                    <el-table-column
+                        label="考核周期"
+                        align="center">
+                        <template slot-scope="scope">
+                           <el-select v-model="scope.row.cycle" placeholder="请选择考核周期">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                          </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="辅助计数"
+                        align="center">
+                        <template slot-scope="scope">
+                           <el-input v-model="scope.row.cycleattr" autocomplete="off" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="单位"
+                        align="center">
+                        <template slot-scope="scope">
+                           <el-input v-model="scope.row.unites"></el-input>
+                        </template>
+                    </el-table-column>
+                    <!-- <el-table-column
+                        label="分值"
+                        align="center">
+                        <template slot-scope="scope">
+                           <el-input v-model.number="scope.row.referencescore"></el-input>
+                        </template>
+                    </el-table-column> -->
+                    <el-table-column
+                        label="数据提报"
+                        align="center">
+                        <template slot-scope="scope">
+                              <el-cascader clearable v-model="scope.row.reportlist" :options="grouplistBackup" :show-all-levels="false" :props="userProps"></el-cascader>
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="left" fixed="right" label="操作">
+                      <template #default="scope">
+                        <el-button
+                          icon="el-icon-delete"
+                          size="small"
+                          type="text"
+                          @click="deleteRow(scope)"
+                        >删除</el-button>
+                      </template>
+                    </el-table-column>
+                </el-table>
+            </el-form-item>
+             
+            </el-form>
+            <template #footer>
+              <div class="dialog-footer"> 
+                <el-button size="small" @click="closeDialog">取 消</el-button>
+                <el-button size="small" type="primary" @click="enterDialog">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+          <!-- 人员弹框 -->
+          <el-dialog :visible.sync="showUser" title="执行人" width="30%">
+            <!-- <el-descriptions class="margin-top" :column="3" size="medium" border>
+              <el-descriptions-item v-for="item in userlistary" :key="item.key">
+                <template slot="label">
+                  <i class="el-icon-user"></i>
+                  姓名
+                </template>
+                {{item.name}}
+              </el-descriptions-item>
+            </el-descriptions> -->
+            <el-table
+              :data="userlistary"
+              style="width: 100%">
+              <el-table-column
+                prop="date"
+                label="头像">
+                <template slot-scope="scope">
+                  <el-avatar shape="square" size="large" :src="scope.row.icon"></el-avatar>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="number"
+                label="工号">
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                label="部门">
+                <template slot-scope="scope">
+                  {{scope.row.groupname}}{{scope.row.departmentname}}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                label="姓名">
+              </el-table-column>
+            </el-table>
+          </el-dialog>
+          <!-- 指标权重弹框 -->
+          <el-dialog :close-on-click-modal="false" :visible.sync="demDialogFormVisible" title="指标组合" width="70%">
+            <el-form ref="addForm" :model="form" :rules="rules" label-width="150px">
+              <el-row>
+                <!-- <el-col :span="6">
+                  <el-form-item label="所属公司" prop="title">
+                    <el-cascader filterable clearable v-model="form.group" :options="companyList" :show-all-levels="false" :props="props1" @change="selectGroup"></el-cascader>
+                    
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="所属部门" prop="title" v-if="form.group!=''">
+                    <el-cascader filterable clearable v-model="form.parentid" :options="departmentList" :show-all-levels="false" :props="props1" @change="shouWei"></el-cascader>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :span="6">
+                  <el-form-item label="年度">
+                    <el-select v-model="form.year" placeholder="请选择">
+                      <el-option
+                        v-for="item in yearList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <div style="width: 200px;height: 40px;line-height: 40px;margin: 0 auto;">
+                    纬度合计分：{{weiduFraction}}
+                  </div>
+                </el-col>
+              </el-row>
+              <el-form-item>
+              <!-- 表格表单提交 -->
+                <el-card class="box-card" v-for="(item,index) in weiDuList" :key="item.id">
+                  <el-row>
+                    <el-col :span="8">
+                      <span>考核纬度：{{item.name}}</span>
+                    </el-col>
+                    <el-col :span="8">
+                      <!-- <el-select v-model="item.ordering" clearable placeholder="请选择顺序">
+                        <el-option :value=1 label="1">1</el-option>
+                        <el-option :value=2 label="2">2</el-option>
+                        <el-option :value=3 label="3">3</el-option>
+                        <el-option :value=4 label="4">4</el-option>
+                        <el-option :value=5 label="5">5</el-option>
+                        <el-option :value=6 label="2">6</el-option>
+                      </el-select> -->
+                    </el-col>
+                    <el-col :span="8">
+                      指标合计分：{{item.zhiFraction}}
+                    </el-col>
+                   </el-row>
+                   <el-table
+                        border
+                        :data="item.child"
+                        style="width: 100%">
+                        <el-table-column
+                            label="指标名称"
+                            align="center"
+                            prop="name"
+                            >
+                        </el-table-column>
+                        <el-table-column
+                            label="说明"
+                            align="center"
+                            prop="illustrate"
+                            >
+                            <template slot-scope="scope">
+                              <el-input v-model="scope.row.content" autocomplete="off" />
+                              <!-- <div v-if="scope.row.targetweight!=0">{{scope.row.targetweight}}</div> -->
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            label="指标权重"
+                            align="center"
+                            prop="referencescore"
+                            >
+                            <template slot-scope="scope">
+                              <el-input v-model.number="scope.row.standardscore" autocomplete="off" @input="zhibiaofen" />
+                              <!-- <el-input v-if="scope.row.istrue==1" v-model.number="scope.row.referencescore" autocomplete="off" @change="zhibiaofen" /> -->
+                              <!-- <div v-if="scope.row.istrue==2">{{scope.row.referencescore}}</div> -->
+                            </template>
+                        </el-table-column>
+                        
+                        <el-table-column
+                            label="状态"
+                            align="center"
+                            prop="status"
+                            >
+                            <template slot-scope="scope">
+                              <el-select v-model="scope.row.status" clearable placeholder="请选择" @change="zhibiaostatus(scope.row)">
+                                <el-option :value=1 label="使用">使用</el-option>
+                                <el-option :value=2 label="禁用">禁用</el-option>
+                                <el-option :value=3 label="观察">观察</el-option>
+                              </el-select>
+                              <!-- <div v-if="scope.row.targetweight!=0">{{scope.row.targetweight}}</div> -->
+                            </template>
+                        </el-table-column>
+                     </el-table>
+                    </el-card>
+                    <!-- <el-form-item label="拉取部门考核">
+                        <el-select v-model="laTrue" placeholder="请选择" @change="laBian">
+                        <el-option
+                            v-for="item in yesList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                        </el-select>
+                    </el-form-item> -->
+                    <!-- 部门方案拉取表格表单提交 -->
+                <!-- <el-card class="box-card" v-for="(item,index) in weiDuList1" :key="item.id">
+                  <el-row>
+                    <el-col :span="8">
+                      <span>考核纬度：{{item.name}}</span>
+                    </el-col>
+                    <el-col :span="8">
+                      
+                    </el-col>
+                    <el-col :span="8">
+                      指标合计分：{{item.zhiFraction}}
+                    </el-col>
+                   </el-row>
+                   <el-table
+                        border
+                        :data="item.child"
+                        style="width: 100%">
+                        <el-table-column
+                            label="指标名称"
+                            align="center"
+                            prop="name"
+                            >
+                        </el-table-column>
+                        <el-table-column
+                            label="说明"
+                            align="center"
+                            prop="illustrate"
+                            >
+                            <template slot-scope="scope">
+                              <el-input v-model="scope.row.content" autocomplete="off" />
+                              
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            label="指标权重"
+                            align="center"
+                            prop="referencescore"
+                            >
+                            <template slot-scope="scope">
+                              <el-input v-model.number="scope.row.referencescore" autocomplete="off" @input="zhibiaofen" />
+                              
+                            </template>
+                        </el-table-column>
+                        
+                        <el-table-column
+                            label="状态"
+                            align="center"
+                            prop="status"
+                            >
+                            <template slot-scope="scope">
+                              <el-select v-model="scope.row.status" clearable placeholder="请选择" @change="zhibiaostatus(scope.row)">
+                                <el-option :value=1 label="使用">使用</el-option>
+                                <el-option :value=2 label="禁用">禁用</el-option>
+                                <el-option :value=3 label="观察">观察</el-option>
+                              </el-select>
+                            </template>
+                        </el-table-column>
+                     </el-table>
+                    </el-card> -->
+                  </el-form-item>
+               </el-form>
+
+               <template #footer>
+              <div class="dialog-footer"> 
+                <el-button size="small" @click="zhuheguan">取 消</el-button>
+                <el-button size="small" type="primary" @click="zhuheTi">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+          <!-- 编辑弹框 -->
+          <el-dialog :close-on-click-modal="false" :visible.sync="editDialogFormVisible" :before-close="editCloseDialog" title="修改" width="20%">
+            <el-form ref="editForm" :model="editAdd" :rules="editRules" label-width="150px">
+              <el-form-item label="所属考核项目">
+              <span>
+                <el-tag v-if="editChildInfo.title!=''">{{editChildInfo.title}}</el-tag>
+                <projectDialog @checkedInfo="getEditCheckedfrom"></projectDialog>
+              </span>
+            </el-form-item>
+            <el-form-item label="定性指标名称" prop="title">
+                    <el-input v-model="editAdd.title" autocomplete="off" />
+                </el-form-item>
+            <el-form-item label="定性指标说明" prop="content">
+              <el-input
+                type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4}"
+                placeholder="请输入内容"
+                v-model="editAdd.content">
+              </el-input>
+            </el-form-item>
+            
+            </el-form>
+            <template #footer>
+              <div class="dialog-footer"> 
+                <el-button size="small" @click="editCloseDialog">取 消</el-button>
+                <el-button size="small" type="primary" @click="editEnterDialog">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+          <!-- 考核办法弹框 -->
+          <el-dialog :visible.sync="methodShow" title="考核办法" width="60%">
+            <el-table :data="methodList" border :span-method="methodSpanMethod" :cell-style="{padding:'0px'}">
+              <el-table-column prop="targetsunname" label="考核项目" width="85"></el-table-column>
+              <!-- <el-table-column prop="targetsunname" label="权重"></el-table-column> -->
+              <el-table-column prop="detailedtargetname" label="考核内容"></el-table-column>
+              <el-table-column prop="score" label="考核标准" width="85"></el-table-column>
+              <el-table-column prop="unit" label="单位" width="85"/>
+              <el-table-column prop="content" label="备注说明" width="200"/>
+              <!-- <el-table-column prop="referencescore" label="标准分"/> -->
+            </el-table>
+          </el-dialog>
+          <!-- 部门考核详情弹框 -->
+          <el-dialog :visible.sync="detailsShow" title="考核方案" width="75%" @close="detailsClose">
+            <!-- <el-table :data="tableData" border :span-method="objectSpanMethod" :cell-style="{padding:'0px'}">
+            <el-table-column prop="dimensionname" label="考核维度" width="80"></el-table-column>
+            <el-table-column prop="dimensionweight" label="维度权重" align="center" width="80"></el-table-column>
+            <el-table-column prop="targetname" label="考核指标" width="140">
+              <template slot-scope="scope">
+                <el-link v-if="scope.row.type==1" type="primary" @click="showMethod(scope.row)">{{scope.row.targetname}}</el-link>
+                <div v-if="scope.row.type==2">{{scope.row.targetname}}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="targetweight" label="指标权重" align="center" width="80"></el-table-column>
+            <el-table-column prop="content" label="说明"></el-table-column>
+            <el-table-column prop="unit" label="单位" align="center" width="80"/>
+            <el-table-column prop="unit" label="指标状态" align="center" width="80">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.state==1">使用</el-tag>
+                <el-tag type="danger" v-if="scope.row.state==2">禁用</el-tag>
+                <el-tag type="warning" v-if="scope.row.state==3">观察</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="cycle" label="周期" align="center" width="80"> 
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.cycle==1">班</el-tag>
+                <el-tag v-if="scope.row.cycle==2">天</el-tag>
+                <el-tag v-if="scope.row.cycle==3">周</el-tag>
+                <el-tag v-if="scope.row.cycle==4">月</el-tag>
+                <el-tag v-if="scope.row.cycle==5">季度</el-tag>
+                <el-tag v-if="scope.row.cycle==6">年</el-tag>
+                <el-tag v-if="scope.row.cycle==7">半年</el-tag>
+              </template>
+            </el-table-column>
+             <el-table-column prop="cycleattr" label="频次" width="90">
+              <template slot-scope="scope">
+                <div v-if="scope.row.cycle==1">每班{{scope.row.cycleattr}}次</div>
+                <div v-if="scope.row.cycle==2">每天{{scope.row.cycleattr}}次</div>
+                <div v-if="scope.row.cycle==3">每周{{scope.row.cycleattr}}次</div>
+                <div v-if="scope.row.cycle==4">每月{{scope.row.cycleattr}}次</div>
+                <div v-if="scope.row.cycle==5">每季度{{scope.row.cycleattr}}次</div>
+                <div v-if="scope.row.cycle==6">每年{{scope.row.cycleattr}}次</div>
+                <div v-if="scope.row.cycle==7">每半年{{scope.row.cycleattr}}次</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userlist" label="执行人" width="80">
+              <template slot-scope="scope">
+                <el-button
+                  icon="el-icon-view"
+                  size="small"
+                  type="text"
+                  @click="showUserList(scope.row)"
+                >查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userlist" label="操作" width="120">
+              <template slot-scope="scope">
+                <el-button
+                  icon="el-icon-edit"
+                  size="small"
+                  type="text"
+                  @click="editTarger(scope.row)"
+                >修改</el-button>
+                <el-button
+                  icon="el-icon-delete"
+                  size="small"
+                  type="text"
+                  @click="deldepTarger(scope.row)"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+           </el-table> -->
+           <el-table :data="tableData.postchild" style="width: 100%;margin-bottom: 20px;" row-key="id" border default-expand-all :tree-props="{children: 'child', }">
+                <el-table-column prop="name" label="名称" ></el-table-column>
+                <el-table-column prop="score" label="权重" ></el-table-column>
+                <el-table-column prop="name" label="状态" >
+                    <template slot-scope="scope">
+                        <el-tag v-if="scope.row.state==1">使用</el-tag>
+                        <el-tag type="danger" v-if="scope.row.state==2">禁用</el-tag>
+                        <el-tag type="warning" v-if="scope.row.state==3">观察</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="content" label="描述" ></el-table-column>
+            </el-table>
+            <el-table :data="tableData.departmentchild" style="width: 100%;margin-bottom: 20px;" row-key="id" border default-expand-all :tree-props="{children: 'child', }">
+                <el-table-column prop="name" label="名称" ></el-table-column>
+                <el-table-column prop="score" label="权重" ></el-table-column>
+                <el-table-column prop="name" label="状态" >
+                    <template slot-scope="scope">
+                        <el-tag v-if="scope.row.state==1">使用</el-tag>
+                        <el-tag type="danger" v-if="scope.row.state==2">禁用</el-tag>
+                        <el-tag type="warning" v-if="scope.row.state==3">观察</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="content" label="描述" ></el-table-column>
+            </el-table>
+
+          </el-dialog>
+           <!-- 修改指标说明 -->
+          <el-dialog :close-on-click-modal="false" :visible.sync="contentShow" title="修改" width="40%">
+            <el-form :model="editTargerFrom" label-width="150px">
+              <el-form-item label="说明" prop="content">
+                <el-input
+                  type="textarea"
+                  autosize
+                  placeholder="请输入内容"
+                  v-model="editTargerFrom.content">
+                </el-input>
+                <!-- <el-input v-model="editTargerFrom.content"/> -->
+              </el-form-item>
+              <el-form-item label="状态" prop="content">
+                <el-select v-model="editTargerFrom.state" clearable placeholder="请选择">
+                  <el-option :value=1 label="使用">使用</el-option>
+                  <!-- <el-option :value=2 label="禁用">禁用</el-option> -->
+                  <el-option :value=3 label="观察">观察</el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="执行人" prop="content">
+                <el-cascader filterable clearable v-model="editTargerFrom.operator" :options="grouplistBackup" :show-all-levels="false" :props="userProps"></el-cascader>
+              
+              </el-form-item>
+            </el-form>
+            <template #footer>
+              <div class="dialog-footer"> 
+                <el-button size="small" type="primary" @click="xiuShuoMing">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+          <!-- 复制弹窗 -->
+          <el-dialog :close-on-click-modal="false" :visible.sync="copyDialogFormVisible" title="方案复制" width="70%">
+            <el-form ref="addForm" :model="form" :rules="rules" label-width="150px">
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="年度">
+                    <el-select v-model="copyForm1.year" placeholder="请选择">
+                      <el-option
+                        v-for="item in yearList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <div style="width: 200px;height: 40px;line-height: 40px;margin: 0 auto;">
+                    纬度合计分：{{weiduFractionCopy}}
+                  </div>
+                </el-col>
+              </el-row>
+              
+              <el-form-item>
+              <!-- 表格表单提交 -->
+                <el-card class="box-card" v-for="(item,index) in weiDuCopyList" :key="item.id">
+                  <el-row>
+                    <el-col :span="8">
+                      <span>考核纬度：{{item.name}}</span>
+                    </el-col>
+                    <el-col :span="8">
+                      <!-- <el-select v-model="item.ordering" clearable placeholder="请选择顺序">
+                        <el-option :value=1 label="1">1</el-option>
+                        <el-option :value=2 label="2">2</el-option>
+                        <el-option :value=3 label="3">3</el-option>
+                        <el-option :value=4 label="4">4</el-option>
+                        <el-option :value=5 label="5">5</el-option>
+                        <el-option :value=6 label="2">6</el-option>
+                      </el-select> -->
+                    </el-col>
+                    <el-col :span="8">
+                      指标合计分：{{item.zhiFraction}}
+                    </el-col>
+                   </el-row>
+                   <el-table
+                        border
+                        :data="item.child"
+                        style="width: 100%">
+                        <el-table-column
+                            label="指标名称"
+                            align="center"
+                            prop="name"
+                            >
+                        </el-table-column>
+                        <el-table-column
+                            label="说明"
+                            align="center"
+                            prop="illustrate"
+                            >
+                            <template slot-scope="scope">
+                              <el-input v-model="scope.row.content" autocomplete="off" />
+                              <!-- <div v-if="scope.row.targetweight!=0">{{scope.row.targetweight}}</div> -->
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            label="指标权重"
+                            align="center"
+                            prop="referencescore"
+                            >
+                            <template slot-scope="scope">
+                              <el-input v-model.number="scope.row.score" autocomplete="off" @input="zhibiaofenCopy" />
+                              <!-- <el-input v-if="scope.row.istrue==1" v-model.number="scope.row.referencescore" autocomplete="off" @change="zhibiaofen" /> -->
+                              <!-- <div v-if="scope.row.istrue==2">{{scope.row.referencescore}}</div> -->
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            label="状态"
+                            align="center"
+                            prop="status"
+                            >
+                            <template slot-scope="scope">
+                              <el-select v-model="scope.row.state" clearable placeholder="请选择" @change="zhibiaostatusCopy(scope.row)">
+                                <el-option :value=1 label="使用">使用</el-option>
+                                <el-option :value=2 label="禁用">禁用</el-option>
+                                <el-option :value=3 label="观察">观察</el-option>
+                              </el-select>
+                              <!-- <div v-if="scope.row.targetweight!=0">{{scope.row.targetweight}}</div> -->
+                            </template>
+                        </el-table-column>
+                     </el-table>
+                    </el-card>
+                  </el-form-item>
+               </el-form>
+               <template #footer>
+              <div class="dialog-footer"> 
+                
+                <el-button size="small" type="primary" @click="zhuheTiCopy">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+      </div>
+    </template>
+    
+    <script>
+    import { govthree } from '@/api/personnel/post'
+    import { edit_scheme_state_of_del,get_scheme_list,getpostabouttarget,
+        get_copy_sheme_infor,quote_department_target,submit_post_scheme,get_post_scheme } from '@/api/duty/gwFangan'
+    import { dutyclasslist } from '@/api/duty/dimension'
+    import { gettasktarget,gettasktargetsun,gettasktargetcontary,addqualeval,
+    addration,departmenttasklist,addqubatch,bumenList,departmentlistnew,adddepartmentdutyinfo,
+    newgerderpattarlist,newadddepartduty,deldepartdutytarger,deldepartduty,departdutyplanversion,adddepartdutyversio,
+    lookdepartdutyversio,onoffdepartdutyversio,eitedepartexplain,copydepartdutyversio
+     } from '@/api/duty/duty'
+    import projectDialog from '@/components/projectDialog/index.vue'
+    import { dutylist,getdutyinfo,eitedutyinfo,eitedutystate } from '@/api/duty/quantitativeIndicators'
+    import {
+      grouplist,
+      departmentlist,
+      getgroupdepartmap,
+      getgroupuser
+    } from '@/api/duty/group'
+    export default {
+      name: 'Dashboard',
+      props:['gwFromList'],
+    //   props:['bmId'],
+      components: {
+        projectDialog
+      },
+      data() {
+        return {
+            laTrue:null,
+            yesList:[
+                {
+                    value:1,
+                    label:'是'
+                },
+                {
+                    value:2,
+                    label:'否'
+                },
+            ],
+          GovthreeList2:[],
+          defaultProps1: {
+                    children: 'child',
+                    label: 'name'
+                },
+          copyDialogFormVisible:false,
+          weiduFractionCopy:0,
+          weiDuCopyList:[],
+          copyForm1:{},
+          props1: {
+            checkStrictly: true,
+            value: "id",
+            label: "name",
+            children: "children",
+            emitPath:false,
+          },
+          contentShow:false,
+          editTargerFrom:{},
+          detailsShow:false,
+          // 纬度合计分
+          weiduFraction:0,
+          // 纬度卡片列表
+          weiDuList:{},
+          // 列表
+          liebiaoList:[],
+          // 权重设置弹窗
+          demDialogFormVisible:false,
+          // 执行人列表
+          userlistary:[],
+          // 执行人列表弹窗
+          showUser:false,
+          // 选择员工配置项
+          userProps: {
+            value: "key",
+            label: "name",
+            children: "govlist",
+            emitPath:false,
+            multiple: true
+          },
+          // 员工列表
+          grouplistBackup:[],
+          // 周期列表
+          options: [{
+                value: 1,
+                label: '班'
+            }, {
+                value: 2,
+                label: '天'
+            }, {
+                value: 3,
+                label: '周'
+            }, {
+                value: 4,
+                label: '月'
+            }, {
+                value: 5,
+                label: '季度'
+            }, {
+                value: 6,
+                label: '年'
+            }],
+          // 考核细则表格显示
+          tableShow:false,
+          // 子栏目列表
+          targetsunList:[],
+          // 细则列表
+          rulesList:[],
+          // 细则拷贝
+          rulesCopyList:[],
+          // 考核指标列表
+          indexList:[],
+          // 考核纬度列表
+          dutyclasslist:[],
+          // 考核纬度请求值
+          dutyClassFrom:{
+            page: 1, //分页页码，数字类型
+            pagesize: 100000,
+            state: 1 //状态（查询用）
+          },
+          // 部门列表
+          departmentList:[],
+          versionSpanArr1:[],
+          // 公司列表
+          companyList:[],
+          editChildInfo:{},
+          grouplist:[],
+          props: {
+            value: "id",
+            label: "name",
+            children: "children",
+            emitPath:false
+          },
+          addChildInfo:{
+            title:''
+          },
+          childInfo:{
+            title:''
+          },
+          // 查询详情的数据
+          editFrom:{},
+          // 修改状态提交数据
+          switchFrom:{},
+          // 删除数据提交
+          deleFrom:{},
+          // 编辑时数据
+          editAdd:{
+            parentId:''
+          },
+          assessList:{},
+          // 添加数据
+          form:{
+            group:'',
+            parentid:'',
+            child:[]
+          },
+          searchDepartmentList:[],
+          // 弹窗变量
+          dialogFormVisible:false,
+          // 修改弹窗
+          editDialogFormVisible:false,
+          total: 0,
+          tableData:[],
+          yearList:[{
+              value: '2021',
+              label: '2021'
+            }, {
+              value: '2022',
+              label: '2022'
+            }, {
+              value: '2023',
+              label: '2023'
+            }, {
+              value: '2024',
+              label: '2024'
+            }, {
+              value: '2025',
+              label: '2025'
+            }, {
+              value: '2026',
+              label: '2026'
+            }, {
+              value: '2027',
+              label: '2027'
+            }, {
+              value: '2028',
+              label: '2028'
+            }, {
+              value: '2029',
+              label: '2029'
+            }, {
+              value: '2030',
+              label: '2030'
+            }],
+          pos:'',
+          pos1:'',
+          pos2:'',
+          versionPos:'',
+          spanArr:[],
+          spanArr1:[],
+          spanArr2:[],
+          versionSpanArr:[],
+          methodSpanArr:[],
+          methodList:[],
+          methodPos:'',
+          methodShow:false,
+          versionData:[],
+          // 条件查询变量
+          searchInfo: {
+            type: 0,
+            group: "3",
+            departmentid:'',
+          },
+          // 新条件查询变量
+          searchVersion: {
+            group: 309,
+            deaprtid:'',
+            year: "", //年
+          },
+    
+          showDetailsRow:{},
+          // 条件查询变量
+          abc:{
+            aaa:"111",
+            bbb:"222"
+          },
+          // 添加时验证规则
+          rules: {
+            // title: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          },
+          editRules:{
+            title: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          }
+        }
+      },
+      created() {
+        console.log(this.$store.state.user.token)
+        if (this.$store.state.user.token=='') {
+          this.$router.push('/login')
+        }
+        // 页面渲染时获取初始数据
+        this.initialDepartment()
+        // this.getVersionDataList()
+        // this.getDataList()
+        this.getGrouplist()
+        this.getDutyclasslist()
+        this.getSystemadminlist()
+        this.getGovthree2()
+      },
+      // 监听数据
+      watch: {
+        gwFromList:{
+                handler(newVal){
+                console.log("newVal");
+                console.log(newVal);
+                // const list = []
+                // list.push(this.gwFromList.gwId.toString())
+                // this.searchInfo.postid=list
+                this.searchVersion.postid=this.gwFromList.gwId.toString()
+                this.searchVersion.orgid=this.gwFromList.orgid.toString()
+                console.log()
+                this.getVersionDataList()
+            },
+            deep: true
+            },
+        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=[],
+            this.methodPos='',
+            //此时就可以获取到在created赋值后的dataList了
+          this.getMethodSpanArr(this.methodList);
+          });
+        },
+        versionData() {
+          this.$nextTick(() => {
+            this.versionSpanArr=[],
+            this.versionPos='',
+            // this.methodSpanArr1=[],
+            // this.methodPos1='',
+            //此时就可以获取到在created赋值后的dataList了
+          this.getVersionSpanArr(this.versionData);
+          // this.getMethodSpanArr1(this.methodList);
+          });
+        },
+        tableData() {
+          this.$nextTick(() => {
+            this.spanArr=[],
+            this.spanArr1=[],
+            this.spanArr2=[],
+            this.pos2='',
+            this.pos='',
+            this.pos1='',
+            
+            //此时就可以获取到在created赋值后的dataList了
+            this.getSpanArr(this.tableData);
+            this.getSpanArr1(this.tableData);
+            this.getSpanArr2(this.tableData);
+          });
+        },
+      },
+      methods: {
+        // 拉取部门考核选择
+        async laBian(){
+            if(this.laTrue==1){
+                const From={
+                    id:this.gwFromList.gwId.toString()
+                }
+                const that = this
+                // const res = await departmentlistnew(From)
+                const res = await quote_department_target(From)
+                this.weiDuList1=JSON.parse(JSON.stringify(res.data))
+                this.weiDuList1.forEach(function(element) {
+                that.$set(element, 'ordering', '')
+                that.$set(element, 'zhiFraction', 0)
+                 if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                    that.$set(iteam, 'status', 1)
+                  })
+                 }
+                });
+          this.Fraction1=0
+          this.weiDuList1.forEach(function(element) {
+             element.zhiFraction=0
+          });
+          this.weiDuList1.forEach(function(element) {
+            if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                     if(iteam.status!=2){
+                       element.zhiFraction+=iteam.referencescore
+                     }
+                    
+                  })
+                 }
+          });
+          this.weiduFraction1=0
+          this.weiDuList1.forEach(function(element) {
+            that.weiduFraction1+=element.zhiFraction1
+          });
+                console.log(this.weiDuList1)
+            }
+        },
+        // 点击行政组织树
+        handleNodeClick(val){
+              this.searchInfo.organization=val.id
+              this.searchInfo.organization=this.searchInfo.organization.toString()
+              this.getDataList()
+              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)
+        },
+        getVersionSpanArr(data) {
+            // data就是我们从后台拿到的数据
+          for (var i = 0; i < data.length; i++) {
+            if (i === 0) {
+              this.versionSpanArr.push(1);
+              this.versionPos = 0;
+            } else {
+              // 判断当前元素与上一个元素是否相同
+              if (data[i].department === data[i - 1].department) {
+                this.versionSpanArr[this.versionPos] += 1;
+                this.versionSpanArr.push(0);
+              } else {
+                this.versionSpanArr.push(1);
+                this.versionPos = i;
+              }
+            }
+          }
+        },
+        versionSpanMethod({ row, column, rowIndex, columnIndex }){
+          if (columnIndex === 0) {
+            const _row = this.versionSpanArr[rowIndex];
+            const _col = _row > 0 ? 1 : 0;
+            return {
+              // [0,0] 表示这一行不显示， [2,1]表示行的合并数
+              rowspan: _row,
+              colspan: _col
+            };
+          }
+        },
+        // 部门考核详情关闭监听
+        detailsClose(){
+          this.tableData=[]
+        },
+        async showDetails(row){
+            this.showDetailsRow=row
+            this.getDataList()
+            this.detailsShow=true
+          
+        },
+        // 显示复制弹窗
+        async copyShow(row){
+          const that = this
+          const from = {
+            id:row.id.toString()
+          }
+        //   const res = await copydepartdutyversio(from)
+        const res = await get_copy_sheme_infor(from)
+          this.copyForm1=res.data
+          
+          this.weiDuCopyList=res.data.postchild
+          this.weiduFractionCopy=0
+          this.weiDuCopyList.forEach(function(element) {
+             element.zhiFraction=0
+          });
+          this.weiDuCopyList.forEach(function(element) {
+            if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                     if(iteam.status!=2){
+                       element.zhiFraction+=iteam.score
+                     }
+                    
+                  })
+                 }
+          });
+          this.weiduFractionCopy=0
+          this.weiDuCopyList.forEach(function(element) {
+            that.weiduFractionCopy+=element.zhiFraction
+          });
+          this.copyDialogFormVisible=true
+        },
+        // 删除部门考核
+        async deldetePartDuty(row){
+          const deleFrom = {
+            group: row.group,
+            deaprtid: row.parentid
+          }
+          const res = await deldepartduty(deleFrom)
+           if (res.code === 0) {
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+              this.getDataList()
+          }
+        },
+        // 修改说明
+        async xiuShuoMing(){
+          const res = await eitedepartexplain(this.editTargerFrom)
+          this.editTargerFrom={}
+          this.getDataList()
+          this.contentShow=false 
+        },
+        // 删除部门考核指标
+        async editTarger(row){
+          this.editTargerFrom={
+            content:row.content,
+            group:row.group,
+            qualevalid:row.qualevalid,
+            deaprtid:row.parentid,
+            dimension:row.dimension,
+            targetid:row.target,
+            state:row.state,
+            operator:row.userlist
+          },
+          // this.editTargerFrom.content=row.content
+          // this.editTargerFrom.group=row.group
+          // this.editTargerFrom.qualevalid=row.qualevalid
+          // this.editTargerFrom.deaprtid=row.parentid
+          // this.editTargerFrom.dimension=row.dimension
+          // this.editTargerFrom.targetid=row.target
+          this.contentShow=true
+          // const deleFrom = {
+          //   group: row.group,
+          //   deaprtid: row.parentid,
+          //   dimension: "1", //维度
+          //   targetid: "1" //指标
+          //   }
+          // const res = await deldepartdutytarger(deleFrom)
+          // if (res.code === 0) {
+          //       this.$message({
+          //         type: 'success',
+          //         message: '删除成功!'
+          //       })
+          //     this.getDataList()
+          // }
+        },
+        // 删除部门考核指标
+        async deldepTarger(row){
+          this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+            .then(async() => {
+             const deleFrom = {
+            group: row.group,
+            deaprtid: row.parentid,
+            dimension: "1", //维度
+            targetid: "1" //指标
+            }
+          const res = await deldepartdutytarger(deleFrom)
+          if (res.code === 0) {
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+              this.getDataList()
+          }
+            })
+          
+        },
+        // 指标分值合计
+        zhibiaofen(){
+           const that=this
+          this.Fraction=0
+          this.weiDuList.forEach(function(element) {
+             element.zhiFraction=0
+          });
+          this.weiDuList.forEach(function(element) {
+            if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                     if(iteam.status!=2){
+                       element.zhiFraction+=iteam.standardscore
+                     }
+                    
+                  })
+                 }
+          });
+          this.weiduFraction=0
+          this.weiDuList.forEach(function(element) {
+            that.weiduFraction+=element.zhiFraction
+          });
+        },
+        // 指标分值合计
+        zhibiaofenCopy(){
+           const that=this
+          this.weiduFractionCopy=0
+          this.weiDuCopyList.forEach(function(element) {
+             element.zhiFraction=0
+          });
+          this.weiDuCopyList.forEach(function(element) {
+            if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                     if(iteam.status!=2){
+                       element.zhiFraction+=iteam.referencescore
+                     }
+                    
+                  })
+                 }
+          });
+          this.weiduFractionCopy=0
+          this.weiDuCopyList.forEach(function(element) {
+            that.weiduFractionCopy+=element.zhiFraction
+          });
+        },
+        // 复制弹窗点击禁用
+        zhibiaostatusCopy(row){
+          const that=this
+          this.weiduFractionCopy=0
+          this.weiDuCopyList.forEach(function(element) {
+             element.zhiFraction=0
+          });
+          this.weiDuCopyList.forEach(function(element) {
+            if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                     if(iteam.status!=2){
+                       element.zhiFraction+=iteam.referencescore
+                     }
+                    
+                  })
+                 }
+          });
+          this.weiduFractionCopy=0
+          this.weiDuCopyList.forEach(function(element) {
+            that.weiduFractionCopy+=element.zhiFraction
+          });
+        },
+        // 点击禁用
+        zhibiaostatus(row){
+          const that=this
+          this.Fraction=0
+          this.weiDuList.forEach(function(element) {
+             element.zhiFraction=0
+          });
+          this.weiDuList.forEach(function(element) {
+            if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                     if(iteam.status!=2){
+                       element.zhiFraction+=iteam.referencescore
+                     }
+                    
+                  })
+                 }
+          });
+          this.weiduFraction=0
+          this.weiDuList.forEach(function(element) {
+            that.weiduFraction+=element.zhiFraction
+          });
+        },
+        zhuheguan(){
+          this.demDialogFormVisible=false
+        },
+        // 组合提交
+        async zhuheTi(){
+          
+          if (this.weiduFraction==100) {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            });
+          this.form.orgid=this.gwFromList.orgid.toString()
+          this.form.postid=this.gwFromList.gwId.toString()
+          this.form.postchild=this.weiDuList
+          this.form.departmentchild=[]
+          // const res = await adddepartmentdutyinfo(this.form)
+          // const res = await newadddepartduty(this.form)
+          // this.demDialogFormVisible=false
+          const res = await submit_post_scheme(this.form)
+          if (res.code === 0) {
+                this.$message({
+                  type: 'success',
+                  message: '操作成功!'
+                })
+                this.getVersionDataList()
+                this.form={
+                  group:'',
+                  parentid:'',
+                  child:[]
+                }
+              }
+              this.weiduFraction=0
+              this.form={
+                group:'',
+                parentid:'',
+                child:[]
+              }
+              loading.close();
+          }else{
+            this.$message({
+                  type: 'error',
+                  message: '总分不是100!'
+                })
+          }
+        },
+        // 复制组合提交
+        async zhuheTiCopy(){
+          if (this.weiduFractionCopy==100) {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            });
+          const from ={
+            group:this.copyForm1.group.toString(),
+            parentid:this.copyForm1.department.toString(),
+            child:this.weiDuCopyList,
+            year:this.copyForm1.year
+          }
+          // const res = await adddepartmentdutyinfo(this.form)
+          // const res = await newadddepartduty(this.form)
+          // this.demDialogFormVisible=false
+        //   const res = await adddepartdutyversio(from)
+        const res = await submit_post_scheme(from)
+          if (res.code === 0) {
+                this.$message({
+                  type: 'success',
+                  message: '操作成功!'
+                })
+                this.getVersionDataList()
+              }
+              this.weiduFractionCopy=0
+              loading.close();
+          }else{
+            this.$message({
+                  type: 'error',
+                  message: '总分不是100!'
+                })
+          }
+        },
+        // 提交指标权重
+        async tijiao(){
+          const that=this
+          this.liebiaoList.forEach(function(item, index) {
+                //index是循环的索引，从0开始
+                that.form.targetlist.push({id:item.target,weight:parseInt(item.targetweight)})
+              })
+          this.form.group=this.form.group.toString()
+          this.form.parentid=this.form.parentid.toString()
+          const res = await addqubatch(that.form)
+          console.log(that.form)
+        },
+        // 设置指标权重弹窗
+        async showIndex(){
+            console.log('岗位弹窗')
+            console.log(this.gwFromList)
+            if (this.searchVersion.postid!='') {
+                const From={
+                    id:this.gwFromList.gwId.toString()
+                }
+                const that = this
+                // const res = await departmentlistnew(From)
+                const res = await getpostabouttarget(From)
+                this.weiDuList=JSON.parse(JSON.stringify(res.data))
+                this.weiDuList.forEach(function(element) {
+                that.$set(element, 'ordering', '')
+                that.$set(element, 'zhiFraction', 0)
+                 if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                    that.$set(iteam, 'status', 1)
+                  })
+                 }
+                });
+          this.Fraction=0
+          this.weiDuList.forEach(function(element) {
+             element.zhiFraction=0
+          });
+          this.weiDuList.forEach(function(element) {
+            if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                     if(iteam.status!=2){
+                       element.zhiFraction+=iteam.standardscore
+                     }
+                  })
+                 }
+          });
+          this.weiduFraction=0
+          this.weiDuList.forEach(function(element) {
+            that.weiduFraction+=element.zhiFraction
+          });
+                console.log("this.weiDuList")
+                console.log(this.weiDuList)
+          }
+          this.demDialogFormVisible=true
+        },
+        // 考核办法列表合并行
+        methodSpanMethod({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex === 0) {
+            const _row = this.methodSpanArr[rowIndex];
+            const _col = _row > 0 ? 1 : 0;
+            return {
+              // [0,0] 表示这一行不显示， [2,1]表示行的合并数
+              rowspan: _row,
+              colspan: _col
+            };
+          }
+        },
+        getMethodSpanArr(data) {
+          
+            // data就是我们从后台拿到的数据
+          for (var i = 0; i < data.length; i++) {
+            if (i === 0) {
+              this.methodSpanArr.push(1);
+              this.methodPos = 0;
+            } else {
+              // 判断当前元素与上一个元素是否相同
+              if (data[i].targetsun === data[i - 1].targetsun) {
+                this.methodSpanArr[this.methodPos] += 1;
+                this.methodSpanArr.push(0);
+              } else {
+                this.methodSpanArr.push(1);
+                this.methodPos = i;
+              }
+            }
+          }
+        },
+        // 查看考核办法
+        async showMethod(row){
+          const methodData={
+            type: 1, //1：定性考核；2：定量考核
+            group: row.group, //归属集团
+            departmentid: row.parentid, //被考核部门
+            dimension: row.dimension, //维度
+            target: row.target, //考核指标
+            versionnumber: row.qualevalid //版本号
+          }
+          const res = await departmenttasklist(methodData)
+          if (res.code==0) {
+            this.methodList=res.data
+            this.methodShow=true
+          }
+        },
+        // 指标合并
+        getSpanArr2(data) {
+            // data就是我们从后台拿到的数据
+          for (var i = 0; i < data.length; i++) {
+            if (i === 0) {
+              this.spanArr2.push(1);
+              this.pos2 = 0;
+            } else {
+              // 判断当前元素与上一个元素是否相同
+              if (data[i].target === data[i - 1].target) {
+                this.spanArr2[this.pos2] += 1;
+                this.spanArr2.push(0);
+              } else {
+                this.spanArr2.push(1);
+                this.pos2 = i;
+              }
+            }
+          }
+        },
+        // 点击查看人员列表
+        showUserList(row){
+          this.showUser=true
+          this.userlistary=row.userlistary
+        },
+        getSpanArr(data) {
+            // data就是我们从后台拿到的数据
+          for (var i = 0; i < data.length; i++) {
+            if (i === 0) {
+              this.spanArr.push(1);
+              this.pos = 0;
+            } else {
+              // 判断当前元素与上一个元素是否相同
+              if (data[i].parentid === data[i - 1].parentid) {
+                this.spanArr[this.pos] += 1;
+                this.spanArr.push(0);
+              } else {
+                this.spanArr.push(1);
+                this.pos = i;
+              }
+            }
+          }
+        },
+        getSpanArr1(data) {
+            // data就是我们从后台拿到的数据
+          for (var i = 0; i < data.length; i++) {
+            if (i === 0) {
+              this.spanArr1.push(1);
+              this.pos1 = 0;
+            } else {
+              // 判断当前元素与上一个元素是否相同
+              if (data[i].dimension === data[i - 1].dimension) {
+                this.spanArr1[this.pos1] += 1;
+                this.spanArr1.push(0);
+              } else {
+                this.spanArr1.push(1);
+                this.pos1 = i;
+              }
+            }
+          }
+        },
+        // 合并行
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+          // if (columnIndex === 0||columnIndex === 10) {
+          //   const _row = this.spanArr[rowIndex];
+          //   const _col = _row > 0 ? 1 : 0;
+          //   return {
+          //     // [0,0] 表示这一行不显示， [2,1]表示行的合并数
+          //     rowspan: _row,
+          //     colspan: _col
+          //   };
+          // }
+          // if (columnIndex === 10) {
+          //   const _row = this.spanArr[rowIndex];
+          //   const _col = _row > 0 ? 1 : 0;
+          //   return {
+          //     // [0,0] 表示这一行不显示， [2,1]表示行的合并数
+          //     rowspan: _row,
+          //     colspan: _col
+          //   };
+          // }
+          if (columnIndex === 0||columnIndex === 1) {
+            const _row = this.spanArr1[rowIndex];
+            const _col = _row > 0 ? 1 : 0;
+            return {
+              // [0,0] 表示这一行不显示， [2,1]表示行的合并数
+              rowspan: _row,
+              colspan: _col
+            };
+          }
+          if (columnIndex === 2||columnIndex === 3||columnIndex === 4||columnIndex === 5||columnIndex === 6||columnIndex === 7||columnIndex === 8||columnIndex === 9||columnIndex === 10) {
+            const _row = this.spanArr2[rowIndex];
+            const _col = _row > 0 ? 1 : 0;
+            return {
+              // [0,0] 表示这一行不显示， [2,1]表示行的合并数
+              rowspan: _row,
+              colspan: _col
+            };
+          }
+        },
+        // 删除行
+        deleteRow(row){
+          this.rulesCopyList.splice(row.$index,1);
+        },
+        // 选中指标后获取子栏目
+        async selectIndex(val){
+          if (val!='') {
+          const from={
+            id:val
+          }
+          const res = await gettasktargetsun(from)
+          this.targetsunList=res.data
+          }
+        },
+        // 选中子栏目后获取对应的考核细则
+        async selectTargetsun(val){
+          if (val!='') {
+          const from={
+            type: 1, //1：定性考核；2：定量考核
+            targetid: this.form.target.toString(), //指标
+            targetsunid: val.toString() //子栏目
+          }
+          const res = await gettasktargetcontary(from)
+          this.rulesList=JSON.parse(JSON.stringify(res.data))
+          this.rulesCopyList=JSON.parse(JSON.stringify(res.data))
+          this.tableShow=true
+          }
+        },
+        // 选中部门后显示纬度卡片
+        async shouWei(val){
+          if (val!='') {
+                const From={
+                  group:this.form.group.toString(),
+                  parentid:this.form.parentid.toString(),
+                }
+                const that = this
+                // const res = await departmentlistnew(From)
+                const res = await newgerderpattarlist(From)
+                this.weiDuList=JSON.parse(JSON.stringify(res.data))
+                this.weiDuList.forEach(function(element) {
+                that.$set(element, 'ordering', '')
+                that.$set(element, 'zhiFraction', 0)
+                 if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                    that.$set(iteam, 'status', 1)
+                  })
+                 }
+                });
+          this.Fraction=0
+          this.weiDuList.forEach(function(element) {
+             element.zhiFraction=0
+          });
+          this.weiDuList.forEach(function(element) {
+            if (element.child!=null) {
+                   element.child.forEach(function(iteam){
+                     if(iteam.status!=2){
+                       element.zhiFraction+=iteam.referencescore
+                     }
+                    
+                  })
+                 }
+          });
+          this.weiduFraction=0
+          this.weiDuList.forEach(function(element) {
+            that.weiduFraction+=element.zhiFraction
+          });
+                console.log(this.weiDuList)
+          }
+        },
+        // 选中部门后获取指定的指标列表
+        async selectDepartment(val){
+          if (val!='') {
+          const indexFrom={
+            type:val,
+            group:this.form.group.toString(),
+            departmentid:this.form.parentid.toString(),
+          }
+          const res = await departmenttasklist(indexFrom)
+          this.liebiaoList=res.data
+          }
+        },
+        // 获取考核纬度列表
+        async getDutyclasslist(){
+           const res = await dutyclasslist(this.dutyClassFrom)
+           this.dutyclasslist=res.data.list
+        },
+        // 选中的公司值
+        async selectGroup(val){
+          if (val!='') {
+          const departmentFrom={
+            id:parseInt(val)
+          }
+          console.log("this.form")
+          console.log(this.form)
+          const res = await departmentlist(departmentFrom)
+          this.departmentList=res.data
+          }
+          
+        },
+        // 搜索时选中的公司值
+        async searchSelectGroup(val){
+          if (val!='') {
+          const departmentFrom={
+            id:val
+          }
+          const res = await departmentlist(departmentFrom)
+          this.searchDepartmentList=res.data
+          }
+          
+        },
+        // 初始化部门
+        async initialDepartment(){
+          const departmentFrom={
+            id:309
+          }
+          const res = await departmentlist(departmentFrom)
+          this.departmentList=res.data
+        },
+        // 编辑获取选中组件值
+        getEditCheckedfrom(data){
+          this.editChildInfo=data
+          this.editAdd.parentId=this.editChildInfo.outId
+        },
+        // 获取员工列表
+        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
+                  // 如果第一层没有子项做的操作。。。。。
+              }
+          })
+        },
+        // 树形结构递归
+        digui (item) {
+            // 一层一层往下面执行，循环，直到不满足情况的条件下，会自动跳出这个递归方法，然后又到上面方法的源头处，开始执行下一个对象。。。
+          if (item.govlist != null) {
+              // 因为三级联动的数据格式是value和label,所以需要自己手动添加，没有的忽略。
+              item.govlist.forEach(ff => {
+                    // 这里就是判断他的children下面还有没有值，有的话我就要往下挖，就又开始自己调用自己了
+                  this.digui(ff)
+              })
+          }  else {
+                 // 这里就是判断，如果我这一层的children下面没有东西的时候该做什么操作 
+               // 要添加value和label,否则会看不到标签名字和值
+              // --------------------------分割线---------------------------------
+              
+              item.govlist=item.child
+              
+          }
+          // 到这里为止，不能在这里打印数据，不然数据就是个断层的，因为在这里打印的数据是当前循环的这一层的数据，如果想看完整数据效果，那么就需要在递归方法第一次调用的地方打印需要递归的值，即上一个方法中。
+      },
+        // 获取公司
+        async getGrouplist(){
+          const idFrom = {
+            // id:312
+            level: 3
+          }
+          const res = await getgroupdepartmap(idFrom)
+          this.companyList=res.data
+    
+        },
+        // 添加获取选中组件值
+        getCheckedfrom(data){
+          this.addChildInfo=data
+        },
+        // 获取选中组件值
+        getCheckedInfo(data){
+          this.childInfo=data
+        },
+        //删除操作
+        async deleteOperate(row) {
+          this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+            .then(async() => {
+              this.deleFrom.state=3;
+              this.deleFrom.istrue=2;
+              this.deleFrom.id=row.id.toString();
+              const res = await edit_scheme_state_of_del(this.deleFrom)
+              if (res.code === 0) {
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+                
+                 this.getVersionDataList()
+              }
+            })
+        },
+        // 新增按钮
+        showAdd(){
+          this.dialogFormVisible=true;
+        },
+        // 编辑按钮
+        async showEdit(row){
+          this.editFrom.outid=row.outId
+          const res = await getdutyinfo(this.editFrom)
+          this.editAdd = res.data
+          this.editAdd.parentId=res.data.parentIdStr
+          this.editChildInfo.title=res.data.parentTitle
+          this.editDialogFormVisible=true;
+    
+        },
+        // 开关状态监听
+       async changeVal(val,id){
+           console.log(val)
+          this.switchFrom.id=id.toString()
+          if (val==1) {
+            this.switchFrom.state=1;
+            const res = await edit_scheme_state_of_del(this.switchFrom)
+                    if (res.code === 0) {
+                      this.$message({
+                        type: 'success',
+                        message: '修改状态成功',
+                        showClose: true
+                      })
+                      this.getVersionDataList()
+                    }
+          } else {
+            this.switchFrom.state=2;
+            const res = await edit_scheme_state_of_del(this.switchFrom)
+                    if (res.code === 0) {
+                      this.$message({
+                        type: 'success',
+                        message: '修改状态成功',
+                        showClose: true
+                      })
+                      this.getVersionDataList()
+                    }
+          }
+          this.getVersionDataList()
+        },
+        // 重置搜索条件
+        onReset() {
+          this.searchInfo = {
+            assesstype:2,
+            page: 1,
+            pagesize: 10
+          }
+          this.childInfo={
+            title:''
+          }
+        },
+        // 条件搜索
+        onSubmit() {
+          // this.searchInfo.page = 1
+          // this.searchInfo.pagesize = 10
+          // this.searchInfo.parentId=this.childInfo.outId
+          this.getVersionDataList()
+        },
+        // 日期时间戳转日期格式
+        formatDate(nS) {     
+          return new Date(parseInt(nS) * 1000).toLocaleString().replace(/:\d{1,2}$/,' ');     
+        },
+       
+        // 提交按钮
+        async enterDialog(){
+          console.log("this.rulesCopyList")
+          console.log(this.rulesCopyList)
+          
+          this.$refs.addForm.validate(async valid => {
+            if (valid) {
+              const that=this
+              this.indexList.forEach(function(item, index) {
+                //item 就是当日按循环到的对象
+                //index是循环的索引，从0开始
+                that.form.rationlist.push({id:item.id.toString(),unit:item.unites,cycle:item.cycle,cycleattr:item.cycleattr,userlist:item.reportlist})
+              })
+              this.form.group=this.form.group.toString();
+              this.form.parentid=this.form.parentid.map(String);
+              const res = await addration(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) {
+    
+              const res = await eitedutyinfo(this.editAdd)
+              if (res.code === 0) {
+                      this.$message({
+                        type: 'success',
+                        message: '编辑成功',
+                        showClose: true
+                      })
+                    }
+              this.getDataList();
+              this.editCloseDialog();
+            }
+          })
+        },
+        // 添加框关闭
+        closeDialog() {
+          this.initForm()
+          this.dialogFormVisible = false
+        },
+        // 修改框关闭
+        editCloseDialog() {
+          this.editInitForm()
+          this.editDialogFormVisible = false
+        },
+        // 添加重置表单
+        initForm() {
+          this.$refs.addForm.resetFields()
+          this.form={
+            type:2
+          }
+        },
+        // 修改重置表单
+        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() {
+          // let searchInfoFrom = {}
+          // searchInfoFrom=JSON.parse(JSON.stringify(this.searchInfo));
+          // searchInfoFrom.departmentid=searchInfoFrom.departmentid.toString()
+          // const res = await departmenttasklist(searchInfoFrom)
+          // if (res.data==null) {
+          //   this.tableData=[]
+          // }
+          // this.tableData = res.data
+          const from = {
+            id:this.showDetailsRow.idstr
+            }
+        //   const res = await lookdepartdutyversio(from)
+        const res = await get_post_scheme(from)
+           if (res.code === 0) {
+            this.tableData=res.data
+          }
+        },
+        // 获取初始部门考核方案版本列表
+        async getVersionDataList() {
+        //   this.searchVersion.deaprtid=this.searchVersion.deaprtid.toString()
+          const res = await get_scheme_list(this.searchVersion)
+          if (res.data==null) {
+            this.versionData=[]
+          }
+          this.versionData = res.data.list
+          this.searchVersion={
+            group: '',
+            deaprtid:'',
+            year: "", //年
+          }
+          // this.searchVersion.deaprtid=parseInt(this.searchVersion.deaprtid )
+        }
+      }
+    }
+    </script>
+    
+    <style lang="scss" scoped>
+    .dashboard {
+      &-container {
+        margin: 30px;
+      }
+      &-text {
+        font-size: 30px;
+        line-height: 46px;
+      }
+    }
+    </style>
+    
\ No newline at end of file
diff --git a/src/views/assessmentProgram/gwQualitativeIndicators.vue b/src/views/assessmentProgram/gwQualitativeIndicators.vue
index bec1c61..eac8ecc 100644
--- a/src/views/assessmentProgram/gwQualitativeIndicators.vue
+++ b/src/views/assessmentProgram/gwQualitativeIndicators.vue
@@ -91,13 +91,14 @@
           </template>
         </el-table-column>
        </el-table> -->
-       <el-table :data="tableData" border  :span-method="targetSpanMethod">
+       
+       <!-- <el-table :data="tableData1" border  :span-method="targetSpanMethod"></el-table> -->
+       <el-table :data="tableData" border>
         <el-table-column prop="targetname" label="考核指标">
           <template slot-scope="scope">
             <el-link type="primary" @click="showMethod(scope.row)">{{scope.row.title}}</el-link>
           </template>
         </el-table-column>
-        
         <el-table-column prop="dimensionname" label="考核维度"/>
         <el-table-column align="left" label="岗位">
             <template #default="scope">
@@ -131,7 +132,6 @@
             <div v-if="scope.row.cycle==6">每年{{scope.row.cycleattr}}次</div>
           </template>
         </el-table-column>
-        
         <el-table-column prop="userlist" label="执行人">
           <template slot-scope="scope">
             <el-button
@@ -188,7 +188,7 @@
           </div>
       </div>
       <!-- 新增弹框 -->
-      <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增" width="80%">
+      <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增" width="90%">
         <el-form ref="addForm" :model="form" :rules="rules" label-width="150px">
           <el-row>
             <el-col :span="8">
@@ -204,30 +204,16 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-             <el-form-item label="所属公司" prop="title"  v-show="parentidShow">
+             <!-- <el-form-item label="所属公司" prop="title"  v-show="parentidShow">
              <el-cascader filterable clearable v-model="form.group" :options="companyList" :show-all-levels="false" :props="props1"></el-cascader>
-              <!-- <el-select filterable v-model="form.group" clearable placeholder="请选择">
-                <el-option
-                  v-for="item in companyList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-                </el-option>
-              </el-select> -->
-            </el-form-item>
+              
+            </el-form-item> -->
             </el-col>
             <el-col :span="8">
-               <el-form-item label="所属部门" prop="title" v-show="parentidShow">
+               <!-- <el-form-item label="所属部门" prop="title" v-show="parentidShow">
                  <el-cascader filterable clearable v-model="form.parentid" :options="departmentList" :show-all-levels="false" :props="props"></el-cascader>
-                <!-- <el-select multiple v-model="form.parentid" clearable placeholder="请选择">
-                  <el-option
-                    v-for="item in departmentList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
-                  </el-option>
-                </el-select> -->
-              </el-form-item>
+                
+              </el-form-item> -->
             </el-col>
           </el-row>
           <!-- <el-row>
@@ -246,10 +232,8 @@
           </el-row> -->
           <el-form-item label="考核项目" v-if="cardShow">
             <el-card class="box-card">
-              
                <el-row>
                 <el-col :span="8">
-                  
                   <span>标题<el-input style="width:40%;margin-left: 15px" v-model="form.targetsuntitle"></el-input></span>
                 </el-col>
                 <el-col :span="8">
@@ -344,6 +328,35 @@
                       </el-select>
                     </template>
                 </el-table-column>
+                <el-table-column
+                    label="操作属性"
+                    align="center">
+                    <template slot-scope="scope">
+                      <el-select v-model="scope.row.class" clearable placeholder="请选择">
+                        <el-option label="减少" :value=1></el-option>
+                        <el-option label="增加" :value=2></el-option>
+                        <el-option label="无属性，现场确认加或减" :value=3></el-option>
+                      </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="处罚方式"
+                    align="center">
+                    <template slot-scope="scope">
+                      <el-select v-model="scope.row.punishmode" clearable placeholder="请选择">
+                        <el-option label="扣分" :value=1></el-option>
+                        <el-option label="现金处罚" :value=2></el-option>
+                        <el-option label="扣分加现金" :value=3></el-option>
+                      </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="现金标准"
+                    align="center">
+                    <template slot-scope="scope">
+                       <el-input v-model.number="scope.row.cashstandard"></el-input>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="检查频次"
                     align="center">
@@ -355,7 +368,7 @@
                     label="客观证据"
                     align="center">
                     <template slot-scope="scope">
-                       <el-input v-model="scope.row.censorcont"></el-input>
+                       <el-input v-model="scope.row.evidence"></el-input>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -368,7 +381,7 @@
                         type="textarea"
                         autosize
                         placeholder="请输入内容"
-                        v-model="scope.row.content">
+                        v-model="scope.row.explain">
                       </el-input>
                       <!-- <el-input v-model="scope.row.content" autocomplete="off" /> -->
                     </template>
@@ -395,10 +408,16 @@
                     </template>
                 </el-table-column> -->
                 <el-table-column
-                    label="执行人"
+                    label="岗位/执行人"
                     align="center">
                     <template slot-scope="scope">
-                          <el-cascader filterable clearable v-model="scope.row.userlist" :options="grouplistBackup" :show-all-levels="false" :props="userProps"></el-cascader>
+                          <!-- <el-cascader filterable clearable v-model="scope.row.userlist" :options="grouplistBackup" :show-all-levels="false" :props="userProps"></el-cascader> -->
+                          <el-button
+                            icon="el-icon-edit"
+                            size="small"
+                            type="text"
+                            @click="editPeople(scope)"
+                          >编辑</el-button>
                     </template>
                 </el-table-column>
                 <el-table-column align="left" fixed="right" label="操作">
@@ -545,47 +564,18 @@
           </el-table-column>
         </el-table>
       </el-dialog>
-      <!-- 编辑部门弹框 -->
-      <el-dialog :close-on-click-modal="false" :visible.sync="buMenEditDialog" :before-close="bumeneditCloseDialog" title="修改" width="20%">
-        <el-form  :model="bumenEdit" label-width="150px">
-          <el-form-item label="被考核部门">
-           <el-cascader clearable v-model="bumenEdit.departmentid" :options="grouplist" :show-all-levels="false" :props="props"></el-cascader>
-          </el-form-item>
-        </el-form>
-        <template #footer>
-          <div class="dialog-footer"> 
-            <el-button size="small" @click="bumeneditCloseDialog">取 消</el-button>
-            <el-button size="small" type="primary" @click="buMenTi">确 定</el-button>
-          </div>
-        </template>
-      </el-dialog>
+      
       <!-- 考核办法弹框 -->
       <el-dialog :visible.sync="methodShow" title="考核办法" width="75%">
         <div class="gva-search-box">
         <el-form :inline="true" :model="rowZhiData">
-          <el-form-item label="所属公司">
+          <!-- <el-form-item label="所属公司">
             <el-cascader filterable clearable v-model="methodData.group" :options="companyList" :show-all-levels="false" :props="props2"  @change="selectGroup"></el-cascader>
-            <!-- <el-select filterable v-model="methodData.group" clearable placeholder="请选择" @change="selectGroup">
-              <el-option
-                v-for="item in companyList"
-                :key="item.wxId"
-                :label="item.name"
-                :value="item.wxId">
-              </el-option>
-            </el-select> -->
         </el-form-item>
         <el-form-item label="所属部门">
            <el-cascader filterable clearable v-model="methodData.departid" :options="searchDepartmentList" :show-all-levels="false" :props="props1"></el-cascader>
-          <!-- <el-select v-model="searchfu.deaprtid" clearable placeholder="请选择">
-           
-            <el-option
-              v-for="item in searchDepartmentList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select> -->
-        </el-form-item>
+          
+        </el-form-item> -->
         <el-form-item label="检查方式">
             <el-select multiple v-model="methodData.censortype" clearable placeholder="请选择">
               <el-option label="现场检查" value="1"></el-option>
@@ -615,20 +605,20 @@
               </div>
             </template>
           </el-table-column> -->
-          <el-table-column prop="targetsunname" label="考核项目" width="80">
+          <el-table-column prop="SonTargetTitle" label="考核项目" width="80">
             <template #default="scope">
-              {{scope.row.targetsunname}}
+              {{scope.row.SonTargetTitle}}
             </template>
           </el-table-column>
           <!-- <el-table-column prop="targetsunname" label="权重"></el-table-column> -->
-          <el-table-column prop="detailedtargetname" label="考核内容"></el-table-column>
-          <el-table-column prop="scoreing" label="考核标准" width="80" align="center"></el-table-column>
-          <el-table-column prop="unit" label="单位" width="80" align="center">
+          <el-table-column prop="title" label="考核内容"></el-table-column>
+          <el-table-column prop="referencescore" label="考核标准" width="80" align="center"></el-table-column>
+          <el-table-column prop="company" label="单位" width="80" align="center">
             <template #default="scope">
-              <div v-if="scope.row.unit==0">
+              <div v-if="scope.row.company==0">
               </div>
-              <div v-if="scope.row.unit!=0">
-                {{scope.row.unit}}
+              <div v-if="scope.row.company!=0">
+                {{scope.row.company}}
               </div>
             </template>
           </el-table-column>
@@ -648,17 +638,33 @@
               <div v-else-if="scope.row.cycledettar==='0'"></div>
               <div v-else>
                 {{scope.row.censorrate}}次 /
-                <span v-if="scope.row.cycledettar==1">班</span>
-                <span v-if="scope.row.cycledettar==2">天</span>
-                <span v-if="scope.row.cycledettar==3">周</span>
-                <span v-if="scope.row.cycledettar==4">月</span>
-                <span v-if="scope.row.cycledettar==5">季度</span>
-                <span v-if="scope.row.cycledettar==7">半年</span>
-                <span v-if="scope.row.cycledettar==6">年</span>
+                <span v-if="scope.row.cycle==1">班</span>
+                <span v-if="scope.row.cycle==2">天</span>
+                <span v-if="scope.row.cycle==3">周</span>
+                <span v-if="scope.row.cycle==4">月</span>
+                <span v-if="scope.row.cycle==5">季度</span>
+                <span v-if="scope.row.cycle==7">半年</span>
+                <span v-if="scope.row.cycle==6">年</span>
               </div>
               
             </template>
           </el-table-column>
+          <el-table-column label="操作属性" width="80" align="center">
+            <template #default="scope">
+                <span v-if="scope.row.addreduce==1">减少</span>
+                <span v-if="scope.row.addreduce==2">增加</span>
+                <span v-if="scope.row.addreduce==3">无属性，现场确认加或减</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="处罚方式" width="80" align="center">
+            <template #default="scope">
+                <span v-if="scope.row.punishmode==1">扣分</span>
+                <span v-if="scope.row.punishmode==2">现金处罚</span>
+                <span v-if="scope.row.punishmode==3">扣分加现金</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="minmoney" label="最低罚款" width="120"/>
+          <el-table-column prop="maxmoney" label="最高罚款" width="120"/>
           <el-table-column prop="content" label="备注说明" width="120"/>
           <el-table-column label="操作" width="120">
             <template #default="scope">
@@ -711,14 +717,65 @@
       <el-dialog :close-on-click-modal="false" :visible.sync="showzhiming" title="修改" width="40%">
         <el-form :model="nameFrom" label-width="150px">
           <el-form-item label="考核项目名称" prop="title">
-            <el-input v-model="nameFrom.name" autocomplete="off" />
+            <el-input v-model="nameFrom.title" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="被考核部门">
-           <el-cascader filterable clearable v-model="nameFrom.departmentmap" :options="grouplist" :show-all-levels="false" :props="props"></el-cascader>
-          </el-form-item>
-           <el-form-item label="执行人">
-           <el-cascader filterable clearable v-model="nameFrom.operator" :options="grouplistBackup" :show-all-levels="false" :props="userProps"></el-cascader>
+          <el-form-item label="岗位/提报人">
+            <el-table
+                :data="nameFrom.postoperator"
+                style="width: 100%">
+                <el-table-column
+                  prop="date"
+                  label="关联岗位"
+                  width="180">
+                  <template slot-scope="scope">
+                    <el-select
+                      clearable
+                      v-model="scope.row.id"
+                      filterable
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="item in nameFrom.postoperator"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      >
+                      </el-option>
+                    </el-select>          
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="提报人"
+                  width="180">
+                    <template slot-scope="scope">
+                        <el-cascader
+                          filterable
+                          clearable
+                          v-model="scope.row.operator.userkey"
+                          :options="grouplistBackup"
+                          :show-all-levels="false"
+                          :props="userProps"
+                        ></el-cascader>
+                    </template>
+                  
+                </el-table-column>
+                <el-table-column
+                  prop="address"
+                  label="操作">
+                    <template slot-scope="scope">
+                      <el-button @click="jiaArrZhilanmu" type="primary" icon="el-icon-plus" circle size="mini"></el-button>
+                      <el-button
+                          icon="el-icon-delete"
+                          size="small"
+                          type="text"
+                          @click="deleteZhiPeoRulesList(scope)"
+                        >删除</el-button>
+                    </template>
+                </el-table-column>
+              </el-table>
           </el-form-item>
+           
         </el-form>
         <template #footer>
           <div class="dialog-footer"> 
@@ -726,15 +783,138 @@
           </div>
         </template>
       </el-dialog>
+      <!-- 添加时编辑细则岗位人员 -->
+      <el-dialog :close-on-click-modal="false" :visible.sync="editGwPeoShow" title="修改" width="40%">
+        <el-table
+            :data="editPeopleData"
+            style="width: 100%">
+            <el-table-column
+              prop="date"
+              label="关联岗位"
+              width="180">
+              <template slot-scope="scope">
+                <el-select
+                  clearable
+                  v-model="scope.row.id"
+                  filterable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in gwInfoList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>          
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="提报人"
+              width="180">
+                <template slot-scope="scope">
+                    <el-cascader
+                      filterable
+                      clearable
+                      v-model="scope.row.operator"
+                      :options="grouplistBackup"
+                      :show-all-levels="false"
+                      :props="userProps"
+                    ></el-cascader>
+                </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="操作">
+                <template slot-scope="scope">
+                  <el-button @click="jiaArr" type="primary" icon="el-icon-plus" circle size="mini"></el-button>
+                  <el-button
+                      icon="el-icon-delete"
+                      size="small"
+                      type="text"
+                      @click="deletePeoRulesList(scope)"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+          </el-table>
+        <template #footer>
+          <div class="dialog-footer"> 
+            <el-button size="small" type="primary" @click="addGwPeo">确 定</el-button>
+          </div>
+        </template>
+      </el-dialog>
+      <!-- 修改时编辑细则岗位人员 -->
+      <el-dialog :close-on-click-modal="false" :visible.sync="buMenEditDialog" title="修改" width="40%">
+        <el-table
+            :data="bumenEdit"
+            style="width: 100%">
+            <el-table-column
+              prop="date"
+              label="关联岗位"
+              width="180">
+              <template slot-scope="scope">
+                <el-select
+                  clearable
+                  v-model="scope.row.id"
+                  filterable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in bumenEdit"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>          
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="提报人"
+              width="180">
+                <template slot-scope="scope">
+                    <el-cascader
+                      filterable
+                      clearable
+                      v-model="scope.row.operator"
+                      :options="grouplistBackup"
+                      :show-all-levels="false"
+                      :props="userProps"
+                    ></el-cascader>
+                </template>
+              
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="操作">
+                <template slot-scope="scope">
+                  <el-button @click="jiaArr" type="primary" icon="el-icon-plus" circle size="mini"></el-button>
+                  <el-button
+                      icon="el-icon-delete"
+                      size="small"
+                      type="text"
+                      @click="deletePeoRulesList(scope)"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+          </el-table>
+        <template #footer>
+          <div class="dialog-footer"> 
+            <el-button size="small" type="primary" @click="addGwPeo">确 定</el-button>
+          </div>
+        </template>
+      </el-dialog>
       <!-- 修改细则 -->
       <el-dialog :close-on-click-modal="false" :visible.sync="xizeDig" title="修改" width="40%">
         <el-form :model="xizeData" label-width="150px">
-          <el-form-item label="考核内容" prop="title">
+          <el-form-item label="考核内容" prop="detailedtargetname">
             <el-input
               type="textarea"
               autosize
               placeholder="请输入内容"
-              v-model="xizeData.detailedtargetname">
+              v-model="xizeData.title">
             </el-input>
           </el-form-item>
           <el-form-item label="考核标准" prop="score">
@@ -742,7 +922,44 @@
               type="textarea"
               autosize
               placeholder="请输入内容"
-              v-model="xizeData.score">
+              v-model="xizeData.referencescore">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="检查周期" prop="score">
+            <el-select v-model="xizeData.cycle" clearable placeholder="请选择">
+              <el-option label="月" :value=4></el-option>
+              <el-option label="季度" :value=5></el-option>
+              <el-option label="半年" :value=7></el-option>
+              <el-option label="年" :value=6></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="操作属性" prop="score">
+            <el-select v-model="xizeData.class" clearable placeholder="请选择">
+              <el-option label="减少" :value=1></el-option>
+              <el-option label="增加" :value=2></el-option>
+              <el-option label="无属性，现场确认加或减" :value=3></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="检查方式" prop="score">
+            <el-select multiple v-model="xizeData.inspect" clearable placeholder="请选择">
+              <el-option label="现场检查" value='1'></el-option>
+              <el-option label="资料审查" value='2'></el-option>
+              <el-option label="事件触发" value='3'></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="处罚方式" prop="score">
+            <el-select v-model="xizeData.punishmode" clearable placeholder="请选择">
+              <el-option label="扣分" :value=1></el-option>
+              <el-option label="现金处罚" :value=2></el-option>
+              <el-option label="扣分加现金" :value=3></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="现金标准" prop="score">
+            <el-input
+              autosize
+              placeholder="请输入内容"
+              v-model="xizeData.cashstandard">
             </el-input>
           </el-form-item>
           <el-form-item label="单位" prop="unit">
@@ -755,54 +972,78 @@
                 </el-option>
               </el-select>
           </el-form-item>
-          <el-form-item label="操作类型" prop="addorreduce">
-             <el-select v-model="xizeData.addreduce" placeholder="请选择">
-            <el-option label="加分" :value=2></el-option>
-            <el-option label="减分" :value=1></el-option>
-            <el-option label="加减分" :value=3></el-option>
-          </el-select>
-          </el-form-item>
-          
-          <el-form-item label="检查方式">
-            <el-select multiple v-model="xizeData.censortype" clearable placeholder="请选择">
-              <el-option label="现场检查" :value=1></el-option>
-              <el-option label="资料审查" :value=2></el-option>
-              <el-option label="事件触发" :value=3></el-option>
-            </el-select>
-          </el-form-item>
-           <el-form-item label="检查周期">
-            <el-select v-model="xizeData.cycle" clearable placeholder="请选择">
-              <el-option label="月" :value=4></el-option>
-              <el-option label="季度" :value=5></el-option>
-              <el-option label="半年" :value=7></el-option>
-              <el-option label="年" :value=6></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="检查频次">
-            <el-input v-model.number="xizeData.censorrate"></el-input>
-          </el-form-item>
-          <el-form-item label="客观证据">
+          <el-form-item label="备注说明" prop="explain">
             <el-input
               type="textarea"
               autosize
               placeholder="请输入内容"
-              v-model="xizeData.censorcont">
+              v-model="xizeData.explain">
             </el-input>
           </el-form-item>
-          <el-form-item label="备注说明" prop="detailedtargetcontent">
+          <el-form-item label="客观证据" prop="evidence">
             <el-input
               type="textarea"
               autosize
               placeholder="请输入内容"
-              v-model="xizeData.detailedtargetcontent">
+              v-model="xizeData.evidence">
             </el-input>
           </el-form-item>
-          <el-form-item label="被考核部门">
-           <el-cascader clearable v-model="xizeData.departmentid" :options="grouplist" :show-all-levels="false" :props="props"></el-cascader>
-          </el-form-item>
-          <el-form-item label="执行人" prop="title">
-            <el-cascader filterable clearable v-model="xizeData.operator" :options="grouplistBackup" :show-all-levels="false" :props="userProps"></el-cascader>
-          </el-form-item>
+          <el-form-item label="岗位/人员" prop="departmentsPost">
+           <el-table
+            :data="xizeData.relevantpostsman"
+            style="width: 100%">
+            <el-table-column
+              prop="date"
+              label="关联岗位"
+              width="180">
+              <template slot-scope="scope">
+                <el-select
+                  clearable
+                  v-model="scope.row.id"
+                  filterable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in postList"
+                    :key="item.idstr"
+                    :label="item.name"
+                    :value="item.idstr"
+                  >
+                  </el-option>
+                </el-select>          
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="提报人"
+              width="180">
+                <template slot-scope="scope">
+                    <el-cascader
+                      filterable
+                      clearable
+                      v-model="scope.row.operator"
+                      :options="grouplistBackup"
+                      :show-all-levels="false"
+                      :props="userProps"
+                    ></el-cascader>
+                </template>
+              
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="操作">
+                <template slot-scope="scope">
+                  <el-button @click="jiaArrAddXi" type="primary" icon="el-icon-plus" circle size="mini"></el-button>
+                  <el-button
+                      icon="el-icon-delete"
+                      size="small"
+                      type="text"
+                      @click="deleteAddXiList(scope)"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
         </el-form>
         <template #footer>
           <div class="dialog-footer"> 
@@ -818,7 +1059,7 @@
               type="textarea"
               autosize
               placeholder="请输入内容"
-              v-model="xizeDataFrom.detailedtargetname">
+              v-model="xizeDataFrom.title">
             </el-input>
           </el-form-item>
           <el-form-item label="考核标准" prop="score">
@@ -826,7 +1067,44 @@
               type="textarea"
               autosize
               placeholder="请输入内容"
-              v-model="xizeDataFrom.score">
+              v-model="xizeDataFrom.referencescore">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="检查周期" prop="score">
+            <el-select v-model="xizeDataFrom.cycle" clearable placeholder="请选择">
+              <el-option label="月" :value=4></el-option>
+              <el-option label="季度" :value=5></el-option>
+              <el-option label="半年" :value=7></el-option>
+              <el-option label="年" :value=6></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="操作属性" prop="score">
+            <el-select v-model="xizeDataFrom.class" clearable placeholder="请选择">
+              <el-option label="减少" :value=1></el-option>
+              <el-option label="增加" :value=2></el-option>
+              <el-option label="无属性，现场确认加或减" :value=3></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="检查方式" prop="score">
+            <el-select multiple v-model="xizeDataFrom.inspect" clearable placeholder="请选择">
+              <el-option label="现场检查" value='1'></el-option>
+              <el-option label="资料审查" value='2'></el-option>
+              <el-option label="事件触发" value='3'></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="处罚方式" prop="score">
+            <el-select v-model="xizeDataFrom.punishmode" clearable placeholder="请选择">
+              <el-option label="扣分" :value=1></el-option>
+              <el-option label="现金处罚" :value=2></el-option>
+              <el-option label="扣分加现金" :value=3></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="现金标准" prop="score">
+            <el-input
+              autosize
+              placeholder="请输入内容"
+              v-model="xizeDataFrom.cashstandard">
             </el-input>
           </el-form-item>
           <el-form-item label="单位" prop="unit">
@@ -839,17 +1117,78 @@
                 </el-option>
               </el-select>
           </el-form-item>
-          <el-form-item label="备注说明" prop="detailedtargetcontent">
+          <el-form-item label="备注说明" prop="explain">
             <el-input
               type="textarea"
               autosize
               placeholder="请输入内容"
-              v-model="xizeDataFrom.detailedtargetcontent">
+              v-model="xizeDataFrom.explain">
             </el-input>
           </el-form-item>
-          <el-form-item label="执行人" prop="operator">
-            <el-cascader filterable clearable v-model="xizeDataFrom.operator" :options="grouplistBackup" :show-all-levels="false" :props="userProps"></el-cascader>
+          <el-form-item label="客观证据" prop="evidence">
+            <el-input
+              type="textarea"
+              autosize
+              placeholder="请输入内容"
+              v-model="xizeDataFrom.evidence">
+            </el-input>
           </el-form-item>
+          <el-form-item label="岗位/人员" prop="departmentsPost">
+           <el-table
+            :data="addXirelevantpostsman"
+            style="width: 100%">
+            <el-table-column
+              prop="date"
+              label="关联岗位"
+              width="180">
+              <template slot-scope="scope">
+                <el-select
+                  clearable
+                  v-model="scope.row.id"
+                  filterable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in postList"
+                    :key="item.idstr"
+                    :label="item.name"
+                    :value="item.idstr"
+                  >
+                  </el-option>
+                </el-select>          
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="提报人"
+              width="180">
+                <template slot-scope="scope">
+                    <el-cascader
+                      filterable
+                      clearable
+                      v-model="scope.row.operator"
+                      :options="grouplistBackup"
+                      :show-all-levels="false"
+                      :props="userProps"
+                    ></el-cascader>
+                </template>
+              
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="操作">
+                <template slot-scope="scope">
+                  <el-button @click="jiaArrAddXi" type="primary" icon="el-icon-plus" circle size="mini"></el-button>
+                  <el-button
+                      icon="el-icon-delete"
+                      size="small"
+                      type="text"
+                      @click="deleteAddXiList(scope)"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
         </el-form>
         <template #footer>
           <div class="dialog-footer"> 
@@ -861,9 +1200,10 @@
 </template>
 
 <script>
+import { govthree, positionlist } from "@/api/personnel/post";
 import { dutyclasslist } from '@/api/duty/dimension'
 import { gettargetinfo,editstate } from '@/api/duty/project'
-import { get_post_target } from '@/api/duty/projectNew'
+import { get_post_target,get_sun_target_info } from '@/api/duty/projectNew'
 import { delsuntardimeat,deldutytarget,gettasktarget,
 gettasktargetsun,gettasktargetcontary,addqualeval,getqualevallist,departmenttasklist,
 delqualevalcont,deldepartmenttasklist,getrationlist,eitequalevalcont,getqualeval,dutydepartmentlist,selectdutylist,
@@ -872,10 +1212,11 @@ neweitedetailedtarget,newdelsuntarget,newdeldetailedtarget,newdeltarget,getnewei
 lookdutytargetinfo,getdutyrelationlist,adddutyrelation,getdepartforduty,eitedepartforduty } from '@/api/duty/duty'
 import projectDialog from '@/components/projectDialog/index.vue'
 import { dutylist,getdutyinfo,eitedutyinfo,eitedutystate } from '@/api/duty/quantitativeIndicators'
-import { editposttargetaual,addposttargetcont,posttargetsunlist,targetorglist,getsuntargetinfo,eidtsuntargetpost,delsuntarget,
-  addpostdetacont,getdetailscont,editdeatilscont,eidtposttardetailsstrte
+import { editposttargetaual,addposttargetcont,targetorglist,getsuntargetinfo,eidtsuntargetpost,delsuntarget,
+  addpostdetacont,eidtposttardetailsstrte
 } from '@/api/duty/oldGwDingXing'
 import{ posttargetlist } from "@/api/duty/project";
+import{ editdeatilscont,get_target_about_depart_to_post_man,add_post_target_cont,posttargetsunlist,getdetailscont } from "@/api/duty/gwDingXing";
 import {
   grouplist,
   departmentlist,
@@ -890,6 +1231,17 @@ export default {
   },
   data() {
     return {
+      // 岗位人员联动数据源
+      addXirelevantpostsman:[{
+        // 岗位id
+        id:'',
+        // 多人员列表
+        operator:[]
+      }],
+      tableData1:[],
+      editPeopleData:[],
+      editPeopleIndex:null,
+      gwInfoList:[],
       methodData:{},
       searchfu:{},
       searchDepartmentList:[],
@@ -1094,6 +1446,7 @@ export default {
         aaa:"111",
         bbb:"222"
       },
+      addInfoData:{},
       methodSpanArr:[],
       methodSpanArr1:[],
       methodPos1:'',
@@ -1109,9 +1462,11 @@ export default {
         children: "children",
         emitPath:false,
       },
+      postList:[],
       rowZhiData:{},
       methodList:[],
       xizeDataFrom:{},
+      editGwPeoShow:false,
       pos:'',
       pos1:'',
       pos2:'',
@@ -1137,6 +1492,7 @@ export default {
     this.getDutyclasslist()
     this.getSystemadminlist()
     this.selectdutylist()
+    this.getPost(this.gwFromList.bmId)
   },
    
    watch: {
@@ -1144,10 +1500,11 @@ export default {
         handler(newVal){
           console.log("newVal");
           console.log(newVal);
-          const list = []
-          list.push(this.gwFromList.gwId.toString())
-          this.searchInfo.postid=list
+          // const list = []
+          // list.push(this.gwFromList.gwId.toString())
+          this.searchInfo.departmentsPost=this.gwFromList.gwId.toString()
           this.getDataList()
+          this.getPost(this.gwFromList.bmId)
       },
       deep: true
     },
@@ -1190,6 +1547,70 @@ export default {
     },
   },
   methods: {
+     // 添加岗位人员数据
+     jiaArrAddXi(){
+      this.addXirelevantpostsman.push({
+        // 岗位id
+        id:'',
+        // 多人员列表
+        operator:[]
+      })
+    },
+    // 删除岗位人员数据
+    deleteAddXiList(row){
+      this.addXirelevantpostsman.splice(row.$index,1);
+    },
+    // 获取岗位
+    async getPost(val) {
+      const from = {
+        organization: val.toString(),
+        page: 1,
+        pagesize: 1000000,
+      };
+      const res = await positionlist(from);
+      this.postList = res.data.list;
+      console.log("岗位列表")
+      console.log(this.postList)
+    },
+    // 点击添加时的
+    addGwPeo(){
+      this.RulesList[this.editPeopleIndex].relevantpostsman=this.editPeopleData
+      this.editGwPeoShow=false
+    },
+    // 点击编辑岗位执行人
+    editPeople(scope){
+      this.editPeopleIndex=scope.$index
+      this.editPeopleData=scope.row.relevantpostsman
+      this.editGwPeoShow=true
+      console.log("this.editPeopleData")
+      console.log(this.editPeopleData)
+    },
+    // 添加岗位人员数据
+    jiaArr(){
+      this.editPeopleData.push({
+        // 岗位id
+        id:'',
+        // 多人员列表
+        operator:[]
+      })
+    },
+    // 添加子栏目岗位人员数据
+    jiaArrZhilanmu(){
+      this.nameFrom.postoperator.push({
+        // 岗位id
+        id:'',
+        // 多人员列表
+        operator:[]
+      })
+    },
+    // 删除子栏目岗位人员数据
+    deleteZhiPeoRulesList(row){
+      this.nameFrom.postoperator.splice(row.$index,1);
+    },
+    // 删除岗位人员数据
+    deletePeoRulesList(row){
+      this.editPeopleData.splice(row.$index,1);
+    },
     // 开关状态监听
    async changeVal(val,id){
        console.log(val)
@@ -1244,15 +1665,20 @@ export default {
     },
     //新增考核标准
     async addxize(){
-      const resa = await neweitedetailedtarget(this.xizeDataFrom)
+      this.xizeDataFrom.cycleattr=1
+      this.xizeDataFrom.frequency=1
+
+      this.xizeDataFrom.relevantpostsman=this.addXirelevantpostsman
+      const resa = await addpostdetacont(this.xizeDataFrom)
       this.xizeDataFrom={}
       this.getzhilanmuList()
       this.addbiao=false
     },
     // 新增考核标准弹窗
     showaddbiao(row){
-      this.$set(this.xizeDataFrom,'assid',row.dutyassessid)
-      this.$set(this.xizeDataFrom,'id','')
+      console.log(row)
+      this.$set(this.xizeDataFrom,'id',row.parentidsun.toString())
+      
       this.addbiao=true
     },
     // 修改细则
@@ -1264,9 +1690,9 @@ export default {
         this.xizeData.censorrate=0
       }
       
-      this.xizeData.departmentid=this.xizeData.departmentid.map(String)
-      this.xizeData.censortype=this.xizeData.censortype.map(String)
-      const resa = await neweitedetailedtarget(this.xizeData)
+      // this.xizeData.departmentid=this.xizeData.departmentid.map(String)
+      // this.xizeData.censortype=this.xizeData.censortype.map(String)
+      const resa = await editdeatilscont(this.xizeData)
       this.getzhilanmuList()
       this.xizeData={}
       this.xizeDig=false
@@ -1275,22 +1701,25 @@ export default {
     async selectTarget(){
       this.RulesList=[]
       const from = {
-        id:this.form.target
+        id:this.form.target.toString()
       }
+      const res = await get_post_target(from)
+      this.addInfoData=res.data
       // const res = await idtotargetsunlist(from)
-      const resa = await gettargetinfo(from)
-      this.targetsunList=resa.data
-      if (this.targetsunList.group!=null) {
-        this.form.group=parseInt(this.targetsunList.group[0])
-          const departmentFrom={
-          id:this.form.group
-        }
-        const res = await departmentlist(departmentFrom)
-        this.departmentList=res.data
-        if (res.code==0) {
-          this.form.parentid=this.targetsunList.relevantdepartmentsmap.map(Number)
-        }
-      }
+      const resa = await get_target_about_depart_to_post_man(from)
+      this.gwInfoList=resa.data
+
+      // if (this.targetsunList.group!=null) {
+      //   this.form.group=parseInt(this.targetsunList.group[0])
+      //     const departmentFrom={
+      //     id:this.form.group
+      //   }
+      //   const res = await departmentlist(departmentFrom)
+      //   this.departmentList=res.data
+      //   if (res.code==0) {
+      //     this.form.parentid=this.targetsunList.relevantdepartmentsmap.map(Number)
+      //   }
+      // }
       
       
       
@@ -1302,6 +1731,7 @@ export default {
         //unit: this.targetsunList.unites, //单位
         //referencescore: 0, //参考分值
         addorreduce:1,
+        relevantpostsman:this.gwInfoList,
         unit: '', //单位
         referencescore: '', //参考分值
         cycle: this.targetsunList.cycle, //1：班；2：天；3：周；4：月；5：季度；6：年
@@ -1312,6 +1742,7 @@ export default {
       console.log("gettargetinfo")
       console.log(this.RulesList)
       this.cardShow=true
+
       this.parentidShow=true
     },
     // 获取下拉定性考核列表
@@ -1368,36 +1799,8 @@ export default {
       this.methodShow=true
       
     },
-    // 获取子栏目列表
-    //  async getzhilanmuList(){
-    //   const methodData={
-    //     type: 1, //1：定性考核；2：定量考核
-    //     group: this.rowZhiData.group, //归属集团
-    //     departmentid: this.rowZhiData.parentid, //被考核部门
-    //     dimension: this.rowZhiData.dimension, //维度
-    //     target: this.rowZhiData.target, //考核指标
-    //   }
-    //   const res = await departmenttasklist(methodData)
-    //   if (res.code==0) {
-    //     this.methodList=res.data
-        
-    //   }
-    // },
     async onSubmitsearchfu(){
-      //  const methodData={
-      //   //type: 1, //1：定性考核；2：定量考核
-      //   group: this.searchfu.group, //归属集团
-      //   //departmentid: this.rowZhiData.parentid, //被考核部门
-      //   departid:this.searchfu.deaprtid,
-      //   dimension: this.rowZhiData.dimension, //维度
-      //   targetid: this.rowZhiData.target, //考核指标
-      //   censortype: this.searchfu.censortype.map(String), //检查方式（1：现场检查；2：资料检查；3：事件触发）
-      //   censorrate: this.searchfu.censorrate //检查依据
-      // }
-      // console.log("methodData.departid")
-      // console.log(methodData.departid)
-      // this.methodData.censortype=this.methodData.censortype.map(String)
-      // this.methodData.departid=this.methodData.departid.toString()
+      
       console.log(this.methodData.departid)
       if (this.methodData.departid!=undefined) {
         this.methodData.departid=this.methodData.departid.toString()
@@ -1432,9 +1835,9 @@ export default {
       }
       console.log("this.methodData")
       console.log(this.methodData)
-      const res = await getsuntargetinfo(this.methodData)
+      const res = await posttargetsunlist(this.methodData)
       if (res.code==0) {
-        this.methodList=res.data
+        this.methodList=res.data.list
         
       }
     },
@@ -1451,7 +1854,7 @@ export default {
           this.methodPos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].targetsun === data[i - 1].targetsun) {
+          if (data[i].parentidsun === data[i - 1].parentidsun) {
             this.methodSpanArr[this.methodPos] += 1;
             this.methodSpanArr.push(0);
           } else {
@@ -1610,7 +2013,7 @@ export default {
       //     colspan: _col
       //   };
       // }
-      if (columnIndex === 0||columnIndex === 9) {
+      if (columnIndex === 0||columnIndex === 13) {
         const _row = this.methodSpanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {
@@ -1665,7 +2068,6 @@ export default {
         type: 1, //1：定性考核；2：定量考核
         targetid: this.form.target.toString(), //指标
         targetsunid: val.toString() //子栏目
-
       }
       const res = await gettasktargetcontary(from)
       this.rulesList=JSON.parse(JSON.stringify(res.data))
@@ -1846,49 +2248,37 @@ export default {
     },
     // 新增按钮
     showAdd(){
+      console.log("this.gwFromList")
+      console.log(this.gwFromList)
       this.dialogFormVisible=true;
     },
     // 点击修改细则
     async showxize(row){
       const from = {
         // outid:row.id
-        id: row.detailedtarget, //指标明细ID
+        id: row.id.toString(), //指标明细ID
         assid: row.dutyassessid //考核方案ID
       }
-      const res = await getneweitedetailedtarget(from)
+      const res = await getdetailscont(from)
       this.xizeData=res.data
-      console.log("this.xizeData.addorreduce")
-      console.log(this.xizeData.addorreduce)
-      console.log(this.xizeData.addorreduce)
-      this.xizeData.censortype=this.xizeData.censortype.map(Number)
+      // this.xizeData.censortype=this.xizeData.censortype.map(Number)
       this.xizeDig=true
     },
     // 修改子栏目名称弹窗
     async showEditming(row){
       const editDataFrom={
-        group: row.group, //集团
-        dimension: row.dimension, //维度
-        targetid: row.target, //指标
-        suntargetid: row.targetsun //子栏目
+        id: row.parentidsun.toString(), 
         }
-      const res = await geteitesuntarterinfo(editDataFrom)
+      const res = await get_sun_target_info(editDataFrom)
       
-      this.nameFrom={
-        id:row.targetsun,
-        name:row.targetsunname,
-        group:row.group,
-        dimension:row.dimension,
-        targetid:row.target,
-        departmentmap:row.departidmap,
-        operator:res.data
-      }
+      this.nameFrom=res.data
 
       this.showzhiming=true
     },
     // 修改子栏目名称
     async xiuzhiming(){
       this.nameFrom.departmentmap=this.nameFrom.departmentmap.map(String)
-      const res = await eitesuntargetname(this.nameFrom)
+      const res = await get_sun_target_info(this.nameFrom)
       this.nameFrom={}
       this.getzhilanmuList()
       this.showzhiming=false 
@@ -1896,9 +2286,9 @@ export default {
     // 编辑部门按钮
     async showEdit(row){
       const editFrom={
-        id:row.id
+        id:row.id.toString()
         }
-      const res = await get_post_target(editFrom)
+      const res = await get_target_about_depart_to_post_man(editFrom)
       this.bumenEdit = res.data
       // this.bumenEdit.departmentid=this.bumenEdit.departmentid.map(String)
       this.buMenEditDialog=true;
@@ -1957,14 +2347,24 @@ export default {
       
       this.$refs.addForm.validate(async valid => {
         if (valid) {
-          this.form.evaluationlist=this.RulesList
-          this.form.group=this.form.group.toString();
-          this.form.target=this.form.target.toString();
+          const postid = []
+          this.addInfoData.relevantpostsman.forEach(ele=>{
+            postid.push(ele.id)
+            
+          })
+          
+          this.form.list=this.RulesList
+          this.form.targetid=this.addInfoData.id.toString();
+          this.form.postid=postid
+
+          this.form.departmentid=this.gwFromList.bmId.toString();
+          console.log("this.form.departmentid")
+          console.log(this.form.departmentid)
           // this.form.targetsun=this.form.targetsun.toString();
-          this.form.parentid=this.form.parentid.map(String);
+          // this.form.parentid=this.form.parentid.map(String);
           // this.form.parentid=this.form.evaluationlist.censortype.map(String);
           // const res = await addqualeval(this.form)
-          const res = await adddutyrelation(this.form)
+          const res = await add_post_target_cont(this.form)
           if (res.code === 0) {
             this.$message({
               type: 'success',
@@ -1974,18 +2374,14 @@ export default {
             this.RulesList=[]
             this.RulesList.push(JSON.parse(JSON.stringify(this.rulesObject )))
             this.form.evaluationlist=this.RulesList
-            this.form.group=parseInt(this.form.group)
-            this.form.target=parseInt(this.form.target)
-            this.form.targetsun=parseInt(this.form.targetsun)
-            this.form.parentid=this.form.parentid.map(Number);
+            
             this.Fraction=0;
             this.form.targetsuntitle='';
             this.getDataList();
             rLoading.close();
           }else{
+              
           }
-          this.form.group=parseInt(this.form.group);
-          this.form.target=parseInt(this.form.target);
           console.log(this.form)
         }
       })
@@ -2058,8 +2454,12 @@ export default {
     // 获取初始数据
     async getDataList() {
       const that = this
-      const res = await posttargetsunlist(this.searchInfo)
+      this.searchInfo.type=1
+      // const res = await posttargetsunlist(this.searchInfo)
+      const res = await posttargetlist(this.searchInfo)
       this.tableData = res.data.list
+      console.log("this.tableData")
+      console.log(this.tableData)
       this.total = res.data.total;
       this.searchInfo.page = res.data.page;
       this.searchInfo.pagesize = res.data.pageSize;
diff --git a/src/views/assessmentProgram/qualitativeIndicatorsBase.vue b/src/views/assessmentProgram/qualitativeIndicatorsBase.vue
index e073f65..fed4e7e 100644
--- a/src/views/assessmentProgram/qualitativeIndicatorsBase.vue
+++ b/src/views/assessmentProgram/qualitativeIndicatorsBase.vue
@@ -65,6 +65,7 @@ export default {
   name: "Dashboard",
   data() {
     return {
+      
       gwFromList:{
         gwId:1,
         bmId:1
diff --git a/src/views/basicInfo/gwProject.vue b/src/views/basicInfo/gwProject.vue
index 06555da..f674401 100644
--- a/src/views/basicInfo/gwProject.vue
+++ b/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")
-    console.log(this.gwId)
+    this.getPost(this.gwFromList.bmId)
   },
   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) {
-            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.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(",");
+          // }
+          
           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);
+          this.editAdd.id=this.editAdd.id.toString()
+          this.editAdd.dimension=this.editAdd.dimensionstr
+          const res = await dit_post_target(this.editAdd);
           if (res.code === 0) {
             this.$message({
               type: "success",
@@ -948,10 +982,10 @@ export default {
     },
     // 获取初始数据
     async getDataList() {
-      if (this.searchInfo.relevantdepartments != null) {
-        this.searchInfo.relevantdepartments =
-          this.searchInfo.relevantdepartments.map(String);
-      }
+      // 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;
diff --git a/src/views/basicInfo/projectBase.vue b/src/views/basicInfo/projectBase.vue
index a817bf0..8584553 100644
--- a/src/views/basicInfo/projectBase.vue
+++ b/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);
diff --git a/src/views/basicInfo/target.vue b/src/views/basicInfo/target.vue
index b537eae..694d878 100644
--- a/src/views/basicInfo/target.vue
+++ b/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">
diff --git a/src/views/frontPage/index.vue b/src/views/frontPage/index.vue
index efa77bc..abd8e9f 100644
--- a/src/views/frontPage/index.vue
+++ b/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',