Browse Source

2022.9.30

qin
renguanyu111 3 years ago
parent
commit
8a3b1eaaf3
  1. 73
      common/http.interceptor.js
  2. 5
      common/http.user.api.js
  3. 10
      pages/index/index.vue
  4. 2
      pages/login/login.vue
  5. 12
      pages/post/data.vue
  6. 24
      pages/post/details.vue
  7. 120
      pages/post/index.vue
  8. 31
      pages/post/jia.vue
  9. 26
      pages/post/jian.vue
  10. 2
      unpackage/dist/build/h5/index.html
  11. 7
      unpackage/dist/build/h5/static/js/index.833f5462.js
  12. 1
      unpackage/dist/build/h5/static/js/pages-index-index.048a090c.js
  13. 1
      unpackage/dist/build/h5/static/js/pages-login-login.dff57b2f.js
  14. 1
      unpackage/dist/build/h5/static/js/pages-post-data.fe3b458c.js
  15. 1
      unpackage/dist/build/h5/static/js/pages-post-details.04cf9749.js
  16. 1
      unpackage/dist/build/h5/static/js/pages-post-index.c194d071.js
  17. 1
      unpackage/dist/build/h5/static/js/pages-post-jia.fc8ce34e.js
  18. 1
      unpackage/dist/build/h5/static/js/pages-post-jian.62195eb6.js

73
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,

5
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)
}
}
}

10
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

2
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",

12
pages/post/data.vue

@ -35,7 +35,7 @@
@click="pickerShow = true"></u-input>
</u-form-item>
<u-form-item label="实际值" :label-position="labelPosition">
<u-input @input='inputActual' v-model="form.score" type="digit" :border="true" />
<u-input @input='inputActual' v-model.number="form.score" type="digit" :border="true" />
</u-form-item>
<u-form-item label="指标得分" :label-position="labelPosition" v-if="data.scoringmethod==1">
@ -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, //12
score: this.form.actual, //*100
score: this.form.score, //*100
scoringscore: 0, //*100
reason: this.form.reason, //
personliable: this.dataId.key, //

24
pages/post/details.vue

@ -37,7 +37,7 @@
{{res.moneystr}}
</u-col>
<u-col span="9.2" v-if="res.punishmode==3">
{{res.scorestr}}{{res.unity}}-{{res.moneystr}}
{{res.scorestr}}{{res.unity}}/{{res.moneystr}}
</u-col>
</u-row>
<u-row>
@ -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

120
pages/post/index.vue

@ -2,6 +2,12 @@
<div>
<!-- 任务列表 -->
<u-grid :col="4" :border="true">
<u-grid-item @click="openGw" style="height: 35px;">
<text class="grid-text">岗位<u-icon name="arrow-down"></u-icon></text>
</u-grid-item>
<u-grid-item @click="openGw" style="height: 35px;">
<text class="grid-text">{{gwName}}</text>
</u-grid-item>
<u-grid-item @click="openBumen" style="height: 35px;">
<text class="grid-text">人员<u-icon name="arrow-down"></u-icon></text>
</u-grid-item>
@ -52,6 +58,9 @@
<el-dialog :close-on-click-modal="false" width="100%" :visible.sync="bumenShow">
<el-cascader-panel ref="cascader" placeholder="请选择人员" filterable clearable :options="renyuanList" :show-all-levels="false" :props="props1" @change='clickBu($event)'></el-cascader-panel>
</el-dialog>
<el-dialog :close-on-click-modal="false" width="100%" :visible.sync="gwShow">
<el-cascader-panel ref="cascader1" placeholder="请选择岗位" filterable clearable :options="postList" :show-all-levels="false" :props="props2" @change='clickGw($event)'></el-cascader-panel>
</el-dialog>
<el-table :data="dingLiangData" border v-show="show==1" :cell-style="{padding:'0px'}">
<el-table-column align="center" label="指标" prop="title"/>
<el-table-column align="center" label="操作">
@ -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
},

31
pages/post/jia.vue

