Skip to content

platform / social_ecurity_serv

Go to a project
Commit 10848df7 by 葛青博
Options

青岛社保问题修改

1 parent 6b1374d9
Expand all
Inline Side-by-side
Showing 19 changed files with 172 additions and 88 deletions
web/config/index.js
......@@ -10,12 +10,21 @@ module.exports = {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {},
proxyTable: {
"/api1": {
target: 'http://192.168.9.115:28000', //"https://store.keliuyun.com", // 要访问的接口域名
ws: true, // 是否启用websockets
changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
pathRewrite: {
"^/api1": "" //这里理解成用'/api'代替target里面的地址,比如我要调用'http://40.00.100.100:3002/user/add'，直接写'/api/user/add'即可
}
}
},
useLocalIp: true,
// Various Dev Server settings
host: '192.168.9.102', // 'localhost', // // can be overwritten by process.env.HOST
host: '192.168.9.196', // 'localhost', // // can be overwritten by process.env.HOST
port: 8990, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
......
web/index.html
<!DOCTYPE html>
<html>
<head>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>web</title>
<script>
!(function() {
var randomH = Date.parse(new Date()) / 1000;
document.write("<script type='text/javascript' src='./static/config.js?s=" + randomH + "' charset='utf-8'><\/script>");
})()
</script>
<!-- <script>
!(function() {
var platformConf = document.createElement("script"),
s = document.getElementsByTagName("script")[0],
stamp = +new Date();
platformConf.src = './static/config.js?_s=' + stamp;
s.parentNode.insertBefore(platformConf, s);
})()
</script>
</head>
<body>
</script> -->
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</body>
</html>
\ No newline at end of file
web/package-lock.json
......@@ -2496,6 +2496,11 @@
"integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
"dev": true
},
"blueimp-md5": {
"version": "2.18.0",
"resolved": "https://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.18.0.tgz?cache=0&sync_timestamp=1599372690839&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fblueimp-md5%2Fdownload%2Fblueimp-md5-2.18.0.tgz",
"integrity": "sha1-EVK+EzXwxrORHtnjbbVPPmrFKTU="
},
"bn.js": {
"version": "4.11.8",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
......
web/src/router/index.js
......@@ -8,7 +8,7 @@ Vue.use(Router)
export const constantRouterMap = [{
path: '/',
name: 'login',
component: reslove => require(['@/views/login/login'], reslove),
component: reslove => require(['@/views/Login/login'], reslove),
},
{
path: '/show',
......@@ -115,7 +115,7 @@ export const asyncRouterMap = [{
{
path: '/activity/report',
name: '状态报表',
component: reslove => require(['@/views/activity/report'], reslove),
component: reslove => require(['@/views/Activity/report'], reslove),
},
{
path: '/system/proofread',
......
web/src/store/modules/menu.js
import {asyncRouterMap, constantRouterMap } from '@/router/index.js'
import { asyncRouterMap, constantRouterMap } from '@/router/index.js'
import defultrouter from "@/router/index.js";
......@@ -73,9 +73,9 @@ const menu = {
commit("SET_ROUTERS", []);
return;
} else {
console.log('aaa',data)
// console.log('aaa',data)
let accessedRouters = filterAsyncRouter(asyncRouterMap, data);
console.log(accessedRouters)
// console.log(accessedRouters)
commit("SET_ROUTERS", accessedRouters);
}
}
......
web/src/util/api.js
// export let url = 'http://192.168.9.208:20080/api/v1'
// export let url = 'http://52.1.113.109:20080/api/v1'
const { urls = '', picUrls = '', mapUrls = '' } = window.SECURITY_CONF
......@@ -7,27 +6,27 @@ export const mapUrl = mapUrls || location.host
export let IP = urls || location.host
if (IP.indexOf('9.102') > -1 || IP.indexOf('localhost') > -1) {
IP = 'https://store.keliuyun.com/report'
// IP="/report"
// IP="/report"
}
// IP="/report"
export let url = `${IP}`
export let url = `${IP}` // '/api1/report' //
export let menus = `${url}/auth/api/auth/apps/23660e5593563b27832c2b8f490b458e/menus`
let timer = ()=>{
let timer = () => {
return new Date().getTime()
}
export let auth = {
login: `${url}/users/login`,
accountid:`${url}/accounts`,
accountid: `${url}/accounts`,
user: `${url}/users`,
edituser(userid){
edituser(userid) {
return `${url}/users/${userid}`
},
role: `${url}/auth/roles`,
editrole (roleid){
editrole(roleid) {
return `${url}/auth/roles/${roleid}`
},
menusRole(roleid){
menusRole(roleid) {
return `${url}/auth/roles/${roleid}/apps/23660e5593563b27832c2b8f490b458e/menus`
},
userRole(userid) {
......@@ -39,7 +38,7 @@ export let auth = {
deleteuserRole(userid, roleid) {
return `${url}/auth/users/${userid}/roles/${roleid}`
},
perms(roleid){
perms(roleid) {
return `${url}/auth/roles/${roleid}/perms`
},
ugrps: `${url}/auth/ugrps`,
......@@ -53,23 +52,23 @@ export let auth = {
return `${url}/auth/ugrps/${groupid}/users/${userid}`
},
///-------cyl add
getRoleUsers (roleid){
getRoleUsers(roleid) {
return `${url}/auth/roles/${roleid}/users`
},
}
export let org = {
getorgtree:`${url}/org/tree`,
getorg:`${url}/org`,
deleteorg (org_unid){
getorgtree: `${url}/org/tree`,
getorg: `${url}/org`,
deleteorg(org_unid) {
return `${url}/org/${org_unid}`
},
getvchan:`${url}/org/vchans`,
getvchanList:`${url}/org/vchans/list`,
editvchan (id){
getvchan: `${url}/org/vchans`,
getvchanList: `${url}/org/vchans/list`,
editvchan(id) {
return `${url}/org/vchans/${id}`
}
}
export let faceweb = `${url}/face_web`
export let picUrl = picUrls || "https://vion-retail.oss-cn-beijing.aliyuncs.com/"
// export let picUrl ="http://192.168.9.239/"
// export let picUrl ="http://192.168.9.239/"
\ No newline at end of file
web/src/util/http.js
......@@ -3,19 +3,46 @@
*/
import axios from 'axios'
import vue from 'vue'
import router from '../router'
const service = axios.create({
timeout: 2000000 //设置请求超时时间
})
import { Message, Loading } from 'element-ui';
import md5 from 'blueimp-md5'
function cleanArray(actual) {
const newArray = []
for (let i = 0; i < actual.length; i++) {
if (actual[i]) {
newArray.push(actual[i])
}
}
return newArray
}
import { Message, Loading } from 'element-ui';
function param2(json) {
if (!json) return ''
return cleanArray(
Object.keys(json).map(key => {
if (json[key] === undefined ||
json[key] === null
) return ''
return encodeURIComponent(key) + '=' + json[key]
})
).join('&')
}
const Axios = axios.create({
timeout: 0, //设置请求超时时间
withCredentials: true, // 是否允许带cookie这些
headers: {
"Content-Type": "application/json;charset=UTF-8"
}
})
window.axios = Axios;
let loading //定义loading变量
function startLoading() { //使用Element loading-start 方法
loading = Loading.service({
loading = Loading.Axios({
lock: true,
text: '加载中……',
background: 'rgba(0, 0, 0, 0.7)'
......@@ -48,20 +75,15 @@ export function tryHideFullScreenLoading() {
/**@param
* 请求前的拦截器
*/
service.interceptors.request.use(function(config) {
Axios.interceptors.request.use((config) => {
const suffix = '4c413628731691abc99eb2fca5f69aab'
const { method, params, data } = config
const token = localStorage.getItem('atoken');
// config.headers['app-code'] = 1
//截取API添加时间戳防止请求缓存
if (config.method == "get") {
config.params = {
_t: Date.parse(new Date()) / 1000,
...config.params
};
}
if (config.url.indexOf('codes/countries') < 1) {
if (config.url.indexOf('cates') < 1) {
if (token) {
// config.headers.authorization = '4db5183a-721b-4eee-b623-1d143890e813';
config.headers.authorization = token;
//showFullScreenLoading();
} else {
......@@ -69,6 +91,13 @@ service.interceptors.request.use(function(config) {
}
}
}
const signalStr = method.toUpperCase() +
(params ? param2(params) : '') +
(data ? JSON.stringify(data) : '') +
suffix + (config.headers.Authorization ? config.headers.Authorization : '');
const hashSignature = md5(signalStr)
config.headers['signature'] = hashSignature
return config
}, function(err) {
//tryHideFullScreenLoading();
......@@ -79,7 +108,7 @@ service.interceptors.request.use(function(config) {
* @param
* 响应前的拦截器
*/
service.interceptors.response.use(function(res) {
Axios.interceptors.response.use((res) => {
//tryHideFullScreenLoading();
if (res.data) {
if (res.data.ecode === 401) {
......@@ -87,7 +116,7 @@ service.interceptors.response.use(function(res) {
type: 'error',
message: res.data.enote
})
// router.push('/');
router.replace('/');
}
}
return res;
......@@ -96,4 +125,4 @@ service.interceptors.response.use(function(res) {
return Promise.reject(err);
})
export default service
\ No newline at end of file
export default Axios
\ No newline at end of file
web/src/views/Deploy/dbManage/facedb/faceTable.vue
......@@ -138,7 +138,7 @@
is_active: true,
sex: Vthis.facesex,
name__like: Vthis.facename,
card_id__like: Vthis.facecardid,
idCard_like: Vthis.facecardid,
crucial_type: Vthis.dbname,
resident_unids: this.communityunid,
}
......
web/src/views/Deploy/taskManage/facetask/facetask.vue
......@@ -651,7 +651,7 @@
is_active: true,
sex: this.facesex,
name__like: '',
card_id__like: '',
idCard_like: '',
crucial_type: 'dl_white',
resident_unids: '',
}
......
web/src/views/Home/show/index.vue
......@@ -246,11 +246,11 @@ export default {
map.addOverlay(overlay);
});
});
popupCloser.addEventListener('click',function(){
overlay.setPosition(undefined);
return
// popupCloser.addEventListener('click',function(){
// overlay.setPosition(undefined);
// return
});
// });
},
......@@ -322,7 +322,7 @@ export default {
source: iconFeature,
id:1
});
map.addLayer(this.CameraVertorlayer);
map.addLayer(CameraVertorlayer);
},
},
......@@ -336,11 +336,11 @@ export default {
mounted(){
this.InitMap();
let _this = this;
setTimeout(() => {
// 添加一个使用离线瓦片地图的层
// setTimeout(() => {
// // 添加一个使用离线瓦片地图的层
map.addLayer(CameraVertorlayer);
}, 200);
// map.addLayer(CameraVertorlayer);
// }, 200);
}
}
</script>
......
web/src/views/Login/login.vue
......@@ -67,6 +67,7 @@ export default {
sessionStorage.removeItem("threemenu");
sessionStorage.removeItem("menu");
localStorage.setItem("accountId", response.data.data.user.accountId);
// localStorage.setItem("accountId", 2);
// this.axios.get(this.API.auth.accountid,{
// params:{
// id:response.
......
web/src/views/Search/FilmedRecords.vue
......@@ -2,8 +2,8 @@
<template>
<div class="template-box content_div_main">
<el-form :inline="true" class="search-form" size="small">
<el-form-item label="社区选择：">
<el-select v-model="search.communityunid" placeholder="请选择">
<el-form-item label="地点选择：">
<el-select v-model="search.communityunid" placeholder="请选择" @change="initGateData">
<el-option
v-for="item in addrData"
:key="item.unid" :value="item.id" :label="item.name"
......
web/src/views/Search/facedb/faceTable.vue
......@@ -154,7 +154,7 @@
accountId: this.accountId,
gender: Vthis.facesex,
name_like: `%${Vthis.facename}%`,
card_id__like: Vthis.facecardid,
idCard_like: Vthis.facecardid === '' ? null : Vthis.facecardid,
type: Vthis.dbname,
resident_unids: this.communityunid,
}
......
web/src/views/System/SysExaminee/index.vue
......@@ -24,7 +24,7 @@
</el-form-item>
<el-form-item>
<el-button class="search-btn" @click="searchUser" icon="el-icon-download"
:disabled="buttonDisable()">获取考生列表</el-button>
:disabled="buttonDisable()" v-loading="btnLoading">获取考生列表</el-button>
<el-button class="search-btn ml10" @click="getAllUserList"
:disabled="buttonDisable()">获取考生照片</el-button>
</el-form-item>
......@@ -39,17 +39,13 @@
<el-input type="text" class="bla bra br0" v-model="idCard" placeholder=""></el-input>
</el-form-item>
<el-form-item>
<el-button class="search-btn" @click="getUserList"
:disabled="examinationId === '' || typeId === ''">查询</el-button>
<el-button class="search-btn" @click="getUserList(true)"
:disabled="examinationId === '' || typeId === ''" v-loading="loading">查询</el-button>
</el-form-item>
</el-form>
</el-row>
<el-row>
<el-table :data="systableData"
:v-loading="pictLoading"
element-loading-background = "rgba(0, 0, 0, 0.5)"
element-loading-text = "数据正在加载中"
element-loading-spinner = "el-icon-loading"
<el-table :data="systableData" v-loading="loading"
style="width:98%;margin:20px auto;" class="table_m_type" height="700">
<div slot="empty">
<div class="no-data-box">
......@@ -57,8 +53,12 @@
<div>暂无数据</div>
</div>
</div>
<el-table-column type="index" width=""></el-table-column>
<!-- <el-table-column prop="tabOrder" label="序号" width=""></el-table-column> -->
<!-- <el-table-column type="index" width=""></el-table-column> -->
<el-table-column label="序号" width="">
<template slot-scope="scope">
<div>{{ scope.row.tabOrder + (currentPage - 1) * 10 }}</div>
</template>
</el-table-column>
<el-table-column prop="idCard" label="身份证号" width=""></el-table-column>
<el-table-column label="照片" align="center">
<template slot-scope="scope">
......@@ -133,7 +133,8 @@ export default {
total:0,
currentPage:1,
limit:20,
pictLoading: false,
loading: false,
btnLoading: false,
accountId:localStorage.getItem("accountId"),
allUserList: [],
picUrls,
......@@ -143,22 +144,24 @@ export default {
},
methods: {
searchUser () {
this.btnLoading = true
this.axios.get(this.API.url+`/persons/socialSecurity/getStudentInfo`, {
params: {
mallId: this.examinationId,
personType: this.typeId
}
}).then(response => {
this.btnLoading = false
if (response.data.code === 200) {
this.successCount = response.data.data.successCount
this.userDataSuccess()
this.getUserList()
this.getUserList(false)
}
});
},
handleCurrentChange(val){
this.currentPage = val;
this.getUserList();
this.getUserList(true);
},
// 获取所有用户
async getAllUserList () {
......@@ -196,7 +199,7 @@ export default {
return;
}
if (nowNumber === this.allUserList.length - 1) {
this.getUserList()
this.getUserList(false)
}
if (nowNumber < this.allUserList.length) {
await this.setUserPhoto(() => {
......@@ -216,7 +219,11 @@ export default {
}
},
// 获取担任考生照片
getUserList () {
getUserList (type) {
this.systableData = []
if (type) {
this.loading = true
}
this.axios.get(this.API.url+`/persons`, {
params: {
mallId: this.examinationId,
......@@ -226,10 +233,13 @@ export default {
pageSize: this.limit,
}
}).then(response => {
if (type) {
this.loading = false
}
if (response.data && response.data.data && response.data.data.list) {
// response.data.data.list.forEach((item, index) => {
// item.tabOrder = ++index;
// });
response.data.data.list.forEach((item, index) => {
item.tabOrder = ++index;
});
this.systableData = response.data.data.list
this.total = response.data.data.total || 0
} else {
......@@ -262,6 +272,10 @@ export default {
try {
const data = await this.axios.get(this.API.url+`/persons/socialSecurity/getPictures/${row.id}`)
if (data && data.data && data.data.data) {
this.$message({
type: "info",
message: "获取照片成功"
});
systableData[index].personPic = data.data.data.personPic
}
} catch (err) {
......@@ -289,6 +303,7 @@ export default {
});
},
changeExamination () {
this.typeId = ''
if (this.examinationId !== '') {
this.getTypes()
}
......
web/src/views/System/SysExaminee/proofreading.vue
<template>
<div class="template-box content_div_main">
<div class="template-box content_div_main" v-loading="pageLoading">
<el-row class="">
<el-form :inline="true" class="search-form" size="small">
<el-form-item label="考点名称：" label-width="82px">
......@@ -36,21 +36,26 @@
<el-input type="text" class="bla bra br0" v-model="idCard" placeholder="" style="width: 192px"></el-input>
</el-form-item>
<el-form-item>
<el-button class="search-btn" @click="getUserList" :disabled="examinationId === '' || typeId === ''">查询</el-button>
<el-button class="search-btn" @click="getUserList" :disabled="examinationId === '' || typeId === ''" v-loading="loading">查询</el-button>
<el-button class="search-btn ml10" @click="upLoadData" :disabled="examinationId === '' || typeId === ''">上传校对结果</el-button>
</el-form-item>
</el-form>
</el-row>
<el-row>
<el-table :data="systableData" style="width:98%;margin:20px auto;" class="table_m_type" height="700">
<el-table :data="systableData" style="width:98%;margin:20px auto;" class="table_m_type" height="700"
v-loading="loading">
<div slot="empty">
<div class="no-data-box">
<img src="../../../assets/img/nodata.png" alt="暂无数据"/>
<div>暂无数据</div>
</div>
</div>
<el-table-column type="index" width="" label="序号"></el-table-column>
<!-- <el-table-column prop="" label="序号" width=""></el-table-column> -->
<!-- <el-table-column type="index" width="" label="序号"></el-table-column> -->
<el-table-column prop="tabOrder" label="序号" width="">
<template slot-scope="scope">
<div>{{ scope.row.tabOrder + (currentPage - 1) * 10 }}</div>
</template>
</el-table-column>
<el-table-column prop="idCard" label="身份证号" width=""></el-table-column>
<el-table-column prop="" label="校对结果" width="">
<template slot-scope="scope">
......@@ -145,21 +150,26 @@ export default {
],
picUrls,
defaultImg,
loading: false,
pageLoading: false,
}
},
methods: {
async upLoadData () {
try {
this.pageLoading = true
const response = await this.axios.get(this.API.url+`/persons/socialSecurity/sendComparisonResults`, {
params: {
mallId: this.examinationId,
personType: this.typeId
}
});
this.pageLoading = false
this.$alert(response.data.msg, '', {
confirmButtonText: '确定'
});
} catch (err) {
this.pageLoading = false
this.$message.error("上传校队失败");
}
},
......@@ -187,6 +197,8 @@ export default {
// 获取所有用户
getUserList () {
const { proofrendResut } = this
this.loading = true
this.systableData = []
let data = {}
if (proofrendResut === '全部') {
data = {
......@@ -210,10 +222,11 @@ export default {
...data
}
}).then(response => {
this.loading = false
if (response.data && response.data.data && response.data.data.list) {
// response.data.data.list.forEach((item, index) => {
// item.tabOrder = ++index;
// });
response.data.data.list.forEach((item, index) => {
item.tabOrder = ++index;
});
this.systableData = response.data.data.list
this.total = response.data.data.total || 0
} else {
......@@ -236,6 +249,7 @@ export default {
});
},
changeExamination () {
this.typeId = ''
if (this.examinationId !== '') {
this.getTypes()
}
......
web/src/views/report/show.vue
......@@ -72,12 +72,14 @@ export default {
chartIds: '1,2,3,4,5,6,8,16,17'
}
}).then((res)=>{
if (res && res.data && res.data.data) {
this.datas=res.data.data;
this.chartData1 = this.datas.body.CustomerCounting;
this.chartData1.otherConf={
_color:["#0069FF", "#4BBEFF", "#87D14B", "#FFC62E", "#FF9631"]
}
this.radioChange(this.datas);
}
})
},
radioChange(res){
......
web/static/config.js
......@@ -6,4 +6,5 @@ window.SECURITY_CONF = {
// urls: 'http://192.168.9.146:17070',
picUrls: 'https://vion-retail.oss-cn-beijing.aliyuncs.com/',
mapUrls: 'http://19610hs911.iask.in/static/pics/qingdaoMap/roadmap'
// mapUrls: 'http://192.168.9.162:20080/static/pics/cache/qingdao/roadmap'
}
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!