-
@@ -45,6 +45,7 @@ export default {
return this.$store.state.app.device
},
fixedHeader() {
+ // console.log("AppMain----------------------?",this.$store.state.settings.fixedHeader)
return this.$store.state.settings.fixedHeader
},
classObj() {
@@ -58,6 +59,7 @@ export default {
},
methods: {
handleClickOutside() {
+
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
}
}
@@ -104,4 +106,8 @@ export default {
.mobile .fixed-header {
width: 100%;
}
+ .rightBootempHeight{
+
+ height:100%
+ }
diff --git a/src/router/index.js b/src/router/index.js
index ba1c224..0b7281f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -258,8 +258,27 @@ export const constantRoutes = [
component: () => import('@/views/basicInfo/targetBase'),
meta: { title: '考核目标'}
},
+ {
+ path: 'targetbasic',
+ component: () => import('@/views/basicCont/targetLayout'),
+ meta: { title: '考核指标'}
+ },
],
},
+ //基础信息（新版）
+ {
+ path: '/basicCont',
+ component: Layout,
+ children: [
+ // 当 /user/:id 匹配成功
+ // UserHome 将被渲染到 User 的
内部
+ {
+ path: 'targetbasic',
+ component: () => import('@/views/basicCont/targetLayout'),
+ meta: { title: '考核指标'}
+ },
+ ]
+ },
// {
// path: '/',
// component: Layout,
@@ -424,6 +443,33 @@ export const constantRoutes = [
// meta: { title: '考核记录详情'}
}]
},
+ //权限管理
+ {
+ path: '/purview',
+ component: Layout,
+ children: [
+ // 当 /user/:id 匹配成功
+ // UserHome 将被渲染到 User 的 内部
+ {
+ path: 'postpower',
+ component: () => import('@/views/purview/postpower'),
+ meta: { title: '行政组织配权'}
+ },
+
+
+ ],
+ },
+
+
+
+
+
+
+
+
+
+
+
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }
diff --git a/src/views/assessmentProgram/departmentBase.vue b/src/views/assessmentProgram/departmentBase.vue
index 40abd21..c60e439 100644
--- a/src/views/assessmentProgram/departmentBase.vue
+++ b/src/views/assessmentProgram/departmentBase.vue
@@ -200,7 +200,8 @@
// 获取行政组织二级树
async getGovthree2() {
const res = await govthree();
- this.GovthreeList2 = res.data[0].child;
+ // this.GovthreeList2 = res.data[0].child;
+ this.GovthreeList2 = res.data
console.log("this.GovthreeList2");
console.log(res.data[0].child);
},
diff --git a/src/views/assessmentProgram/departmentalAssessment.vue b/src/views/assessmentProgram/departmentalAssessment.vue
index 215d3b1..dad2813 100644
--- a/src/views/assessmentProgram/departmentalAssessment.vue
+++ b/src/views/assessmentProgram/departmentalAssessment.vue
@@ -933,8 +933,13 @@ export default {
},
// 获取行政组织二级树
async getGovthree2(){
- const res = await govthree()
- this.GovthreeList2 = res.data[0].child
+ var dataJson = {
+ id:309,
+ all:1
+ }
+ const res = await govthree(dataJson)
+ // this.GovthreeList2 = res.data[0].child
+ this.GovthreeList2 = res.data
console.log("this.GovthreeList2")
console.log(res.data[0].child)
},
diff --git a/src/views/assessmentProgram/gwDepartmentalAssessment.vue b/src/views/assessmentProgram/gwDepartmentalAssessment.vue
index 32944ab..d216059 100644
--- a/src/views/assessmentProgram/gwDepartmentalAssessment.vue
+++ b/src/views/assessmentProgram/gwDepartmentalAssessment.vue
@@ -1128,7 +1128,8 @@
// 获取行政组织二级树
async getGovthree2(){
const res = await govthree()
- this.GovthreeList2 = res.data[0].child
+ // this.GovthreeList2 = res.data[0].child
+ this.GovthreeList2 = res.data
console.log("this.GovthreeList2")
console.log(res.data[0].child)
},
diff --git a/src/views/assessmentProgram/qualitativeIndicators.vue b/src/views/assessmentProgram/qualitativeIndicators.vue
index 7e1ceaf..34994db 100644
--- a/src/views/assessmentProgram/qualitativeIndicators.vue
+++ b/src/views/assessmentProgram/qualitativeIndicators.vue
@@ -921,7 +921,7 @@ import {
departmenttargetlist,getdepartabouttarget,gettargetreport,shiyan,getdepartmenttragetcontlist,basistargetdearpetmentgetpost,basistaegetdeparmentreport,
delsontarget,basissontargetadddetailed,del_one_detailed_target,
getsontargetcont,editsontargetdepartmentreport,getonedetailedtarget,
- get_one_terget_info,edit_one_target
+ get_one_terget_info,edit_one_target,addsuntargetdetailed
} from '@/api/duty/projectNew'
import {
grouplist,
diff --git a/src/views/assessmentProgram/qualitativeIndicatorsBase.vue b/src/views/assessmentProgram/qualitativeIndicatorsBase.vue
index fed4e7e..b075049 100644
--- a/src/views/assessmentProgram/qualitativeIndicatorsBase.vue
+++ b/src/views/assessmentProgram/qualitativeIndicatorsBase.vue
@@ -200,7 +200,8 @@ export default {
// 获取行政组织二级树
async getGovthree2() {
const res = await govthree();
- this.GovthreeList2 = res.data[0].child;
+ // this.GovthreeList2 = res.data[0].child;
+ this.GovthreeList2 = res.data
console.log("this.GovthreeList2");
console.log(res.data[0].child);
},
diff --git a/src/views/basicCont/departTarget.vue b/src/views/basicCont/departTarget.vue
new file mode 100644
index 0000000..104bdb9
--- /dev/null
+++ b/src/views/basicCont/departTarget.vue
@@ -0,0 +1,796 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+ 定性指标
+ 定量指标
+
+
+
+
+
+
+ 班
+ 天
+ 周
+ 月
+ 季度
+ 年
+
+
+
+
+ 自动计分
+ 手动计分
+
+
+
+
+
+
+
+ {{iteam.title}}
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
+
+ 关联岗位
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增部门
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/basicInfo/gwProject copy.vue b/src/views/basicInfo/gwProject copy.vue
index f13661f..5557b6d 100644
--- a/src/views/basicInfo/gwProject copy.vue
+++ b/src/views/basicInfo/gwProject copy.vue
@@ -635,7 +635,8 @@ export default {
// 获取行政组织二级树
async getGovthree2() {
const res = await govthree();
- this.GovthreeList2 = res.data[0].child;
+ // this.GovthreeList2 = res.data[0].child;
+ this.GovthreeList2 = res.data
console.log("this.GovthreeList2");
console.log(res.data[0].child);
},
diff --git a/src/views/basicInfo/gwProject.vue b/src/views/basicInfo/gwProject.vue
index d76975f..93ef393 100644
--- a/src/views/basicInfo/gwProject.vue
+++ b/src/views/basicInfo/gwProject.vue
@@ -475,6 +475,7 @@
import { govthree, positionlist } from "@/api/personnel/post";
import { dutyclasslist } from "@/api/duty/dimension";
import project from "@/views/basicInfo/project.vue";
+import department from "@/views/basicCont/departTarget.vue";
import {
posttargetlist,
addtarget,
@@ -492,6 +493,7 @@ import { get_post_target } from '@/api/duty/projectNew'
export default {
components: {
project,
+ department
},
name: "Dashboard",
props:['gwId','gwFromList'],
@@ -738,7 +740,8 @@ export default {
// 获取行政组织二级树
async getGovthree2() {
const res = await govthree();
- this.GovthreeList2 = res.data[0].child;
+ // this.GovthreeList2 = res.data[0].child;
+ this.GovthreeList2 = res.data
console.log("this.GovthreeList2");
console.log(res.data[0].child);
},
diff --git a/src/views/basicInfo/project.vue b/src/views/basicInfo/project.vue
index 285666c..3c7d3e9 100644
--- a/src/views/basicInfo/project.vue
+++ b/src/views/basicInfo/project.vue
@@ -258,7 +258,7 @@
-
+
@@ -290,7 +290,7 @@
-
+
")
},
// 获取部门
async getGrouplist(){
@@ -769,8 +769,12 @@ export default {
// 编辑提交按钮
async editEnterDialog(){
+ console.log("修改数据表单----》",this.editAdd)
this.$refs.editForm.validate(async valid => {
+ console.log("修改数据表单---1-》",this.editAdd)
+ console.log("修改数据表单---2-》",valid)
if (valid) {
+ console.log("修改数据表单---3-》",valid)
if(this.editAdd.relevantdepartmentsmap!=null){
this.editAdd.relevantdepartments=this.editAdd.relevantdepartmentsmap.map(String)
}
diff --git a/src/views/basicInfo/projectBase.vue b/src/views/basicInfo/projectBase.vue
index 8e47ae4..c639e58 100644
--- a/src/views/basicInfo/projectBase.vue
+++ b/src/views/basicInfo/projectBase.vue
@@ -8,7 +8,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{sysItem.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定授权
+
+
+
+
+
+
+
+
\ No newline at end of file