@ -3,7 +3,7 @@
<!-- 定分From -->
<u-form :model="form" v-if="urlData.state==1">
<u-form-item label="考核参考" :label-position="labelPosition">
{{urlData.score}}{{urlData.company}}
{{urlData.scorestr}}{{urlData.unity}} {{urlData.moneystr}}
</u-form-item>
<u-form-item label="次数" :label-position="labelPosition">
<u-input v-model="form.count" type="digit" :border="true" />
@ -24,7 +24,7 @@
:border="true"
type="select"
:select-open="pickerShow"
v-model="form.time"
v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true"></u-input>
</u-form-item>
@ -47,7 +47,7 @@
<!-- 区间分 -->
<u-form :model="form" v-if="urlData.state==2">
<u-form-item label="考核参考" :label-position="labelPosition">
{{urlData.score}}{{urlData.company}}
{{urlData.scorestr}}{{urlData.unity}} {{urlData.moneystr}}
</u-form-item>
<u-form-item label="分数" :label-position="labelPosition">
<u-input v-model="form.score" type="digit" :border="true" />
@ -68,7 +68,7 @@
:border="true"
type="select"
:select-open="pickerShow"
v-model="form.time"
v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true"></u-input>
</u-form-item>
@ -119,7 +119,7 @@
:border="true"
type="select"
:select-open="pickerShow"
v-model="form.time"
v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true"></u-input>
</u-form-item>
@ -147,7 +147,7 @@
<u-select v-model="pickerShow1" :list="range"></u-select>
<u-select mode="single-column" :list="range" v-model="selectShow" @confirm="selectConfirm"></u-select>
<u-toast ref="uToast" />
<el-card class="box-card">
<!-- <el-card class="box-card">
<el-steps direction="vertical" :active="buzhou">
<el-step v-for="(item,index) in processData" :key="index" :title="item.nodename" icon="el-icon-circle-check" >
<template slot="description">
@ -178,7 +178,7 @@
</el-step>
</el-steps>
</el-card>
</el-card> -->
<!-- <u-picker :list="range" mode="selector" v-model="pickerShow1" :params="params" @confirm="confirm"></u-picker> -->
</view>
@ -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;
},
},
};

26
pages/post/jian.vue

@ -46,7 +46,7 @@
<!-- 区间分 -->
<u-form :model="form" v-if="baseInfo.scorestate==2">
<u-form-item label="考核参考" :label-position="labelPosition">
{{urlData.score}}{{urlData.company}}
{{urlData.scorestr}}{{urlData.unity}} {{urlData.moneystr}}
</u-form-item>
<u-form-item label="分数" :label-position="labelPosition">
<u-input v-model="form.score" type="digit" :border="true" />
@ -65,7 +65,7 @@
:border="true"
type="select"
:select-open="pickerShow"
v-model="form.time"
v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true"></u-input>
</u-form-item>
@ -114,7 +114,7 @@
:border="true"
type="select"
:select-open="pickerShow"
v-model="form.time"
v-model="form.happentime"
placeholder="请选择时间"
@click="pickerShow = true"></u-input>
</u-form-item>
@ -149,7 +149,7 @@
<u-select v-model="pickerShow1" :list="range"></u-select>
<u-select mode="single-column" :list="range" v-model="selectShow" @confirm="selectConfirm"></u-select>
<u-toast ref="uToast" />
<el-card class="box-card">
<!-- <el-card class="box-card">
<el-steps direction="vertical" :active="buzhou">
<el-step v-for="(item,index) in processData" :key="index" :title="item.nodename" icon="el-icon-circle-check" >
<template slot="description">
@ -180,7 +180,7 @@
</el-step>
</el-steps>
</el-card>
</el-card> -->
<!-- <u-picker :list="range" mode="selector" v-model="pickerShow1" :params="params" @confirm="confirm"></u-picker> -->
</view>
@ -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);

2
unpackage/dist/build/h5/index.html

@ -2,4 +2,4 @@
display: none;
}</style><script>document.addEventListener('DOMContentLoaded', function() {
document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
})</script><link rel=stylesheet href=./static/index.css></head><body><noscript><strong>本站点必须要开启JavaScript才能运行</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=./static/js/chunk-vendors.cbff64d3.js></script><script src=./static/js/index.80b450ca.js></script></body></html>
})</script><link rel=stylesheet href=./static/index.css></head><body><noscript><strong>本站点必须要开启JavaScript才能运行</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=./static/js/chunk-vendors.cbff64d3.js></script><script src=./static/js/index.833f5462.js></script></body></html>

7
unpackage/dist/build/h5/static/js/index.833f5462.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-index-index.048a090c.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-login-login.dff57b2f.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-post-data.fe3b458c.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-post-details.04cf9749.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-post-index.c194d071.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-post-jia.fc8ce34e.js

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-post-jian.62195eb6.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save