diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index de85459..aa04adb 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -6,13 +6,26 @@
const install = (Vue, vm) => {
// 请求拦截部分，如配置，每次请求前都会执行
Vue.prototype.$u.http.interceptor.request = (config) => {
- config.header['user-token'] = vm.$store.state.userToken
- config.header['user-key'] = vm.$store.state.userKey
- config.header.Token = 'xxxxxx';
+ if(vm.$store.state.apiPass==2){
+ // alert("1")
+ alert(sessionStorage.getItem('userToken'))
+ alert(sessionStorage.getItem('userKey'))
+ // console.log(sessionStorage.getItem('key'))
+ if (vm.$store.state.userKey==''||vm.$store.state.userToken=='') {
+ window.location.href = 'https://www.hxgk.group/jumpapiurl/webindex?url=http://new.hxgk.group/sj/index.html&errorurl=http://new.hxgk.group/sj/index.htmlsj/index.html#/pages/login/login';
+ }else if(vm.$store.state.userKey==undefined||vm.$store.state.userToken==undefined){
+ window.location.href = 'https://www.hxgk.group/jumpapiurl/webindex?url=http://new.hxgk.group/sj/index.html&errorurl=http://new.hxgk.group/sj/index.htmlsj/index.html#/pages/login/login';
+ }
+ config.header['user-token']=sessionStorage.getItem('userToken')
+ config.header['user-key']=sessionStorage.getItem('userKey')
+ }else{
+ config.header['user-token'] = sessionStorage.getItem('userToken')
+ config.header['user-key'] = sessionStorage.getItem('userKey')
+ }
+
return config;
- // 如果return一个false值，则会取消本次请求
- // if(config.url == '/user/rest') return false; // 取消某次请求
+
}
// 请求拦截，配置Token等参数
// Vue.prototype.$u.http.setConfig({
@@ -37,30 +50,30 @@ const install = (Vue, vm) => {
// var userToken1 =""
// var userKey1 =""
// 内网
- var userToken1 =''
- var userKey1 =''
+ // var userToken1 =''
+ // var userKey1 =''
- setTimeout(()=>{
- // userToken1=vm.$store.state.userToken
- // userKey1=vm.$store.state.userKey
- // alert("vm.$store.state.apiPass")
- // alert(vm.$store.state.apiPass)
- if(vm.$store.state.apiPass==2){
- // alert("1")
- // alert(vm.$store.state.userToken)
- // alert(vm.$store.state.userKey)
- // console.log(sessionStorage.getItem('key'))
- // if (vm.$store.state.userKey==''||vm.$store.state.userToken=='') {
- // window.location.href = 'https://www.hxgk.group/jumpapiurl/webindex?url=http://new.hxgk.group/sj/index.html&errorurl=http://new.hxgk.group/sj/index.htmlsj/index.html#/pages/login/login';
- // }else if(vm.$store.state.userKey==undefined||vm.$store.state.userToken==undefined){
- // window.location.href = 'https://www.hxgk.group/jumpapiurl/webindex?url=http://new.hxgk.group/sj/index.html&errorurl=http://new.hxgk.group/sj/index.htmlsj/index.html#/pages/login/login';
- // }
- // userToken1=vm.$store.state.userToken
- // userKey1=vm.$store.state.userKey
- }
+ // setTimeout(()=>{
+ // // userToken1=vm.$store.state.userToken
+ // // userKey1=vm.$store.state.userKey
+ // // alert("vm.$store.state.apiPass")
+ // // alert(vm.$store.state.apiPass)
+ // if(vm.$store.state.apiPass==2){
+ // // alert("1")
+ // // alert(vm.$store.state.userToken)
+ // // alert(vm.$store.state.userKey)
+ // console.log(sessionStorage.getItem('key'))
+ // if (vm.$store.state.userKey==''||vm.$store.state.userToken=='') {
+ // window.location.href = 'https://www.hxgk.group/jumpapiurl/webindex?url=http://new.hxgk.group/sj/index.html&errorurl=http://new.hxgk.group/sj/index.htmlsj/index.html#/pages/login/login';
+ // }else if(vm.$store.state.userKey==undefined||vm.$store.state.userToken==undefined){
+ // window.location.href = 'https://www.hxgk.group/jumpapiurl/webindex?url=http://new.hxgk.group/sj/index.html&errorurl=http://new.hxgk.group/sj/index.htmlsj/index.html#/pages/login/login';
+ // }
+ // userToken1=vm.$store.state.userToken
+ // userKey1=vm.$store.state.userKey
+ // }
- },200);
+ // },200);
setTimeout(()=>{
console.log("userKey1")
console.log(userKey1)
@@ -68,15 +81,15 @@ const install = (Vue, vm) => {
// 本地
// baseUrl: 'http://hxgk.user.phone',
// 内网
- baseUrl: 'http://kpi.hxgk.net',
+ // baseUrl: 'http://kpi.hxgk.net',
// 线上
- // baseUrl: 'http://new.hxgk.group/api',
+ baseUrl: 'http://new.hxgk.group/api',
loadingText: '努力加载中~',
loadingTime: 800,
// 设置自定义头部content-type
header: {
- // 'user-token': userToken1,
- // "user-key": userKey1,
+ 'user-token': userToken1,
+ "user-key": userKey1,
// 'user-token': userToken1,
// "user-key":userKey1,
diff --git a/common/http.user.api.js b/common/http.user.api.js
index d3a0360..b263082 100644
--- a/common/http.user.api.js
+++ b/common/http.user.api.js
@@ -12,7 +12,10 @@ let User = (vm)=>{
return vm.$u.post('api/webach/mycontent', params)
},
stafflist:(params = {}) => {
- return vm.$u.post('hrapi/staff/archiveslist', params)
+ return vm.$u.post('hrapi/staff/stafflist', params)
+ },
+ positionlist:(params = {}) => {
+ return vm.$u.post('hrapi/org/positionlist', params)
}
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fc0f3bf..fa05b8f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -192,10 +192,12 @@
console.log(option)
// 线上
- // this.$store.commit('SET_USER_KEY',option.key)
- // this.$store.commit('SET_USER_TOKEN',option.token)
- // this.keyFrom.key=option.key
- // this.keyFrom.token=option.token
+ this.$store.commit('SET_USER_KEY',option.key)
+ sessionStorage.setItem('userKey',option.key);
+ sessionStorage.setItem('userToken',option.token);
+ this.$store.commit('SET_USER_TOKEN',option.token)
+ this.keyFrom.key=option.key
+ this.keyFrom.token=option.token
diff --git a/pages/login/login.vue b/pages/login/login.vue
index deacd66..f508ef3 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -175,6 +175,8 @@ export default {
that.$store.commit('SET_USER_KEY',res.data.key)
that.$store.commit('SET_USER_TOKEN',res.data.token)
console.log('vm.$store.state.userKey'+that.$store.state.userKey)
+ sessionStorage.setItem('userKey',res.data.key);
+ sessionStorage.setItem('userToken',res.data.token);
// console.log()
this.$u.route({
type:"switchTab",
diff --git a/pages/post/data.vue b/pages/post/data.vue
index c811f0a..a6fadda 100644
--- a/pages/post/data.vue
+++ b/pages/post/data.vue
@@ -35,7 +35,7 @@
@click="pickerShow = true">
-
+
@@ -184,10 +184,12 @@ export default {
},
methods:{
getData(){
-
- this.$u.api.Duty.get_ration_target_cont(this.dataId.id).then(res => {
+ const from = {
+ id:this.dataId.shemeid.toString()
+ }
+ this.$u.api.Duty.get_ration_target_cont(from).then(res => {
if(res.code==0){
- this.data=res
+ this.data=res.data
}
@@ -262,7 +264,7 @@ export default {
id: this.data.id, //考核项ID
submittime: this.form.time, //提报时间
scoringmethod: 1, //计分方式（1：自动；2：手动）
- score: this.form.actual, //实际数值*100保存
+ score: this.form.score, //实际数值*100保存
scoringscore: 0, //手动分*100保存
reason: this.form.reason, //这样操作的原因
personliable: this.dataId.key, //责任人
diff --git a/pages/post/details.vue b/pages/post/details.vue
index 2433bf0..4f8f376 100644
--- a/pages/post/details.vue
+++ b/pages/post/details.vue
@@ -37,7 +37,7 @@
{{res.moneystr}}元
- {{res.scorestr}}{{res.unity}}-{{res.moneystr}}元
+ {{res.scorestr}}{{res.unity}}/{{res.moneystr}}元
@@ -546,13 +546,14 @@ export default {
pagesize: 10000, //默认每页10条
userkey:this.urlData.key,//被考核人
dimensionid: this.urlData.dimensionid, //考核纬度
- targetid: this.projectTittleList[0].parentid, //指标
- sontargetid: this.projectTittleList[0].id //子栏目
+ targetid: this.projectTittleList[0].parentid.toString(), //指标
+ sontargetid: this.projectTittleList[0].id.toString() //子栏目
}
+ this.projectTittle=this.projectTittleList[0].title
await this.$u.api.Duty.get_post_deimenso_info(from).then(res => {
if(res.code==0){
- this.ceshiData=res.data
- this.projectTittle=res.data[0].targetsunname
+ this.ceshiData=res.data.list
+ // this.projectTittle=res.data[0].targetsunname
}
})
},
@@ -564,14 +565,15 @@ export default {
pagesize: 10000, //默认每页10条
userkey:this.urlData.key,//被考核人
dimensionid: this.urlData.dimensionid, //考核纬度
- targetid: this.projectTittleList[index].parentid, //指标
- sontargetid: this.projectTittleList[index].id //子栏目
+ targetid: this.projectTittleList[index].parentid.toString(), //指标
+ sontargetid: this.projectTittleList[index].id.toString() //子栏目
}
+ this.projectTittle=this.projectTittleList[index].title
await this.$u.api.Duty.get_post_deimenso_info(from).then(res => {
if(res.code==0){
- this.ceshiData=res.data
+ this.ceshiData=res.data.list
console.log(res.data[0].targetsunname)
- this.projectTittle=res.data[0].targetsunname
+ // this.projectTittle=res.data[0].targetsunname
console.log(this.projectTittleList1)
}
@@ -625,11 +627,11 @@ export default {
},
// 点击加分页面
goJia(data){
- this.$u.route('/pages/task/jia', data);
+ this.$u.route('/pages/post/jia', data);
},
// 点击jianfen页面
goJian(data){
- this.$u.route('/pages/task/jian', data);
+ this.$u.route('/pages/post/jian', data);
},
reachBottom() {
// 此tab为空数据
diff --git a/pages/post/index.vue b/pages/post/index.vue
index de4b645..0443e7a 100644
--- a/pages/post/index.vue
+++ b/pages/post/index.vue
@@ -2,6 +2,12 @@
+
+ 岗位
+
+
+ {{gwName}}
+
人员
@@ -52,6 +58,9 @@
+
+
+
@@ -91,6 +100,8 @@
export default {
data() {
return {
+ gwShow:false,
+ postList:[],
name:'',
dingXingData:[],
dingLiangData:[],
@@ -99,7 +110,14 @@
},
props1: {
checkStrictly: true,
- value: "keystr",
+ value: "key",
+ label: "name",
+ children: "children",
+ emitPath:false,
+ },
+ props2: {
+ checkStrictly: true,
+ value: "id",
label: "name",
children: "children",
emitPath:false,
@@ -108,56 +126,7 @@
show:0,
liangDataList:[],
bumenShow:false,
- dataList:[
- // {
- // group: 3, //集团
- // groupname: "恒信高科", //集团名称
- // department: 2, //部门ID
- // departmentname: "化产分厂", //部门名称
- // dimension: 16468024536587500, //维度ID
- // dimensionname: "高效运营", //维度名称
- // target: 6, //指标ID
- // title: "安全环保", //指标名称
- // extrapoints: 0, //总加分
- // scorereduction: 4.6 //总减分
- // },
- // {
- // group: 3, //集团
- // groupname: "恒信高科", //集团名称
- // department: 2, //部门ID
- // departmentname: "化产分厂", //部门名称
- // dimension: 16468024536587500, //维度ID
- // dimensionname: "高效运营", //维度名称
- // target: 6, //指标ID
- // title: "指标1", //指标名称
- // extrapoints: 0, //总加分
- // scorereduction: 9 //总减分
- // },
- // {
- // group: 3, //集团
- // groupname: "恒信高科", //集团名称
- // department: 2, //部门ID
- // departmentname: "化产分厂", //部门名称
- // dimension: 16468024536587500, //维度ID
- // dimensionname: "高效运营", //维度名称
- // target: 6, //指标ID
- // title: "指标2", //指标名称
- // extrapoints: 9, //总加分
- // scorereduction: 0 //总减分
- // },
- // {
- // group: 3, //集团
- // groupname: "恒信高科", //集团名称
- // department: 2, //部门ID
- // departmentname: "化产分厂", //部门名称
- // dimension: 16468024536587500, //维度ID
- // dimensionname: "高效运营", //维度名称
- // target: 6, //指标ID
- // title: "指标3", //指标名称
- // extrapoints: 4, //总加分
- // scorereduction: 5 //总减分
- // },
- ]
+ dataList:[]
}
},
onShow() {
@@ -168,22 +137,21 @@
// alert(JSON.stringify(res))
if(res.code==0){
myDeparment=res.data
- const from1 = {
- page: 1,
- pagesize: 10000,
- adminorg:myDeparment.adminorg
- // company: parseInt(myDeparment.company),
- // deparment: myDeparment.deparment.toString(),
+
+ const postFrom = {
+ page:1,
+ pagesize:100000,
+ department:myDeparment.maindeparment.toString()
}
- this.$u.api.User.stafflist(from1).
- then(res => {
+ this.$u.api.User.positionlist(postFrom).then(res => {
// alert("个人中心接口")
// alert(JSON.stringify(res))
if(res.code==0){
- this.renyuanList=res.data.list
+ this.postList=res.data.list
}
})
+
}
})
@@ -205,10 +173,31 @@
// }
},
methods: {
+ clickGw(val){
+
+ this.gwName=this.$refs["cascader1"].getCheckedNodes()[0].label
+ console.log(this.$refs["cascader1"].getCheckedNodes()[0].label)
+ console.log(val)
+ this.getPostList(val)
+ },
+ getPostList(val){
+ const from1 = {
+ page: 1,
+ pagesize: 10000,
+ position:val
+ // company: parseInt(myDeparment.company),
+ // deparment: myDeparment.deparment.toString(),
+ }
+ this.$u.api.User.stafflist(from1).then(res => {
+ if(res.code==0){
+ this.renyuanList=res.data.list
+ }
+ })
+ },
clickBu(val){
console.log(val)
this.name=this.$refs["cascader"].getCheckedNodes()[0].label
- this.searchInfo.id = val;
+ this.searchInfo.id = val.toString();
this.getDingXingData()
this.getDingLiangData()
this.bumenShow=false
@@ -219,6 +208,9 @@
if(res.code==0){
this.dingXingData=res.data
}
+ if(res.data==null){
+ this.dingXingData=[]
+ }
})
},
getDingLiangData(){
@@ -227,8 +219,14 @@
if(res.code==0){
this.dingLiangData=res.data
}
+ if(res.data==null){
+ this.dingLiangData=[]
+ }
})
},
+ openGw(){
+ this.gwShow=true
+ },
openBumen(){
this.bumenShow=true
},
diff --git a/pages/post/jia.vue b/pages/post/jia.vue
index 69a48fd..b017a98 100644
--- a/pages/post/jia.vue
+++ b/pages/post/jia.vue
@@ -3,7 +3,7 @@
- {{urlData.score}}{{urlData.company}}
+ {{urlData.scorestr}}{{urlData.unity}} {{urlData.moneystr}}元
@@ -24,7 +24,7 @@
:border="true"
type="select"
:select-open="pickerShow"
- v-model="form.time"
+ v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true">
@@ -47,7 +47,7 @@
- {{urlData.score}}{{urlData.company}}
+ {{urlData.scorestr}}{{urlData.unity}} {{urlData.moneystr}}元
@@ -68,7 +68,7 @@
:border="true"
type="select"
:select-open="pickerShow"
- v-model="form.time"
+ v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true">
@@ -119,7 +119,7 @@
:border="true"
type="select"
:select-open="pickerShow"
- v-model="form.time"
+ v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true">
@@ -147,7 +147,7 @@
-
+
@@ -188,6 +188,7 @@
export default {
data() {
return {
+ baseInfo:{},
buzhou:0,
processData:[],
selectShow:false,
@@ -325,7 +326,7 @@ export default {
submit(){
console.log("this.form")
console.log(this.form)
- this.form.id=this.baseInfo.id
+ this.form.id=this.baseInfo.id.toString()
this.form.userkey=this.baseInfo.userkey
this.form.addordecrease=1
this.form.punishmode=this.baseInfo.punishmode
@@ -354,13 +355,13 @@ export default {
},
confirm(e) {
// console.log(e);
- this.form.time = '';
- if (this.params.year) this.form.time += e.year;
- if (this.params.month) this.form.time += '-' + e.month;
- if (this.params.day) this.form.time += '-' + e.day;
- if (this.params.hour) this.form.time += ' ' + e.hour;
- if (this.params.minute) this.form.time += ':' + e.minute;
- if (this.params.second) this.form.time += ':' + e.second;
+ this.form.happentime = '';
+ if (this.params.year) this.form.happentime += e.year;
+ if (this.params.month) this.form.happentime += '-' + e.month;
+ if (this.params.day) this.form.happentime += '-' + e.day;
+ if (this.params.hour) this.form.happentime += ' ' + e.hour;
+ if (this.params.minute) this.form.happentime += ':' + e.minute;
+ if (this.params.second) this.form.happentime += ':' + e.second;
},
},
};
diff --git a/pages/post/jian.vue b/pages/post/jian.vue
index 34bba86..16c8c91 100644
--- a/pages/post/jian.vue
+++ b/pages/post/jian.vue
@@ -46,7 +46,7 @@
- {{urlData.score}}{{urlData.company}}
+ {{urlData.scorestr}}{{urlData.unity}} {{urlData.moneystr}}元
@@ -65,7 +65,7 @@
:border="true"
type="select"
:select-open="pickerShow"
- v-model="form.time"
+ v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true">
@@ -114,7 +114,7 @@
:border="true"
type="select"
:select-open="pickerShow"
- v-model="form.time"
+ v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true">
@@ -149,7 +149,7 @@
-
+
@@ -373,7 +373,7 @@ export default {
console.log(this.urlData)
console.log("this.form")
console.log(this.form)
- this.form.id=this.baseInfo.id
+ this.form.id=this.baseInfo.id.toString()
this.form.userkey=this.baseInfo.userkey
this.form.addordecrease=2
this.form.punishmode=this.baseInfo.punishmode
@@ -403,13 +403,13 @@ export default {
},
confirm(e) {
// console.log(e);
- this.form.time = '';
- if (this.params.year) this.form.time += e.year;
- if (this.params.month) this.form.time += '-' + e.month;
- if (this.params.day) this.form.time += '-' + e.day;
- if (this.params.hour) this.form.time += ' ' + e.hour;
- if (this.params.minute) this.form.time += ':' + e.minute;
- if (this.params.second) this.form.time += ':' + e.second;
+ this.form.happentime = '';
+ if (this.params.year) this.form.happentime += e.year;
+ if (this.params.month) this.form.happentime += '-' + e.month;
+ if (this.params.day) this.form.happentime += '-' + e.day;
+ if (this.params.hour) this.form.happentime += ' ' + e.hour;
+ if (this.params.minute) this.form.happentime += ':' + e.minute;
+ if (this.params.second) this.form.happentime += ':' + e.second;
},
confirm1(e) {
// console.log(e);
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index beb910d..94e490b 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -2,4 +2,4 @@
display: none;
}