diff --git a/src/api/duty/gwDingXing.js b/src/api/duty/gwDingXing.js
index b93fa28..4b21247 100644
--- a/src/api/duty/gwDingXing.js
+++ b/src/api/duty/gwDingXing.js
@@ -95,4 +95,52 @@ export function editdeatilscont(data) {
     data
   })
 }
+// 编辑岗位子栏目内容
+export function edit_son_target_cont(data) {
+  return request({
+    url: '/postpc/edit_son_target_cont',
+    method: 'post',
+    data
+  })
+}
+// 岗位定量考核目标列表
+export function post_config_list(data) {
+  return request({
+    url: '/postpc/post_config_list',
+    method: 'post',
+    data
+  })
+}
+// 提交定量考核数据
+export function set_evaluation_objectives(data) {
+  return request({
+    url: '/postpc/set_evaluation_objectives',
+    method: 'post',
+    data
+  })
+}
+// 修改考核目标设置
+export function eite_quantitative_config(data) {
+  return request({
+    url: '/postpc/eite_quantitative_config',
+    method: 'post',
+    data
+  })
+}
+// 删除考核目标设置
+export function del_quantitative_config(data) {
+  return request({
+    url: '/postpc/del_quantitative_config',
+    method: 'post',
+    data
+  })
+}
+// 查看定量考核目标设定
+export function lookposttiveconfig(data) {
+  return request({
+    url: '/postpc/lookposttiveconfig',
+    method: 'post',
+    data
+  })
+}
 
diff --git a/src/api/duty/quanXian.js b/src/api/duty/quanXian.js
new file mode 100644
index 0000000..9235f3a
--- /dev/null
+++ b/src/api/duty/quanXian.js
@@ -0,0 +1,59 @@
+import request from '@/utils/requestFile'
+// 添加应用系统
+export function add_system(data) {
+  return request({
+    url: '/powerpc/add_system',
+    method: 'post',
+    data
+  })
+}
+// 系统列表
+export function system_list(data) {
+    return request({
+      url: '/powerpc/system_list',
+      method: 'post',
+      data
+    })
+  }
+// 编辑应用系统信息
+export function edit_system(data) {
+    return request({
+      url: '/powerpc/edit_system',
+      method: 'post',
+      data
+    })
+  }
+// 更改状态或删除
+export function edit_state_of_del(data) {
+    return request({
+      url: '/powerpc/edit_state_of_del',
+      method: 'post',
+      data
+    })
+  }
+// 系统菜单
+export function system_about_menu(data) {
+    return request({
+      url: '/powerpc/system_about_menu',
+      method: 'post',
+      data
+    })
+  }
+// 系统授权-权限列表
+export function obtain_authorization(data) {
+    return request({
+      url: '/system_authorizing/obtain_authorization',
+      method: 'post',
+      data
+    })
+  }
+// 编辑权限
+export function edit_power(data) {
+    return request({
+      url: 'powerpc/edit_power',
+      method: 'post',
+      data
+    })
+  }
+
+
diff --git a/src/router/index.js b/src/router/index.js
index b0458bb..ba1c224 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -255,7 +255,7 @@ export const constantRoutes = [
       },
       { 
         path: 'Target',
-        component: () => import('@/views/basicInfo/target'),
+        component: () => import('@/views/basicInfo/targetBase'),
         meta: { title: '考核目标'}
       },
     ],
@@ -391,7 +391,7 @@ export const constantRoutes = [
         {
           path: 'Target',
           name: 'Target',
-          component: () => import('@/views/basicInfo/target'),
+          component: () => import('@/views/basicInfo/targetBase'),
           meta: { title: '考核目标', icon: 'tree' }
         },
         // {
diff --git a/src/views/assessmentProgram/gwDepartmentalAssessment.vue b/src/views/assessmentProgram/gwDepartmentalAssessment.vue
index 7e501b5..32944ab 100644
--- a/src/views/assessmentProgram/gwDepartmentalAssessment.vue
+++ b/src/views/assessmentProgram/gwDepartmentalAssessment.vue
@@ -360,7 +360,7 @@
                         </el-table-column>
                      </el-table>
                     </el-card>
-                    <!-- <el-form-item label="拉取部门考核">
+                    <el-form-item label="拉取部门考核">
                         <el-select v-model="laTrue" placeholder="请选择" @change="laBian">
                         <el-option
                             v-for="item in yesList"
@@ -369,7 +369,67 @@
                             :value="item.value">
                         </el-option>
                         </el-select>
-                    </el-form-item> -->
+                    </el-form-item>
+                    <el-card v-show="laTrue==1" 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" />
+                              <!-- <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="zhibiaofenLa" />
+                              <!-- <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="zhibiaostatusLa(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-card class="box-card" v-for="(item,index) in weiDuList1" :key="item.id">
                   <el-row>
@@ -736,6 +796,7 @@
       },
       data() {
         return {
+          weiDuList1:[],
             laTrue:null,
             yesList:[
                 {
@@ -1034,7 +1095,9 @@
                   })
                  }
                 });
-          this.Fraction1=0
+                console.log("weiDuList1")
+                console.log(weiDuList1)
+          this.Fraction=0
           this.weiDuList1.forEach(function(element) {
              element.zhiFraction=0
           });
@@ -1048,9 +1111,9 @@
                   })
                  }
           });
-          this.weiduFraction1=0
+          this.weiduFraction=0
           this.weiDuList1.forEach(function(element) {
-            that.weiduFraction1+=element.zhiFraction1
+            that.weiduFraction+=element.zhiFraction1
           });
                 console.log(this.weiDuList1)
             }
@@ -1242,6 +1305,28 @@
             that.weiduFraction+=element.zhiFraction
           });
         },
+        // 拉取的指标分值合计
+        zhibiaofenLa(){
+           const that=this
+          this.Fraction=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.standardscore
+                     }
+                    
+                  })
+                 }
+          });
+          this.weiduFraction=0
+          this.weiDuList1.forEach(function(element) {
+            that.weiduFraction+=element.zhiFraction
+          });
+        },
         // 指标分值合计
         zhibiaofenCopy(){
            const that=this
@@ -1308,6 +1393,28 @@
             that.weiduFraction+=element.zhiFraction
           });
         },
+        // 点击禁用
+        zhibiaostatusLa(row){
+          const that=this
+          this.Fraction=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.weiduFraction=0
+          this.weiDuList1.forEach(function(element) {
+            that.weiduFraction+=element.zhiFraction
+          });
+        },
         zhuheguan(){
           this.demDialogFormVisible=false
         },
