diff --git a/.env.development b/.env.development
index f00293a..f8ff506 100644
--- a/.env.development
+++ b/.env.development
@@ -3,3 +3,4 @@ ENV = 'development'
# base api
VUE_APP_BASE_API = 'http://vue.user.net/api'
+VUE_APP_BASE_API1 = 'http://vue.user.net/hrapi'
diff --git a/.env.production b/.env.production
index 07d391e..5d517fa 100644
--- a/.env.production
+++ b/.env.production
@@ -3,4 +3,4 @@ ENV = 'production'
# base api
VUE_APP_BASE_API = '/api'
-
+VUE_APP_BASE_API1 = '/hrapi'
diff --git a/package.json b/package.json
index 0a514b0..3fa6bb5 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
"serve-static": "1.13.2",
"svg-sprite-loader": "4.1.3",
"svgo": "1.2.2",
+ "vue-awesome-swiper": "^3.1.3",
"vue-template-compiler": "2.6.10"
},
"browserslist": [
diff --git a/public/index.html b/public/index.html
index 4393c66..62317d4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,6 +6,7 @@
<%= webpackConfig.name %>
+
diff --git a/src/api/copyTwo.js b/src/api/copyTwo.js
new file mode 100644
index 0000000..3bb54f9
--- /dev/null
+++ b/src/api/copyTwo.js
@@ -0,0 +1,89 @@
+import request from '@/utils/request1'
+//添加职位（岗位）
+export const stafflist = (data) => {
+ return request({
+ url: '/staff/stafflist',
+ method: 'post',
+ data: data
+ })
+ }
+//添加职位（岗位）
+export const addpositioncont = (data) => {
+ return request({
+ url: '/org/addpositioncont',
+ method: 'post',
+ data: data
+ })
+ }
+//获取职位（岗位）详情
+export const getpositioncont = (data) => {
+ return request({
+ url: '/org/getpositioncont',
+ method: 'post',
+ data: data
+ })
+ }
+//编辑职位（岗位）状态或删除
+export const eitepositionstateordel = (data) => {
+ return request({
+ url: '/org/eitepositionstateordel',
+ method: 'post',
+ data: data
+ })
+}
+//职位（岗位）列表
+export const positionlist = (data) => {
+ return request({
+ url: '/org/positionlist',
+ method: 'post',
+ data: data
+ })
+}
+//编辑职位（岗位）
+export const eitepositioncont = (data) => {
+ return request({
+ url: '/org/eitepositioncont',
+ method: 'post',
+ data: data
+ })
+}
+//职务列表
+export const dutieslist = (data) => {
+ return request({
+ url: '/org/dutieslist',
+ method: 'post',
+ data: data
+ })
+}
+//行政组织列表
+export const govlist = (data) => {
+ return request({
+ url: '/org/govlist',
+ method: 'post',
+ data: data
+ })
+}
+//行政组织树
+export const govthree = (data) => {
+ return request({
+ url: '/org/govthree',
+ method: 'post',
+ data: data
+ })
+}
+//岗位（职位）配权
+export const getpositionrole = (data) => {
+ return request({
+ url: '/org/getpositionrole',
+ method: 'post',
+ data: data
+ })
+}
+//岗位（职位）配权
+export const positionallotment = (data) => {
+ return request({
+ url: '/permit/positionallotment',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/dutys.js b/src/api/dutys.js
index d993c50..0d52cc6 100644
--- a/src/api/dutys.js
+++ b/src/api/dutys.js
@@ -129,7 +129,7 @@ export const getgroupuser = (data) => {
//划分责任人
export const adddivisionresponsibility = (data) => {
return request({
- url: '/eval/rersonincharge',
+ url: '/qual/divisionresponsibility',
method: 'post',
data: data
})
@@ -230,4 +230,28 @@ export const plusorminuspoints = (data) => {
data: data
})
}
+//定性审批
+export const operation = (data) => {
+ return request({
+ url: '/qual/operation',
+ method: 'post',
+ data: data
+ })
+}
+//定量审核通过或者驳回
+export const sanction = (data) => {
+ return request({
+ url: '/quan/sanction',
+ method: 'post',
+ data: data
+ })
+}
+//整改措施
+export const amendmeasures = (data) => {
+ return request({
+ url: '/qual/amendmeasures',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/user.js b/src/api/user.js
index 0cc0ea5..1bda9a4 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -43,9 +43,31 @@ export const mylogin = (data) => {
data: data
})
}
+// @Summary 超级登录
+// @Produce application/json
+// @Param data body {username:"string",password:"string"}
+// @Router /base/login [post]
+export const scancodelogin = (data) => {
+ return request({
+ url: '/base/scancodelogin',
+ method: 'post',
+ data: data
+ })
+}
export function logout() {
return request({
url: '/vue-admin-template/user/logout',
method: 'post'
})
}
+// @Summary 查询个人信息
+// @Produce application/json
+// @Param data body {username:"string",password:"string"}
+// @Router /base/login [post]
+export const scancode = (data) => {
+ return request({
+ url: '/noverify/scancode',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 2f9dd06..ff6d37b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -33,14 +33,19 @@ import Layout from '@/layout'
export const constantRoutes = [
{
path: '/login',
- component: () => import('@/views/login/index'),
+ component: () => import('@/views/login/wxLogin'),
hidden: true
},
{
path: '/ceshi',
- component: () => import('@/views/ceshi/index'),
- hidden: true
+ component: () => import('@/views/ce/index'),
+ // hidden: true
},
+ // {
+ // path: '/ceshi',
+ // component: () => import('@/views/ceshi/index'),
+ // hidden: true
+ // },
{
path: '/zerenLogin',
component: () => import('@/views/login/zerenLogin'),
diff --git a/src/utils/request1.js b/src/utils/request1.js
new file mode 100644
index 0000000..c498707
--- /dev/null
+++ b/src/utils/request1.js
@@ -0,0 +1,89 @@
+import axios from 'axios'
+import { MessageBox, Message } from 'element-ui'
+import store from '@/store'
+import { getToken,getKey } from '@/utils/auth'
+
+// create an axios instance
+const service = axios.create({
+ baseURL: process.env.VUE_APP_BASE_API1, // url = base url + request url
+ // withCredentials: true, // send cookies when cross-domain requests
+ timeout: 180000 // request timeout
+})
+
+// request interceptor
+service.interceptors.request.use(
+ config => {
+ // do something before request is sent
+
+ if (store.getters.token) {
+ // let each request carry token
+ // ['X-Token'] is a custom headers key
+ // please modify it according to the actual situation
+ config.headers['user-token'] = getToken()
+ config.headers['user-key'] = getKey()
+ }
+ return config
+ },
+ error => {
+ // do something with request error
+ console.log(error) // for debug
+ return Promise.reject(error)
+ }
+)
+
+// response interceptor
+service.interceptors.response.use(
+ /**
+ * If you want to get http information such as headers or status
+ * Please return response => response
+ */
+
+ /**
+ * Determine the request status by custom code
+ * Here is just an example
+ * You can also judge the status by HTTP Status Code
+ */
+ response => {
+ const res = response.data
+
+ // if the custom code is not 20000, it is judged as an error.
+ if (res.code !== 0) {
+ if(res.code === 7){
+ store.commit('user/loginOut')
+ }
+ Message({
+ message: res.msg || 'Error',
+ type: 'error',
+ duration: 5 * 1000
+ })
+
+ // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
+ if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+ // to re-login
+ MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
+ confirmButtonText: 'Re-Login',
+ cancelButtonText: 'Cancel',
+ type: 'warning'
+ }).then(() => {
+ store.dispatch('user/resetToken').then(() => {
+ location.reload()
+ })
+ })
+ }
+ return Promise.reject(new Error(res.msg || 'Error'))
+ } else {
+ return res
+ }
+ },
+ error => {
+ console.log('err' + error) // for debug
+ Message({
+ message: error.msg,
+ type: 'error',
+ duration: 5 * 1000
+ })
+ return Promise.reject(error)
+ }
+)
+
+export default service
diff --git a/src/views/approvalData/index.vue b/src/views/approvalData/index.vue
index d12c847..b5cd86a 100644
--- a/src/views/approvalData/index.vue
+++ b/src/views/approvalData/index.vue
@@ -66,12 +66,12 @@
:visible.sync="drawer"
direction="rtl"
>
-
- 审批编号：{{xinglist.orderid}}
-
- {{xinglist.title}}
-
-
+
+ 审批编号：{{xinglist.orderid}}
+
+ {{xinglist.title}}
+
+
@@ -103,42 +103,99 @@
{{item.reccont}}
{{item.timeval}}
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{itema.filename}}
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
- {{a.workshopname}}-{{a.postname}}-{{a.name}}
-
-
-
已同意 ·
-
未操作 ·
-
驳回 ·
-
{{i.time}}
-
+
+
+
+
+
+
+
+
+
+
+ {{a.workshopname}}-{{a.postname}}-{{a.name}}
+
+
+
已同意 ·
+
未操作 ·
+
驳回 ·
+
{{i.time}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{a.workshopname}}-{{a.postname}}-{{a.name}}
+
+
+
已同意 ·
+
未操作 ·
+
驳回 ·
+
{{i.time}}
+
+
责任划分
@@ -105,6 +135,30 @@
{{item.weight}}
+
+
+ ![]()
+
整改措施
@@ -113,6 +167,22 @@
{{item.recname}}
{{item.reccont}}
{{item.timeval}}
+
+
+
+
+
+
+
+
+
+ {{itema.filename}}
+
+
-
+
@@ -246,7 +316,17 @@
-
+
+
+
+ 同意
+ 驳回
+
+ 恒信高科后台管理系统
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![请输入验证码]()
+