@@ -1315,6 +1422,9 @@
         async zhuheTi(){
           
           if (this.weiduFraction==100) {
+            if (this.laTrue!=1) {
+              this.form.departmentchild=[]
+            }
             const loading = this.$loading({
               lock: true,
               text: 'Loading',
@@ -1324,7 +1434,7 @@
           this.form.orgid=this.gwFromList.orgid.toString()
           this.form.postid=this.gwFromList.gwId.toString()
           this.form.postchild=this.weiDuList
-          this.form.departmentchild=[]
+          this.form.departmentchild=this.weiDuList1
           // const res = await adddepartmentdutyinfo(this.form)
           // const res = await newadddepartduty(this.form)
           // this.demDialogFormVisible=false
diff --git a/src/views/assessmentProgram/gwQualitativeIndicators.vue b/src/views/assessmentProgram/gwQualitativeIndicators.vue
index eac8ecc..e471c81 100644
--- a/src/views/assessmentProgram/gwQualitativeIndicators.vue
+++ b/src/views/assessmentProgram/gwQualitativeIndicators.vue
@@ -1216,7 +1216,7 @@ import { editposttargetaual,addposttargetcont,targetorglist,getsuntargetinfo,eid
   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{ editdeatilscont,get_target_about_depart_to_post_man,add_post_target_cont,posttargetsunlist,getdetailscont,edit_son_target_cont } from "@/api/duty/gwDingXing";
 import {
   grouplist,
   departmentlist,
@@ -1436,6 +1436,8 @@ export default {
       tableData:[],
       // 条件查询变量
       searchInfo: {
+        page:1,
+        pagesize:10,
         type:1
       },
       spanArr:[],
@@ -1508,14 +1510,6 @@ export default {
       },
       deep: true
     },
-    // gwFromList(){
-    //   console.log("gwId变化")
-    //   console.log(this.gwFromList)
-    //   const list = []
-    //   list.push(this.gwFromList.gwId)
-    //   this.searchInfo.postid=list
-    //   this.getDataList()
-    // },
     tableData() {
       this.$nextTick(() => {
       this.spanArr=[],
@@ -1793,11 +1787,8 @@ export default {
     // 查看考核办法
     showMethod(row){
       this.rowZhiData=row
-      console.log("this.rowZhiData")
-      console.log(this.rowZhiData)
       this.getzhilanmuList()
       this.methodShow=true
-      
     },
     async onSubmitsearchfu(){
       
@@ -1813,7 +1804,7 @@ export default {
       }
       
       // const res = await lookdutytargetinfo(methodData)
-      const res = await lookdutytargetinfo(this.methodData)
+      const res = await posttargetsunlist(this.methodData)
       // this.methodData.censortype=this.methodData.censortype.map(Number)
       //  this.$delete(this.methodData,'censorrate')
       if (res.code==0) {
@@ -1831,14 +1822,14 @@ export default {
         // //departmentid: this.rowZhiData.parentid, //被考核部门
         // dimension: this.rowZhiData.dimension, //维度
         // targetid: this.rowZhiData.target, //考核指标
-        id:this.rowZhiData.id.toString()
+        // id:this.rowZhiData.id.toString()
+        departmentid: this.rowZhiData.reledepart, //行政组织
+        postid: this.rowZhiData.departmentspost.split(','), //岗位
+        targetid: this.rowZhiData.id.toString(), //指标ID
       }
-      console.log("this.methodData")
-      console.log(this.methodData)
       const res = await posttargetsunlist(this.methodData)
       if (res.code==0) {
         this.methodList=res.data.list
-        
       }
     },
     // 点击查看人员列表
@@ -2277,8 +2268,13 @@ export default {
     },
     // 修改子栏目名称
     async xiuzhiming(){
-      this.nameFrom.departmentmap=this.nameFrom.departmentmap.map(String)
-      const res = await get_sun_target_info(this.nameFrom)
+      this.nameFrom.id=this.nameFrom.id.toString()
+      this.nameFrom.name=this.nameFrom.title
+      this.nameFrom.postoperator.forEach(ele=>{
+        ele.operator=ele.operator.userkey
+      })
+      // this.nameFrom.departmentmap=this.nameFrom.departmentmap.map(String)
+      const res = await edit_son_target_cont(this.nameFrom)
       this.nameFrom={}
       this.getzhilanmuList()
       this.showzhiming=false 
@@ -2455,11 +2451,12 @@ export default {
     async getDataList() {
       const that = this
       this.searchInfo.type=1
+      this.searchInfo.departmentsPost=this.gwFromList.gwId.toString()
+      console.log("this.searchInfo")
+      console.log(this.searchInfo)
       // 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/basicInfo/gwProject.vue b/src/views/basicInfo/gwProject.vue
index f674401..d76975f 100644
--- a/src/views/basicInfo/gwProject.vue
+++ b/src/views/basicInfo/gwProject.vue
@@ -644,7 +644,7 @@ export default {
           console.log(newVal);
           // const list = []
           // list.push(this.gwFromList.gwId.toString())
-          
+          this.searchInfo.departmentsPost=this.gwFromList.gwId.toString()
           this.getPost(this.gwFromList.bmId)
           this.getDataList()
       },
@@ -881,7 +881,6 @@ export default {
     async enterDialog() {
       this.$refs.addForm.validate(async (valid) => {
         if (valid) {
-
            this.form.relevantDepartments =this.gwFromList.bmId.toString()
           
           if (this.form.departmentsPost != null) {
@@ -986,6 +985,7 @@ export default {
       //   this.searchInfo.relevantdepartments =
       //     this.searchInfo.relevantdepartments.map(String);
       // }
+      this.searchInfo.departmentsPost=this.gwFromList.gwId.toString()
       const res = await posttargetlist(this.searchInfo);
       this.tableData = res.data.list;
       this.total = res.data.total;
diff --git a/src/views/basicInfo/gwTarget.vue b/src/views/basicInfo/gwTarget.vue
new file mode 100644
index 0000000..726d91b
--- /dev/null
+++ b/src/views/basicInfo/gwTarget.vue
@@ -0,0 +1,1247 @@
+<template>
+<!-- 指标目标录入 -->
+  <div class="dashboard-container">
+    <div class="gva-search-box">
+      <el-form ref="searchForm" :inline="true" :model="searchInfo">
+        <el-form-item label="部门">
+          <el-cascader filterable clearable v-model.string="searchInfo.departmentid" :options="chuBuMenList" :show-all-levels="false" :props="props1"></el-cascader>
+           <!-- <el-select filterable v-model.string="searchInfo.departmentid" clearable placeholder="请选择">
+                  <el-option
+                    v-for="item in buMenList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select> -->
+        </el-form-item>
+        
+        <el-form-item label="年度">
+          <el-select v-model.number="searchInfo.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 label="指标名称">
+          <el-input
+            placeholder="请输入名称"
+            v-model="searchInfo.title"
+            clearable>
+          </el-input>
+        </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-plus" @click="showAdd()">新增</el-button>
+      </div>
+      <el-table :data="tableData" border :span-method="objectSpanMethod">
+        <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">
+          <template #default="scope">
+            <el-tag v-if="scope.row.type==1">年度</el-tag>
+            <el-tag v-if="scope.row.type==2">季度</el-tag>
+            <el-tag v-if="scope.row.type==3">月度</el-tag>
+          </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="showJiangZhi(scope.row)"
+            >查看</el-button>
+            <el-button
+              icon="el-icon-edit"
+              size="small"
+              type="text"
+              @click="showJiang(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>
+      
+      </div>
+      <!-- 新增弹框 -->
+      <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增" width="60%">
+        <el-form ref="addForm" :model="form" :rules="rules" label-width="150px">
+          <!-- <el-row>
+            <el-col :span="12">
+              <el-form-item label="所属公司">
+                <el-cascader filterable clearable v-model="form.group" :options="buMenList" :show-all-levels="false" :props="props1"  @change="selectGroup"></el-cascader>
+                
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="所属部门">
+                 <el-cascader  @change="selectDepartment" filterable clearable v-model="form.department" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader>
+                
+              </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="请选择"  @change="shouZhi">
+                  <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="考核指标" v-if="form.dimension!=''">
+                <el-select v-model="form.target" clearable placeholder="请选择">
+                  <el-option
+                    v-for="item in zhibiaoList"
+                    :key="item.id"
+                    :label="item.title"
+                    :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.number="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="12">
+              <el-form-item label="周期">
+                  <el-select v-model="form.cycle" placeholder="请选择" @change="selectZhou">
+                    <el-option
+                      v-for="item in cycleList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-card class="box-card" style="width:85%;margin: 0 auto;">
+            <div slot="header" class="clearfix">
+              <span>批量添加目标值</span>
+            </div>
+            <!-- <div v-for="o in 4" :key="o" class="text item">
+              {{'列表内容 ' + o }}
+            </div> -->
+            <div>
+              <el-row :gutter="20">
+                <el-col :span="6">
+                  <el-input
+                    placeholder="零奖值"
+                    v-model="lingJiang"
+                    clearable>
+                    <template slot="prepend">零奖值</template>
+                  </el-input>
+                </el-col>
+                <el-col :span="6">
+                   <el-input
+                    placeholder="全奖值"
+                    v-model="quanJiang"
+                    clearable>
+                    <template slot="prepend">全奖值</template>
+                  </el-input>
+                </el-col>
+                <el-col :span="6">
+                   <el-input
+                    placeholder="封顶值"
+                    v-model="fengDing"
+                    clearable>
+                    <template slot="prepend">封顶值</template>
+                    <template slot="append">%</template>
+                  </el-input>
+                </el-col>
+                <el-col :span="6">
+                  <el-button type="primary" round @click="batch">确定</el-button>
+                </el-col>
+              </el-row>
+            </div>
+          </el-card>
+          
+          <!-- <el-row>
+            <el-col :span="12">
+              
+            </el-col>
+            <el-col :span="12">
+              
+            </el-col>
+          </el-row> -->
+                  <el-table
+                   v-if="form.cycle==1"
+                    border
+                    :data="nian"
+                    style="width:85%;margin: 0 auto;">
+                    <el-table-column
+                        label="零奖值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.zeroprize" autocomplete="off" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="全奖值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.allprize" autocomplete="off" />
+                        </template>
+                    </el-table-column>
+                     <el-table-column
+                        label="封顶值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.capping" autocomplete="off">
+                            <template slot="append">%</template>
+                          </el-input>
+                        </template>
+                    </el-table-column>
+                 </el-table>
+              
+                  <el-table
+                   v-if="form.cycle==2"
+                    border
+                    :data="jidu"
+                    style="width:85%;margin: 0 auto;">
+                    <el-table-column
+                        label="季度"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          第{{scope.row.id}}季度
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="零奖值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.zeroprize" autocomplete="off" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="全奖值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.allprize" autocomplete="off" />
+                        </template>
+                    </el-table-column>
+                     <el-table-column
+                        label="封顶值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.capping" autocomplete="off">
+                            <template slot="append">%</template>
+                          </el-input>
+                        </template>
+                    </el-table-column>
+                 </el-table>
+              
+              
+                  <el-table
+                   v-if="form.cycle==3"
+                    border
+                    :data="yue"
+                    style="width:85%;margin: 0 auto;">
+                    <el-table-column
+                        label="考核期间"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          第{{scope.row.id}}月
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="零奖值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.zeroprize" autocomplete="off" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="全奖值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.allprize" autocomplete="off" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="封顶值"
+                        align="center"
+                        >
+                        <template slot-scope="scope">
+                          <el-input v-model.number="scope.row.capping" autocomplete="off">
+                            <template slot="append">%</template>
+                          </el-input>
+                        </template>
+                    </el-table-column>
+                 </el-table>
+              
+         
+        </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 :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="考核维度名称" prop="title">
+            <el-input v-model="editAdd.title" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="排序" prop="sort">
+            <el-input v-model.number="editAdd.sort" autocomplete="off" />
+          </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 :close-on-click-modal="false" :visible.sync="jiangZhiDialogFormVisible" title="编辑" width="50%">
+        <el-card class="box-card" style="width:100%;margin: 0 auto;">
+            <div slot="header" class="clearfix">
+              <span>批量修改目标值</span>
+            </div>
+            <!-- <div v-for="o in 4" :key="o" class="text item">
+              {{'列表内容 ' + o }}
+            </div> -->
+            <div>
+              <el-row :gutter="20">
+                <el-col :span="6">
+                  <el-input
+                    placeholder="零奖值"
+                    v-model.number="lingJiang"
+                    clearable>
+                    <template slot="prepend">零奖值</template>
+                  </el-input>
+                </el-col>
+                <el-col :span="6">
+                   <el-input
+                    placeholder="全奖值"
+                    v-model.number="quanJiang"
+                    clearable>
+                    <template slot="prepend">全奖值</template>
+                  </el-input>
+                </el-col>
+                <el-col :span="6">
+                   <el-input
+                    placeholder="封顶值"
+                    v-model.number="fengDing"
+                    clearable>
+                    <template slot="prepend">封顶值</template>
+                    <template slot="append">%</template>
+                  </el-input>
+                </el-col>
+                <el-col :span="6">
+                  <el-button type="primary" round @click="xiuBatch">确定</el-button>
+                </el-col>
+              </el-row>
+            </div>
+          </el-card>
+        <el-table
+          border
+          :data="jiangzhiList"
+          style="width: 100%">
+          <el-table-column
+              label="考核期间"
+              align="center"
+              >
+              <template slot-scope="scope">
+                <div v-if="scope.row.type==3">第{{scope.row.timecopy}}月</div>
+                <div v-if="scope.row.type==2">第{{scope.row.timecopy}}季度</div>
+                <div v-if="scope.row.type==1">{{scope.row.timecopy}}</div>
+                
+              </template>
+          </el-table-column>
+          <el-table-column
+              label="零奖值"
+              align="center"
+              prop="zeroprize"
+              >
+            <template slot-scope="scope">
+              <el-input v-model.number="scope.row.zeroprize" autocomplete="off" />
+            </template>
+          </el-table-column>
+          <el-table-column
+              label="全奖值"
+              align="center"
+              prop="allprize"
+              >
+              <template slot-scope="scope">
+              <el-input v-model.number="scope.row.allprize" autocomplete="off" />
+            </template>
+          </el-table-column>
+          <el-table-column
+              label="封顶值"
+              align="center"
+              prop="allprize"
+              >
+              <template slot-scope="scope">
+              <el-input v-model.number="scope.row.cappingval" autocomplete="off">
+                <template slot="append">%</template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+       <template #footer>
+          <div class="dialog-footer"> 
+            
+            <el-button size="small" type="primary" @click="editEnterDialog">确 定</el-button>
+          </div>
+        </template>
+      </el-dialog>
+      <!-- 奖值弹窗 -->
+      <el-dialog :visible.sync="jiangZhiDialog" title="奖值" width="40%">
+        <el-table
+          border
+          :data="jiangList"
+          style="width: 100%">
+          <el-table-column
+              label="考核期间"
+              align="center"
+              >
+              <template slot-scope="scope">
+                <div v-if="scope.row.type==3">第{{scope.row.timecopy}}月</div>
+                <div v-if="scope.row.type==2">第{{scope.row.timecopy}}季度</div>
+                <div v-if="scope.row.type==1">{{scope.row.timecopy}}</div>
+                
+              </template>
+          </el-table-column>
+          <el-table-column
+              label="零奖值"
+              align="center"
+              prop="zeroprize"
+              >
+            <!-- <template slot-scope="scope">
+              <el-input v-model.number="scope.row.zeroprize" autocomplete="off" />
+            </template> -->
+          </el-table-column>
+          <el-table-column
+              label="全奖值"
+              align="center"
+              prop="allprize"
+              >
+              <!-- <template slot-scope="scope">
+              <el-input v-model.number="scope.row.allprize" autocomplete="off" />
+            </template> -->
+          </el-table-column>
+          <el-table-column
+              label="封顶值"
+              align="center"
+              prop="cappingval"
+              >
+              <template slot-scope="scope">
+                {{scope.row.cappingval}}%
+              </template>
+              <!-- <template slot-scope="scope">
+              <el-input v-model.number="scope.row.cappingval" autocomplete="off" />
+            </template> -->
+          </el-table-column>
+        </el-table>
+       <template #footer>
+          <div class="dialog-footer"> 
+            
+            <el-button size="small" type="primary" @click="editEnterDialog">确 定</el-button>
+          </div>
+        </template>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { gettasktarget,gettasktargetsun,gettasktargetcontary,addqualeval,addration,departmenttasklist,addqubatch,bumenList,departmentlistnew,adddepartmentdutyinfo,lookquantitativeconfig,setevaluationobjectives,getactivationplanversion,delquantitativeconfig,eitequantitativeconfig } from '@/api/duty/duty'
+import { dutyclasslist,statedutyclass,eitedutyclassinfo,getdutyclassinfo,adddutyclass } from '@/api/duty/dimension'
+import { del_quantitative_config,lookposttiveconfig,
+  eite_quantitative_config,set_evaluation_objectives,post_config_list
+ } from '@/api/duty/gwDingXing'
+import {
+  posttargetlist
+} from '@/api/duty/project'
+import {
+  grouplist,
+  departmentlist,
+  getgroupdepartmap,
+  getgroupuser
+} from '@/api/duty/group'
+// import { forEach } from 'mock/user'
+export default {
+  name: 'Dashboard',
+  props:['gwId','gwFromList'],
+  data() {
+    return {
+      jiangList:[],
+      props1: {
+        checkStrictly: true,
+        value: "id",
+        label: "name",
+        children: "children",
+        emitPath:false,
+      },
+      banben:'',
+      fengDing:0,
+      // 奖值弹窗
+      jiangZhiDialogFormVisible:false,
+      lingJiang:'',
+      quanJiang:'',
+      departmentList:[],
+      // 考核纬度请求值
+      dutyClassFrom:{
+        page: 1, //分页页码，数字类型
+        pagesize: 100000,
+        state: 1 //状态（查询用）
+      },
+      nian:[
+        {
+        id: 1, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '',//全奖值,
+        capping:0
+        },
+      ],
+      jiangZhi:Number,
+      jidu:[
+        {
+        id: 1, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 2, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '' , //全奖值
+        capping:0
+        },
+        {
+        id: 3, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 4, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+      ],
+      yue:[
+        {
+        id: 1, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 2, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 3, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 4, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 5, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 6, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 7, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 8, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 9, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 10, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 11, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+        {
+        id: 12, //季度与月度辅助值
+        zeroprize: '', //零奖值
+        allprize: '', //全奖值
+        capping:0
+        },
+      ],
+      cycleList:[{
+          value: 1,
+          label: '年度'
+        },{
+          value: 2,
+          label: '季度'
+        },{
+          value: 3,
+          label: '月度'
+        },],
+      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'
+        }],
+      jiangzhiList:[],
+      // 查询详情的数据
+      editFrom:{},
+      // 修改状态提交数据
+      switchFrom:{},
+      // 删除数据提交
+      deleFrom:{},
+      // 编辑时数据
+      editAdd:{},
+      assessList:{},
+      // 添加数据
+      form:{
+        // group:'3',
+      },
+      jiangZhiDialog:false,
+      buMenList:[],
+      // 弹窗变量
+      dialogFormVisible:false,
+      // 修改弹窗
+      editDialogFormVisible:false,
+      total: 0,
+      tableData:[],
+      // 纬度列表
+      dutyclasslist:[],
+      // 条件查询变量
+      searchInfo: {
+        groupid:'',
+
+      },
+      pos:'',
+      spanArr:[],
+      pos1:'',
+      spanArr1:[],
+      companyList:[],
+      // 条件查询变量
+      abc:{
+        aaa:"111",
+        bbb:"222"
+      },
+      chuBuMenList:[],
+      zhibiaoList:[],
+      zhibiaoShow:false,
+      // 添加时验证规则
+      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.getDataList()
+    this.getGrouplist()
+    // this.selectGroup()
+    this.getDutyclasslist()
+    this.buMen()
+    this.chuBuMen()
+  },
+  watch:{
+    gwFromList:{
+        handler(newVal){
+          console.log("newVal");
+          console.log(newVal);
+          this.searchInfo.postid=this.gwFromList.gwId.toString()
+          this.getPost(this.gwFromList.bmId)
+          this.getDataList()
+      },
+      deep: true
+    },
+    gwId(){
+      console.log("bmid变化")
+      console.log(this.gwId)
+      // const list = []
+      // list.push(this.gwId)
+      this.searchInfo.postid=this.gwId.toString()
+      this.getDataList()
+    },
+    tableData() {
+      this.$nextTick(() => {
+        this.spanArr=[],
+        this.pos='',
+        this.spanArr1=[],
+        this.pos1='',
+        //此时就可以获取到在created赋值后的dataList了
+        this.getSpanArr(this.tableData);
+        this.getSpanArr1(this.tableData);
+      });
+    },
+  },
+  methods: {
+    // 选中部门
+    async selectDepartment(val){
+      const from = {
+          group: this.form.group.toString(), //集团
+          deaprtid: val.toString() //部门
+        }
+      const res = await getactivationplanversion(from)  
+      this.banben=res.data[0].key
+      console.log(this.banben)
+    },
+    // 新增时批量添加
+    batch(){
+      // 年
+      if (this.form.cycle==1) {
+        this.nian.forEach(element => {
+          element.zeroprize=this.lingJiang
+          element.allprize=this.quanJiang
+          element.capping=this.fengDing
+        })
+      }
+      // 季度
+      if (this.form.cycle==2) {
+        this.jidu.forEach(element => {
+          element.zeroprize=this.lingJiang
+          element.allprize=this.quanJiang
+          element.capping=this.fengDing
+        })
+      }
+      // 月
+      if (this.form.cycle==3) {
+        this.yue.forEach(element => {
+          element.zeroprize=this.lingJiang
+          element.allprize=this.quanJiang
+          element.capping=this.fengDing
+        })
+      }
+    },
+    // 修改时批量操作
+    xiuBatch(){
+      console.log(this.jiangList)
+        this.jiangzhiList.forEach(element => {
+          element.zeroprize=this.lingJiang
+          element.allprize=this.quanJiang
+          element.cappingval=this.fengDing
+       })
+    },
+    // 获取公司
+    async getGrouplist(){
+      const idFrom = {
+        id:1
+      }
+      const res = await getgroupdepartmap(idFrom)
+      this.companyList=res.data
+
+    },
+    // 选中的公司值
+    async selectGroup(val){
+      if (val!='') {
+      const departmentFrom={
+        id:parseInt(val)
+      }
+      const res = await departmentlist(departmentFrom)
+      this.departmentList=res.data
+      }
+      
+    },
+    // 获取部门
+    async buMen(){
+      // const departmentFrom={
+      //   outid:this.searchInfo.groupid
+      // }
+      const departmentFrom={
+        // id:2
+        level:3
+      }
+      const res = await departmentlist(departmentFrom)
+      this.buMenList=res.data
+      // const res = await departmentlist(departmentFrom)
+      // this.buMenList=res.data
+      
+    },
+    // 初始获取部门
+    async chuBuMen(){
+      // const departmentFrom={
+      //   outid:this.searchInfo.groupid
+      // }
+      const departmentFrom={
+        id:309
+        // level:3
+      }
+      const res = await departmentlist(departmentFrom)
+      this.chuBuMenList=res.data
+      // const res = await departmentlist(departmentFrom)
+      // this.buMenList=res.data
+      
+    },
+    // 奖值
+    async showJiangZhi(row){
+      const from = {
+        // groupid: row.group.toString(), //集团
+        departmentid: row.departmentid.toString(), //部门
+        dimension: row.dimensionid, //维度
+        target: row.target.toString(), //指标
+        year: row.year, //年度
+        }
+        const res = await lookposttiveconfig(from)
+        this.jiangList=res.data
+        this.jiangList.forEach(item=>{
+            item.id=item.id.toString()
+          })
+        this.jiangZhiDialog=true
+        console.log("showJiang")
+        console.log(res)
+    },
+    // 奖值
+    async showJiang(row){
+      const from = {
+        // groupid: row.group.toString(), //集团
+        departmentid: row.departmentid.toString(), //部门
+        dimension: row.dimensionid, //维度
+        target: row.target.toString(), //指标
+        year: row.year, //年度
+        }
+        const res = await lookposttiveconfig(from)
+        this.jiangzhiList=res.data
+        this.jiangzhiList.forEach(item=>{
+            item.id=item.id.toString()
+          })
+        this.jiangZhiDialogFormVisible=true
+        console.log("showJiang")
+        console.log(res)
+    },
+    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].departmentid === data[i - 1].departmentid) {
+            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].time === data[i - 1].time) {
+            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) {
+        const _row = this.spanArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          // [0,0] 表示这一行不显示， [2,1]表示行的合并数
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+      if (columnIndex === 1||2||3||4) {
+        const _row = this.spanArr1[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          // [0,0] 表示这一行不显示， [2,1]表示行的合并数
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
+    // 选中周期
+    selectZhou(val){
+      if (val==1) {
+        this.jiangZhi=1
+      }
+      if (val==2) {
+        this.jiangZhi=1
+      }
+      if (val==3) {
+        this.jiangZhi=1
+      }
+    },
+    // 选中纬度后展示对应指标
+    async shouZhi(val){
+       const methodData={
+        type: 2, //1：定性考核；2：定量考核
+        departmentsPost: this.gwFromList.gwId.toString(), //被考核部门
+        dimension: this.form.dimension, //维度
+      }
+      const res = await posttargetlist(methodData)
+      if (res.code==0) {
+        this.zhibiaoList=res.data.list
+      }
+    },
+    // 获取考核纬度列表
+    async getDutyclasslist(){
+       const res = await dutyclasslist(this.dutyClassFrom)
+       this.dutyclasslist=res.data.list
+    },
+    //  // 选中的公司值
+    // async selectGroup(){
+    //   const departmentFrom={
+    //     id:3
+    //   }
+    //   const res = await departmentlist(departmentFrom)
+    //   this.departmentList=res.data
+    // },
+    // 选中部门后显示纬度卡片
+    async shouWei(val){
+      const methodData={
+        type: 2, //1：定性考核；2：定量考核
+        group: row.group, //归属集团
+        departmentid: row.parentid, //被考核部门
+        dimension: row.dimension, //维度
+        target: row.target, //考核指标
+        versionnumber: this.banben, //版本号
+      }
+      const res = await departmenttasklist(methodData)
+      if (res.code==0) {
+        this.methodList=res.data
+        this.methodShow=true
+      }
+    },
+    // 删除操作
+    //删除操作
+    async deleteOperate(row) {
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async() => {
+          const from = {
+        // groupid: row.group.toString(), //集团
+        departmentid: row.departmentid.toString(), //部门
+        dimension: row.dimensionid, //维度
+        target: row.target.toString(), //指标
+        year: row.year, //年度
+        }
+        const res = await lookposttiveconfig(from)
+        this.deleFrom = []
+        if (res.code===0) {
+          console.log(res)
+           res.data.forEach(element=>{
+             element.id=element.id.toString()
+             this.deleFrom.push(element.id)
+             console.log(this.deleFrom)
+           })
+            console.log(this.deleFrom)
+            // this.deleFrom=this.deleFrom.split(',');
+          const respon = await del_quantitative_config(this.deleFrom)
+          if (respon.code === 0) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+            
+             this.getDataList()
+          }
+        }
+          
+        })
+    },
+    // 新增按钮
+    showAdd(){
+      this.dialogFormVisible=true;
+    },
+    // 编辑按钮
+    async showEdit(row){
+      this.editFrom.outid=row.outId
+      const res = await getdutyclassinfo(this.editFrom)
+      this.editAdd = res.data
+      this.editDialogFormVisible=true;
+
+    },
+    // 开关状态监听
+   async changeVal(val,id){
+       console.log(val)
+      this.switchFrom.outid=id
+      if (val==1) {
+        this.switchFrom.state=1;
+        const res = await statedutyclass(this.switchFrom)
+                if (res.code === 0) {
+                  this.$message({
+                    type: 'success',
+                    message: '修改状态成功',
+                    showClose: true
+                  })
+                  this.getDataList()
+                }
+      } else {
+        this.switchFrom.state=2;
+        const res = await statedutyclass(this.switchFrom)
+                if (res.code === 0) {
+                  this.$message({
+                    type: 'success',
+                    message: '修改状态成功',
+                    showClose: true
+                  })
+                  this.getDataList()
+                }
+      }
+    },
+    // 重置搜索条件
+    onReset() {
+      this.searchInfo = {
+        groupid:"309",
+      }
+    },
+    // 条件搜索
+    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) {
+          if (this.form.cycle==1) {
+            this.form.cycleadded=this.nian
+          }
+          if (this.form.cycle==2) {
+            this.form.cycleadded=this.jidu
+          }
+          if (this.form.cycle==3) {
+            this.form.cycleadded=this.yue
+          }
+          this.form.cycleadded.forEach(element =>{
+            element.allprize=Number(element.allprize)
+            element.zeroprize=Number(element.zeroprize)
+            element.capping=Number(element.capping)
+          })
+          // const list = []
+          // list.push(this.gwId.toString())
+          // this.form.group=parseInt(this.form.group)
+          this.form.target=this.form.target.toString()
+          this.form.group="309"
+          this.form.department=this.gwFromList.bmId.toString()
+          this.form.postid=this.gwFromList.gwId.toString()
+          const res = await set_evaluation_objectives(this.form)
+          if (res.code === 0) {
+            this.$message({
+              type: 'success',
+              message: '添加成功',
+              showClose: true
+            })
+          }
+          this.form.group=this.form.group.toString()
+          this.nian = this.$options.data().nian
+          this.jidu = this.$options.data().jidu
+          this.yue = this.$options.data().yue
+          this.lingJiang = this.$options.data().lingJiang
+          this.quanJiang = this.$options.data().quanJiang
+          this.fengDing = this.$options.data().fengDing
+          this.getDataList();
+          this.closeDialog();
+        }
+      })
+    },
+
+    // 编辑提交按钮
+    async editEnterDialog(){
+          this.jiangzhiList.forEach(ele=>{
+            ele.capping=ele.cappingval
+          })
+       
+          const res = await eite_quantitative_config(this.jiangzhiList)
+          if (res.code === 0) {
+                  this.$message({
+                    type: 'success',
+                    message: '编辑成功',
+                    showClose: true
+                  })
+                }
+          this.getDataList();
+          this.jiangZhiDialogFormVisible=false
+          this.lingJiang = this.$options.data().lingJiang
+          this.quanJiang = this.$options.data().quanJiang
+          this.fengDing = this.$options.data().fengDing
+      
+    },
+    // 添加框关闭
+    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() {
+      // this.searchInfo.groupid="309"
+      this.searchInfo.postid=this.gwFromList.gwId.toString()
+      const res = await post_config_list(this.searchInfo)
+      this.tableData = res.data
+      // this.searchInfo = {
+      //   groupid:"2",
+      //   departmentid:''
+      // }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dashboard {
+  &-container {
+    margin: 30px;
+  }
+  &-text {
+    font-size: 30px;
+    line-height: 46px;
+  }
+}
+</style>
diff --git a/src/views/basicInfo/project.vue b/src/views/basicInfo/project.vue
index 83cd346..285666c 100644
--- a/src/views/basicInfo/project.vue
+++ b/src/views/basicInfo/project.vue
@@ -119,6 +119,12 @@
         </el-table-column>
         <el-table-column label="操作" width="200">
           <template #default="scope">
+            <el-button
+              icon="el-icon-edit"
+              size="small"
+              type="text"
+              @click="showPost(scope.row)"
+            >关联岗位</el-button>
             <el-button
               icon="el-icon-edit"
               size="small"
@@ -282,24 +288,117 @@
           </div>
         </template>
       </el-dialog>
+      <!-- 关联岗位弹框 -->
+      <el-dialog :close-on-click-modal="false" :visible.sync="gwShow" :before-close="addCloseDialog" title="关联岗位" width="40%">
+        <el-form ref="editForm" :model="editAdd" :rules="editRules" label-width="150px">
+          <el-form-item
+            v-for="(iteam, index) in orglist"
+            label="部门"
+            :key="index"
+          >
+          <el-cascader @change="changeBm(index,iteam.id)" filterable clearable v-model="iteam.id" :options="grouplist" :show-all-levels="false" :props="props1" ></el-cascader>
+            <el-button @click.prevent="removeBumen(index)">删除</el-button>
+            <el-table
+            :data="iteam.child"
+            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.childCopy"
+                      :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(index)" type="primary" icon="el-icon-plus" circle size="mini"></el-button>
+                  <el-button
+                      icon="el-icon-delete"
+                      size="small"
+                      type="text"
+                      @click="deleteAddXiList(index,scope)"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+          </el-table>
+          </el-form-item>
+          <el-button @click="addBumen">新增部门</el-button>
+        </el-form>
+        <template #footer>
+          <div class="dialog-footer"> 
+            
+            <el-button size="small" type="primary" @click="associationPost">确 定</el-button>
+          </div>
+        </template>
+      </el-dialog>
   </div>
 </template>
 
 <script>
+import {  positionlist } from "@/api/personnel/post";
 import { dutyclasslist } from '@/api/duty/dimension'
-import { add_department_target,get_one_terget_info } from '@/api/duty/projectNew'
+import { add_department_target,get_one_terget_info,deparment_target_about_post } from '@/api/duty/projectNew'
 import { gettarget,addtarget,gettargetinfo,eiteassessinfo,eitetarget,deltarget } from '@/api/duty/project'
 import {
   getgroupdepartmap,
   getgroupuser
 } from '@/api/duty/group'
+import { tsThisType } from "@babel/types";
 export default {
   name: 'Dashboard',
   props:['bmId'],
   data() {
     return {
+      orglist:[
+        {
+          // 岗位id
+          id:'',
+          // 多人员列表
+          child:[
+            {
+              // 岗位id
+              id:'',
+              // 多人员列表
+              child:[],
+              childCopy:[]
+            }
+          ]
+        },
+      ],
       grouplistBackup:[],
       grouplist:[],
+      gwShow:false,
       // 1：班；2：天；3：周；4：月；5：季度；6：年
         options: [
         //   {
@@ -330,6 +429,13 @@ export default {
         emitPath:false,
         multiple: true
       },
+      props1: {
+        checkStrictly: true,
+        value: "id",
+        label: "name",
+        children: "children",
+        emitPath:false,
+      },
       userProps: {
         value: "key",
         label: "name",
@@ -348,6 +454,7 @@ export default {
       switchFrom:{},
       // 删除数据提交
       deleFrom:{},
+      postList:[],
       // 编辑时数据
       editAdd:{
           unittitle:'',
@@ -360,6 +467,7 @@ export default {
         cycleattr:1,
         scoringmethod:1
       },
+      gwShow:false,
       // 弹窗变量
       dialogFormVisible:false,
       // 修改弹窗
@@ -424,6 +532,86 @@ export default {
     },
   },
   methods: {
+    // 关联岗位
+    async associationPost(){
+      
+      this.orglist.forEach(ele=>{
+        ele.child.forEach(item=>{
+          ele.id=ele.id.toString()
+          item.childCopy.forEach(it=>{
+            item.child.push({id:it,child:[]})
+          })
+         
+        })
+      })
+      console.log(this.orglist)
+      const from = {
+        id:this.projectId,
+        orglist:this.orglist
+      }
+
+      const res = await deparment_target_about_post(from);
+      this.gwShow=false
+    },
+    // 添加岗位人员数据
+    jiaArrAddXi(index){
+      console.log("indexJia"+index)
+      console.log(this.orglist[index])
+      this.orglist[index].child.push({
+        // 岗位id
+        id:'',
+        // 多人员列表
+        child:[],
+        childCopy:[]
+      })
+    },
+    // 删除岗位人员数据
+    deleteAddXiList(index,row){
+      this.orglist[index].childCopy.splice(row.$index,1);
+    },
+    // 点击部门触发
+    changeBm(index,id){
+      console.log("index"+index+','+"id"+id)
+      this.getPost(id)
+    },
+    // 获取岗位
+    async getPost(val) {
+      const from = {
+        organization: val.toString(),
+        page: 1,
+        pagesize: 1000000,
+      };
+      const res = await positionlist(from);
+      this.postList = res.data.list;
+    },
+    // 删除部门
+    removeBumen(index){
+      console.log("index")
+      console.log(index)
+      this.orglist.splice(index,1);
+    },
+    // 新增部门
+    addBumen(){
+      this.orglist.push({
+          // 岗位id
+          id:'',
+          // 多人员列表
+          child:[
+            {
+              // 岗位id
+              id:'',
+              // 多人员列表
+              child:[],
+              childCopy:[]
+            }
+          ]
+        })
+    },
+    // 显示关联岗位弹窗
+    showPost(row){
+      this.projectId=row.outid
+      this.gwShow=true
+    },
     // 获取员工列表
     async getSystemadminlist(){
       const from = {
@@ -629,6 +817,26 @@ export default {
       this.editInitForm()
       this.editDialogFormVisible = false
     },
+    // 修改框关闭
+    addCloseDialog() {
+      this.orglist=[
+        {
+          // 岗位id
+          id:'',
+          // 多人员列表
+          child:[
+            {
+              // 岗位id
+              id:'',
+              // 多人员列表
+              childCopy:[],
+              child:[]
+            }
+          ]
+        },
+      ]
+      this.gwShow = false
+    },
     // 添加重置表单
     initForm() {
       console.log("initForm")
diff --git a/src/views/basicInfo/projectBase.vue b/src/views/basicInfo/projectBase.vue
index 8584553..8e47ae4 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 :gwFromList="gwFromList"></gwProject>
+            <gwProject :gwFromList="gwFromList" :gwId="gwId"></gwProject>
           </div>
           <div v-if="tableBMShow">
             <project :bmId="bmId"></project>
@@ -154,7 +154,7 @@ export default {
   methods: {
     // 点击岗位列表
     NodePostClick(val) {
-      this.gwId=val.id
+        this.gwId=val.id
         this.gwFromList.gwId=val.id
         this.tableGWShow=true
         this.tableBMShow=false
diff --git a/src/views/basicInfo/target.vue b/src/views/basicInfo/target.vue
index 694d878..d21fa43 100644
--- a/src/views/basicInfo/target.vue
+++ b/src/views/basicInfo/target.vue
@@ -755,6 +755,14 @@ export default {
     this.chuBuMen()
   },
   watch:{
+    bmId(){
+      console.log("bmid变化")
+      console.log(this.bmId)
+      const list = []
+      list.push(this.bmId)
+      this.searchInfo.relevantdepartments=list
+      this.getDataList()
+    },
     tableData() {
       this.$nextTick(() => {
         this.spanArr=[],
diff --git a/src/views/basicInfo/targetBase.vue b/src/views/basicInfo/targetBase.vue
new file mode 100644
index 0000000..75a3190
--- /dev/null
+++ b/src/views/basicInfo/targetBase.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: 750px"
+        >
+          <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: 750px"
+        >
+          <el-tree
+            :data="postList"
+            :props="defaultProps1"
+            @node-click="NodePostClick"
+          ></el-tree>
+        </el-aside>
+        <!-- 右侧内容 -->
+        <el-main style="padding: 10px">
+          <div v-if="tableGWShow">
+            <gwTarget :gwFromList="gwFromList" :gwId="gwId"></gwTarget>
+          </div>
+          <div v-if="tableBMShow">
+            <target :bmId="bmId"></target>
+          </div>
+        </el-main>
+      </el-container>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+import { govthree, positionlist } from "@/api/personnel/post";
+import { dutyclasslist } from "@/api/duty/dimension";
+import target from "@/views/basicInfo/target.vue";
+import gwTarget from "@/views/basicInfo/gwTarget.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: {
+    target,
+    gwTarget
+  },
+  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) {
+      console.log(val)
+        this.gwId=val.id
+        this.gwFromList.gwId=val.id
+        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);
+      console.log('bumen ')
+      this.bmId=val.id
+      this.gwFromList.bmId=val.id
+      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>
diff --git a/src/views/permission/permissionSetting.vue b/src/views/permission/permissionSetting.vue
index d58031a..a5004d9 100644
--- a/src/views/permission/permissionSetting.vue
+++ b/src/views/permission/permissionSetting.vue
@@ -15,6 +15,7 @@
               :data="data"
               :props="defaultProps"
               default-expand-all
+
               @node-click="treeClick"
               :filter-node-method="filterNode"
               ref="tree">
@@ -23,6 +24,7 @@
           
         </el-aside>
         <!-- 右侧内容 -->
+        <el-button size="mini" type="primary" icon="el-icon-plus" @click="showAdd()">新增</el-button>
         <el-main style="padding:10px">
           <div style="">
             <div style="width: 180px;float: left;">
@@ -83,12 +85,33 @@
           </div>
         </el-main>
     </el-container>
+    <!-- 新增弹框 -->
+    <el-dialog :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增应用系统" width="20%">
+      <el-form ref="addForm" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="名称" prop="title">
+          <el-input v-model="form.name" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="别名" prop="title">
+          <el-input v-model="form.coder" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model.number="form.sort" autocomplete="off" />
+        </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>
   </div>
 </template>
 
 <script>
 const cityOptions = ['暂存', '提交', '打印', '删除'];
 import { dutieslist,positionlist } from '@/api/personnel/post'
+import { add_system } from '@/api/duty/quanXian'
 import { dutyclasslist,statedutyclass,eitedutyclassinfo,getdutyclassinfo,adddutyclass } from '@/api/duty/dimension'
 export default {
   name: 'Dashboard',
@@ -166,7 +189,28 @@ export default {
     this.getPositionlistList()
   },
   methods: {
-    
+    // 点击添加按钮
+    showAdd(){
+      this.dialogFormVisible=true;
+    },
+    // 添加框关闭
+    closeDialog() {
+      this.dialogFormVisible = false
+    },
+    // 提交按钮
+    async enterDialog(){
+      const res = await add_system(this.form)
+      if (res.code === 0) {
+              this.$message({
+                type: 'success',
+                message: '添加成功',
+                showClose: true
+              })
+            }
+      this.getDataList();
+      this.closeDialog();
+        
+    },
     // 点击左侧树回调函数
     treeClick(val){
       console.log("val")
@@ -198,6 +242,7 @@ export default {
     },
     // 获取岗位列表数据
     async getPositionlistList() {
+
       const searchInfo = {
         page: 1, //分页页码，数字类型
         pagesize: 1000000, //每页显示多少条数据
diff --git a/src/views/permission/xiTong.vue b/src/views/permission/xiTong.vue
new file mode 100644
index 0000000..11c8fa7
--- /dev/null
+++ b/src/views/permission/xiTong.vue
@@ -0,0 +1,335 @@
+<template>
+    <!-- 系统录入 -->
+      <div class="dashboard-container">
+        <div class="gva-search-box">
+          <el-form ref="searchForm" :inline="true" :model="searchInfo">
+            <el-form-item label="考核维度名称">
+              <el-input
+                placeholder="请输入名称"
+                v-model="searchInfo.title"
+                clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="考核维度状态">
+              <el-select v-model="searchInfo.state" clearable placeholder="请选择状态">
+                <el-option :value=1 label="正常">正常</el-option>
+                <el-option :value=2 label="禁止">禁止</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-plus" @click="showAdd()">新增</el-button>
+          </div>
+          <el-table :data="tableData">
+            <el-table-column align="left" label="考核维度ID" prop="outId"/>
+            <el-table-column align="left" label="考核维度名称" prop="title"/>
+            <el-table-column align="left" label="排序" prop="sort"/>
+            <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.outId)"
+                        />
+                 </template>
+            </el-table-column>
+            <el-table-column align="left" fixed="right" label="操作" width="200">
+              <template #default="scope">
+                <el-button
+                  icon="el-icon-edit"
+                  size="small"
+                  type="text"
+                  @click="showEdit(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>
+          <div class="gva-pagination">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 30, 50, 100]"
+              :page-size="searchInfo.pagesize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+            </el-pagination>
+            </div>
+          </div>
+          <!-- 新增弹框 -->
+          <el-dialog :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增" width="20%">
+            <el-form ref="addForm" :model="form" :rules="rules" label-width="150px">
+              <el-form-item label="考核维度名称" prop="title">
+                <el-input v-model="form.title" autocomplete="off" />
+              </el-form-item>
+              <el-form-item label="排序" prop="sort">
+                <el-input v-model.number="form.sort" autocomplete="off" />
+              </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="editDialogFormVisible" :before-close="editCloseDialog" title="修改" width="20%">
+            <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="sort">
+                <el-input v-model.number="editAdd.sort" autocomplete="off" />
+              </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>
+      </div>
+    </template>
+    
+    <script>
+    import { dutyclasslist,statedutyclass,eitedutyclassinfo,getdutyclassinfo,adddutyclass } from '@/api/duty/dimension'
+    export default {
+      name: 'Dashboard',
+      data() {
+        return {
+          // 查询详情的数据
+          editFrom:{},
+          // 修改状态提交数据
+          switchFrom:{},
+          // 删除数据提交
+          deleFrom:{},
+          // 编辑时数据
+          editAdd:{},
+          assessList:{},
+          // 添加数据
+          form:{},
+          // 弹窗变量
+          dialogFormVisible:false,
+          // 修改弹窗
+          editDialogFormVisible:false,
+          total: 0,
+          tableData:[],
+          // 条件查询变量
+          searchInfo: {
+            page: 1,
+            pagesize: 10
+          },
+          // 条件查询变量
+          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=='') {
+          console.log("跳转login")
+          this.$router.push('/login')
+        }
+        // 页面渲染时获取初始数据
+        this.getDataList()
+      },
+      methods: {
+        // 删除操作
+        //删除操作
+        async deleteOperate(row) {
+          this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+            .then(async() => {
+              this.deleFrom.state=3;
+              this.deleFrom.outid=row.outId;
+              const res = await statedutyclass(this.deleFrom)
+              if (res.code === 0) {
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+                
+                 this.getDataList()
+              }
+            })
+        },
+        // 新增按钮
+        showAdd(){
+          this.dialogFormVisible=true;
+          console.log(this.dialogFormVisible)
+        },
+        // 编辑按钮
+        async showEdit(row){
+          this.editFrom.outid=row.outId
+          const res = await getdutyclassinfo(this.editFrom)
+          this.editAdd = res.data
+          this.editDialogFormVisible=true;
+    
+        },
+        // 开关状态监听
+       async changeVal(val,id){
+           console.log(val)
+          this.switchFrom.outid=id
+          if (val==1) {
+            this.switchFrom.state=1;
+            const res = await statedutyclass(this.switchFrom)
+                    if (res.code === 0) {
+                      this.$message({
+                        type: 'success',
+                        message: '修改状态成功',
+                        showClose: true
+                      })
+                      this.getDataList()
+                    }
+          } else {
+            this.switchFrom.state=2;
+            const res = await statedutyclass(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) {
+              const res = await adddutyclass(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 eitedutyclassinfo(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() {
+          const res = await dutyclasslist(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