Skip to content

F
founder_vue
Commit bf01a979 by chenyr
Options

更新

parent 435f1829
Showing with 308 additions and 257 deletions
package-lock.json
...@@ -1823,6 +1823,37 @@ ...@@ -1823,6 +1823,37 @@
"webpack-merge": "^4.2.2" "webpack-merge": "^4.2.2"
}, },
"dependencies": { "dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
"integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": { "debug": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz", "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
...@@ -1832,11 +1863,35 @@ ...@@ -1832,11 +1863,35 @@
"ms": "2.1.2" "ms": "2.1.2"
} }
}, },
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=", "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true "dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.1.2",
"resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz?cache=0&sync_timestamp=1608187947155&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.2.tgz",
"integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
} }
} }
}, },
...@@ -12217,63 +12272,6 @@ ...@@ -12217,63 +12272,6 @@
} }
} }
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.1.1",
"resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.1.tgz?cache=0&sync_timestamp=1607093697210&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.1.tgz",
"integrity": "sha1-9bKG1grGiGaExjoXoYQ5HMngGZo=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792266928&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1591687070184&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz",
"integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz?cache=0&sync_timestamp=1584445207623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": { "vue-router": {
"version": "3.4.6", "version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz", "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
src/api/base.js
...@@ -53,10 +53,12 @@ if ( ...@@ -53,10 +53,12 @@ if (
//------------------------------东莞智通后台服务路径**阿里云**---------------------------- //------------------------------东莞智通后台服务路径**阿里云**----------------------------
base.ZhiTu_url = "http://39.99.159.210:8053"; base.ZhiTu_url = "http://39.99.159.210:8053";
//------------------------------脑图后台服务路径**阿里云**-------------------------------- //------------------------------脑图后台服务路径**阿里云**--------------------------------
base.bigwfwurl = "http://77.1.24.51:8050"; base.bigwfwurl = "http://77.1.24.51:8050 ";
} else { } else {
//------------------------------脑图后台服务路径**测试**---------------------------------- //------------------------------脑图后台服务路径**测试**----------------------------------
base.test = "/api1"; base.test = "/api1";
base.test1 = "/api2";
} }
export default base; export default base;
src/api/home.js
...@@ -13,6 +13,9 @@ export const getTokenFromServer = params => post(`${base.test}/getToken`, params ...@@ -13,6 +13,9 @@ export const getTokenFromServer = params => post(`${base.test}/getToken`, params
export const queryCodeByType = params => export const queryCodeByType = params =>
get(`${base.test}/queryTypeCode`, params); get(`${base.test}/queryTypeCode`, params);
export const queryByTypeAndCode = params =>
get(`${base.test}/queryByTypeAndCode`, params);
export const queryZTreeDataByName = params => export const queryZTreeDataByName = params =>
get(`${base.test}/queryZTreeDataByName`, params); get(`${base.test}/queryZTreeDataByName`, params);
......
src/api/xsInput/xsQuery.js
...@@ -8,7 +8,6 @@ export const getXsListByPid = params => ...@@ -8,7 +8,6 @@ export const getXsListByPid = params =>
export const getXsList = params => export const getXsList = params =>
post(`${base.test}/getClueList`, params); post(`${base.test}/getClueList`, params);
//线索合并 //线索合并
export const hbXsz = params => export const hbXsz = params =>
postform(`${base.test}/dbxs/hbXsz`, params); postform(`${base.test}/dbxs/hbXsz`, params);
...@@ -16,3 +15,13 @@ export const hbXsz = params => ...@@ -16,3 +15,13 @@ export const hbXsz = params =>
//线索删除 //线索删除
export const delXszxx = params => export const delXszxx = params =>
post(`${base.test}/deleteByXsbh`, params); post(`${base.test}/deleteByXsbh`, params);
//案件管理
export const listTbStAsj = params =>
post(`${base.test}/listTbStAsjFromES`, params);
// post(`${base.test}/listTbStAsj`, params);
//警情管理
export const getAsjjqSolrList = params =>
post(`${base.test}/getAsjjqSolrList`, params);
src/components/code.vue
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
}) })
this.codeObj.splice(index, 1) this.codeObj.splice(index, 1)
console.log(this.codeObj);
} }
return return
}, },
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
}, },
handleClose () { handleClose () {
this.codeShow = false this.codeShow = false
console.log(this.codeObj);
this.keyNode = [] this.keyNode = []
this.codeObj.forEach(item => { this.codeObj.forEach(item => {
this.keyNode.push(item.label) this.keyNode.push(item.label)
......
src/components/demoPrototype/formPages/formCommonPage.vue
...@@ -786,7 +786,6 @@ export default { ...@@ -786,7 +786,6 @@ export default {
}, },
//数据展示 //数据展示
showData() { showData() {
console.log(123);
this.$emit("showDatas"); this.$emit("showDatas");
}, },
//数据查询 //数据查询
...@@ -844,7 +843,6 @@ export default { ...@@ -844,7 +843,6 @@ export default {
}, },
//单位选择 //单位选择
handleTag(id) { handleTag(id) {
console.log(id);
this.tagId = id; this.tagId = id;
this.$emit("changeTag", id); this.$emit("changeTag", id);
}, },
...@@ -993,17 +991,14 @@ export default { ...@@ -993,17 +991,14 @@ export default {
self.formLabelAlign[item.id].length - 1 self.formLabelAlign[item.id].length - 1
] ]
: ""; : "";
console.log(self.formLabelAlign[item.id]); //二级字典取到的是一个数组，value : ["111",''112] 拿到数组里的第二个值 //二级字典取到的是一个数组，value : ["111",''112] 拿到数组里的第二个值
if (self.formLabelAlign[item.id]) { if (self.formLabelAlign[item.id]) {
//如果这个有值的话就添加到参数里 //如果这个有值的话就添加到参数里
params.append( params.append(
self.propSt + "." + item.id, self.propSt + "." + item.id,
self.formLabelAlign[item.id] self.formLabelAlign[item.id]
); );
console.log(
"2)二级字典处" + this.propSt + item.id,
self.formLabelAlign[item.id]
);
} }
} }
} else if (item.type == "date" || item.type == "dates") { } else if (item.type == "date" || item.type == "dates") {
...@@ -1067,10 +1062,7 @@ export default { ...@@ -1067,10 +1062,7 @@ export default {
); );
} }
} }
console.log(
"1)普通字段处" + this.propSt + "." + item.id,
self.formLabelAlign[item.id]
);
} }
} }
//2.有子级表单数据处理 //2.有子级表单数据处理
...@@ -1107,15 +1099,7 @@ export default { ...@@ -1107,15 +1099,7 @@ export default {
val5[ite] val5[ite]
); );
} }
console.log(
"5)政治人员身份" +
subItem.id +
"[" +
index +
"]." +
ite,
val5[ite]
);
} else if ( } else if (
currentc && currentc &&
currentc.type == "lazyCodeTree" currentc.type == "lazyCodeTree"
...@@ -1131,15 +1115,7 @@ export default { ...@@ -1131,15 +1115,7 @@ export default {
); );
} }
} else { } else {
console.log(
"3)有子级表单数据处理." +
subItem.id +
"[" +
index +
"]." +
ite,
val5[ite]
);
params.append( params.append(
subItem.id + "[" + index + "]." + ite, subItem.id + "[" + index + "]." + ite,
val5[ite] val5[ite]
...@@ -1202,7 +1178,7 @@ export default { ...@@ -1202,7 +1178,7 @@ export default {
this.$refs.formLabelAlign.clearValidate(); this.$refs.formLabelAlign.clearValidate();
}, },
httpRequest(data) { httpRequest(data) {
console.log(data);
}, },
//handleNumber () { }, //handleNumber () { },
getCodeDm(obj, type) { getCodeDm(obj, type) {
......
src/components/demoPrototype/queryPages/query_component.vue
...@@ -29,14 +29,15 @@ ...@@ -29,14 +29,15 @@
</div> </div>
<div class="content"> <div class="content">
<!--左侧导航--> <!--左侧导航-->
<div class="leftMenu" ref=""> <div class="leftMenu" ref=""
style="background-color: #343A3F">
<!--无子集--> <!--无子集-->
<el-menu <el-menu
default-active="1" default-active="1"
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
:collapse="isCollapse" :collapse="isCollapse"
active-text-color="#409EFF" active-text-color="#FFFFFF"
background-color="#fff" background-color="#343A3F"
text-color="#545c64" text-color="#545c64"
v-if="!propLeftMenu[0].children" v-if="!propLeftMenu[0].children"
> >
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
:key="menuIndex" :key="menuIndex"
:index="item.index" :index="item.index"
v-show="item.isShow" v-show="item.isShow"
:class="menuIndex == 0 ? changebg1 : changebg2"
@click="getField(item.id, item.index)" @click="getField(item.id, item.index)"
> >
<i :class="item.className" style="margin-right:9px"></i> <i :class="item.className" style="margin-right:9px"></i>
...@@ -97,6 +99,7 @@ ...@@ -97,6 +99,7 @@
:selectQueryPath="selectQueryPath" :selectQueryPath="selectQueryPath"
:navIndex="navIndex" :navIndex="navIndex"
:queryLb="queryLb" :queryLb="queryLb"
:types = "types"
> >
</QueryRightCommon> </QueryRightCommon>
</div> </div>
...@@ -151,6 +154,9 @@ export default { ...@@ -151,6 +154,9 @@ export default {
}, },
data() { data() {
return { return {
types: 'ajbzrwrl',
changebg1: 'changebg1',
changebg2: 'changebg2',
openeds: ['1'], openeds: ['1'],
propLeftMenu: this.LeftMenu, propLeftMenu: this.LeftMenu,
propQueryField: this.QueryField, //将配置的可查询的列表都传过来 propQueryField: this.QueryField, //将配置的可查询的列表都传过来
...@@ -178,7 +184,24 @@ export default { ...@@ -178,7 +184,24 @@ export default {
selectQueryPath: "" //请求接口配置 selectQueryPath: "" //请求接口配置
}; };
}, },
watch: {
types:{
//切换左侧按钮背景颜色
handler(newName, oldName) {
if(newName == 'ajbzrwrl'){
this.changebg1 = 'bg';
this.changebg2 = 'nobg'
}else if(newName == 'jqrwrl'){
this.changebg2 = 'bg';
this.changebg1 = 'nobg'
}
},
},
},
methods: { methods: {
outLogin(){ outLogin(){
this.$confirm('是否确定退出登录?', '提示', { this.$confirm('是否确定退出登录?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -193,6 +216,11 @@ export default { ...@@ -193,6 +216,11 @@ export default {
}, },
getField(id, key) { getField(id, key) {
if( id == 'jqrwrl'){
this.types = 'jqrwrl';
}else if(id == 'ajbzrwrl'){
this.types = 'ajbzrwrl';
}
//点击导航 //点击导航
this.navIndex = key; this.navIndex = key;
this.selectedPropQueryField = this.propQueryField[id]; this.selectedPropQueryField = this.propQueryField[id];
...@@ -242,7 +270,7 @@ export default { ...@@ -242,7 +270,7 @@ export default {
} }
}) })
.catch(err => { .catch(err => {
console.log(err);
}); });
}, },
//点击左侧按钮切换右侧数据 //点击左侧按钮切换右侧数据
...@@ -269,7 +297,7 @@ export default { ...@@ -269,7 +297,7 @@ export default {
//初始化给个本单位数据 //初始化给个本单位数据
created() { created() {
console.log("url--info",this.$route.path);
var self = this; var self = this;
self.selectedPropQueryField = self.propQueryField[self.initField]; //在页面初始化时给一个查询列表默认值 self.selectedPropQueryField = self.propQueryField[self.initField]; //在页面初始化时给一个查询列表默认值
self.selectedPropAllformThead = self.propAllformThead[self.initField]; //在页面初始化时表头设置里的所有值 self.selectedPropAllformThead = self.propAllformThead[self.initField]; //在页面初始化时表头设置里的所有值
...@@ -282,6 +310,13 @@ export default { ...@@ -282,6 +310,13 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
nobg{
background-color: rgb(52, 58, 63) !important;
}
.bg{
background: #000 !important;
}
@import "./styles/xcStyle"; @import "./styles/xcStyle";
.header_right { .header_right {
position: relative; position: relative;
......
src/components/demoPrototype/queryPages/styles/publicScss.scss
...@@ -90,7 +90,6 @@ body { ...@@ -90,7 +90,6 @@ body {
margin-top:10px; margin-top:10px;
height:calc(100% - 456px); height:calc(100% - 456px);
.el-menu-item.is-active{ .el-menu-item.is-active{
background:$-left-active-background !important;
font-weight:bold; font-weight:bold;
border-right:$-left-active-background-border; border-right:$-left-active-background-border;
} }
......
src/components/demoPrototype/queryPages/styles/xcStyle.scss
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
display: table; display: table;
width: 100%; width: 100%;
margin: 4px 0; margin: 4px 0;
border-bottom: 1px dashed #eaeaea; //border-bottom: 1px dashed #eaeaea;
padding-bottom: 2px; padding-bottom: 2px;
.zdycol3 { .zdycol3 {
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
th { th {
color: #333333; color: #333333;
font-size: 14; font-size: 14px;
} }
} }
......
src/layout/clueLayout.vue
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
}); });
} }
} }
console.log('obj.a changed');
}, },
immediate: true, immediate: true,
deep: true deep: true
......
src/layout/comm.vue
...@@ -75,10 +75,10 @@ export default { ...@@ -75,10 +75,10 @@ export default {
created () { }, created () { },
methods: { methods: {
handleOpen (key, keyPath) { handleOpen (key, keyPath) {
console.log(key, keyPath);
}, },
handleClose (key, keyPath) { handleClose (key, keyPath) {
console.log(key, keyPath);
} }
} }
}; };
......
src/main.js
...@@ -6,10 +6,10 @@ import store from "./store"; ...@@ -6,10 +6,10 @@ import store from "./store";
import "./plugins/element.js"; import "./plugins/element.js";
import Util from "./utils/util"; import Util from "./utils/util";
import VueWechatTitle from "vue-wechat-title"; import VueWechatTitle from "vue-wechat-title";
import toExcel from "@/utils/toExcel.js";
import Nsloading from "./components/Loading.vue"; import Nsloading from "./components/Loading.vue";
Vue.prototype.$store = store; Vue.prototype.$store = store;
Vue.prototype.$toExcel = toExcel;
const LoadingCons = Vue.extend(Nsloading); const LoadingCons = Vue.extend(Nsloading);
// 常用工具函数 // 常用工具函数
Vue.prototype.$util = Util; Vue.prototype.$util = Util;
...@@ -27,10 +27,8 @@ Vue.directive("nsLoading", { ...@@ -27,10 +27,8 @@ Vue.directive("nsLoading", {
el.instance = instance; el.instance = instance;
Vue.nextTick(() => { Vue.nextTick(() => {
el.instance.isShow = binding.value; el.instance.isShow = binding.value;
console.log(123);
}); });
console.log(el.instance);
console.log(binding);
}, },
/** /**
* 所在组件的 VNode 更新时调用 * 所在组件的 VNode 更新时调用
......
src/router/index.js
...@@ -42,7 +42,7 @@ const router = new VueRouter({ ...@@ -42,7 +42,7 @@ const router = new VueRouter({
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
const token = localStorage.getItem("token") const token = localStorage.getItem("token")
console.log(token);
if (!token) { if (!token) {
if (to.path === '/login') { if (to.path === '/login') {
next(); next();
......
src/router/modules/index.js
...@@ -37,6 +37,5 @@ export default[ ...@@ -37,6 +37,5 @@ export default[
auth: "5" auth: "5"
}, },
component: () => import("@/views/clueQueryPage/clueQuery.vue") component: () => import("@/views/clueQueryPage/clueQuery.vue")
} },
] ]
src/utils/auth.js
...@@ -15,9 +15,8 @@ export function setToken(token, expires = 0) { ...@@ -15,9 +15,8 @@ export function setToken(token, expires = 0) {
export function removeToken() { export function removeToken() {
outLogin({}).then(res => { outLogin({}).then(res => {
console.log(res)
if(res == 'true'){ if(res == 'true'){
Message("退出登录成功");
localStorage.setItem("token",''); localStorage.setItem("token",'');
router.push({path: "/login"}); router.push({path: "/login"});
} }
......
src/utils/http.js
import axios from "axios"; import axios from "axios";
import {getToken} from "./auth.js"; import { getToken } from "./auth.js";
import {Message,MessageBox} from "element-ui"; import { Message, MessageBox } from "element-ui";
import router from "@/router"; import router from "@/router";
import store from "@/store"; import store from "@/store";
import qs from "qs"; import qs from "qs";
axios.defaults.timeout = 0; axios.defaults.timeout = 0;
axios.defaults.headers = { axios.defaults.headers = {
"X-Requested-With": "XMLHttpRequest" "X-Requested-With": "XMLHttpRequest"
}; };
//axios.defaults.responseType = "json"; //axios.defaults.responseType = "json";
// axios.defaults.withCredentials = true; // axios.defaults.withCredentials = true;
var instance = axios.create({ var instance = axios.create({
headers: {'content-type': 'multipart/form-data'}, headers: { "content-type": "multipart/form-data" }
}); });
var down = axios.create({ var down = axios.create({
headers: {'content-type': 'multipart/form-data'}, headers: { "content-type": "multipart/form-data" }
}); });
down.defaults.responseType = "arraybuffer"; down.defaults.responseType = "arraybuffer";
// request 请求拦截器 // request 请求拦截器
axios.interceptors.request.use( axios.interceptors.request.use(
config => { config => {
config.headers['Content-Type'] = 'application/x-www-form-urlencoded'; config.headers["Content-Type"] = "application/x-www-form-urlencoded";
//config.headers['Content-Type'] = 'application/json'; //config.headers['Content-Type'] = 'application/json';
console.log(config);
console.log(config); // 请求前进行拦截, 验证是否已经登录等
// 请求前进行拦截, 验证是否已经登录等 //
// // if (token) {
// if (token) { // if (config.url.indexOf("/login") === -1) {
// if (config.url.indexOf("/login") === -1) { // config.headers["Authorization"] = token;
// config.headers["Authorization"] = token; // }
// } // }
// }
//console.log(session);
//console.log(session); return config;
return config; },
}, error => {
error => { return Promise.reject(error);
return Promise.reject(error); }
}
); );
// response 响应拦截器 // response 响应拦截器
axios.interceptors.response.use( axios.interceptors.response.use(
response => { response => {
const status = response.data.code; const status = response.data.code;
const message = response.data.message; const message = response.data.message;
console.log(response); //console.log(this.$pageUrl);
//console.log(this.$pageUrl); if (response.data.code == "201") {
if(response.data.code == '201'){ MessageBox(message + ",请重新登录！", "提示", {
// Message({ confirmButtonText: "确定",
// message: message, cancelButtonText: "取消",
// type: 'error' type: "warning"
// }); }).then(() => {
MessageBox(message+',请重新登录！', '提示', { localStorage.setItem("token", "");
confirmButtonText: '确定', router.push({ path: "/login" });
cancelButtonText: '取消', }).catch(() => {
type: 'warning' });
}).then(() => { }
// this.$message({ if (status < 0) {
// type: 'success', Message({
// message: '删除成功!' message: message,
// }); type: "error"
localStorage.setItem("token",''); });
router.push({path: "/login"}); return Promise.reject(new Error(message));
}).catch(() => {});
}
if (status < 0) {
Message({
message: message,
type: "error"
});
return Promise.reject(new Error(message));
}
return response.data;
},
error => {
return Promise.reject(new Error(error));
} }
return response.data;
},
error => {
return Promise.reject(new Error(error));
}
); );
instance.interceptors.response.use( instance.interceptors.response.use(
response => { response => {
const status = response.data.code; const status = response.data.code;
const message = response.data.message; const message = response.data.message;
if (status < 0) { if (status < 0) {
Message({ Message({
message: message, message: message,
type: "error" type: "error"
}); });
return Promise.reject(new Error(message)); return Promise.reject(new Error(message));
}
return response.data;
},
error => {
return Promise.reject(new Error(error));
} }
return response.data;
},
error => {
return Promise.reject(new Error(error));
}
); );
/** /**
...@@ -109,31 +100,36 @@ instance.interceptors.response.use( ...@@ -109,31 +100,36 @@ instance.interceptors.response.use(
*/ */
export function get(url, params) { export function get(url, params) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios axios
.get(url, { .get(url, {
params: params params: params
}) })
.then(res => { .then(res => {
if (res.hasOwnProperty("data")) {
resolve(res.data); resolve(res.data);
var urlIp = window.location.host.substring( } else {
0, resolve(res);
window.location.host.length - 5 }
); // resolve(res.data);
var logs = { var urlIp = window.location.host.substring(
ip: urlIp, 0,
request: url, window.location.host.length - 5
params: params );
}; var logs = {
console.log(logs); ip: urlIp,
}) request: url,
.catch(err => { params: params
reject(err.data); };
}); console.log(logs);
}); })
.catch(err => {
reject(err.data);
});
});
} }
/** /**
* 封装post请求 * 封装post请求
* @param url * @param url
...@@ -142,27 +138,27 @@ export function get(url, params) { ...@@ -142,27 +138,27 @@ export function get(url, params) {
*/ */
export function post(url, params) { export function post(url, params) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios.post(url, qs.stringify(params)).then( axios.post(url, qs.stringify(params)).then(
response => { response => {
console.log(response); console.log(response);
resolve(response); resolve(response);
var urlIp = window.location.host.substring( var urlIp = window.location.host.substring(
0, 0,
window.location.host.length - 5 window.location.host.length - 5
); );
var logs = { var logs = {
ip: urlIp, ip: urlIp,
request: url, request: url,
params: params params: params
}; };
console.log(logs); console.log(logs);
//store.commit("user/SET_Logs", logs); //store.commit("user/SET_Logs", logs);
}).catch(err => { }).catch(err => {
reject(err.data); reject(err.data);
});
}); });
});
} }
/** /**
...@@ -172,17 +168,17 @@ export function post(url, params) { ...@@ -172,17 +168,17 @@ export function post(url, params) {
* @returns {Promise} * @returns {Promise}
*/ */
export function postform(url, data) { export function postform(url, data) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
instance.post(url, data) instance.post(url, data)
.then(response => { .then(response => {
resolve(response); resolve(response);
}) });
}).catch(err => { }).catch(err => {
//reject(err.data); //reject(err.data);
}); });
} }
/** /**
...@@ -192,14 +188,14 @@ export function postform(url, data) { ...@@ -192,14 +188,14 @@ export function postform(url, data) {
* @returns {Promise} * @returns {Promise}
*/ */
export function postdown(url, data) { export function postdown(url, data) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
down.post(url, data) down.post(url, data)
.then(response => { .then(response => {
resolve(response); resolve(response);
}) });
}).catch(err => { }).catch(err => {
//reject(err.data); //reject(err.data);
}); });
} }
export default axios; export default axios;
src/utils/util.js
...@@ -37,6 +37,13 @@ export default { ...@@ -37,6 +37,13 @@ export default {
return arr.filter(a => !res.has(a[field]) && res.set(a[field], 1)); return arr.filter(a => !res.has(a[field]) && res.set(a[field], 1));
}, },
/** /**
* 数值去重
* @param {Array} arr 数组
*/
unique1(arr) {
return Array.from(new Set(arr));
},
/**
* 判断值是否在数组中 * 判断值是否在数组中
* @param {Object} elem * @param {Object} elem
* @param {Object} arr * @param {Object} arr
......
src/views/Home.vue
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
<h3 class="title">东莞市图数视频侦查辅助平台“VGIS”</h3> <h3 class="title">东莞市图数视频侦查辅助平台“VGIS”</h3>
</div> </div>
<div class="header_right"> <div class="header_right">
<div class="user">
<i class="el-icon-user" style="margin-right: 5px"></i><span>{{user}}</span>
</div>
<div class="outLogin"> <div class="outLogin">
<el-tooltip placement="top" effect="light"> <el-tooltip placement="top" effect="light">
<div slot="content">退出登录</div> <div slot="content">退出登录</div>
...@@ -39,6 +42,7 @@ export default { ...@@ -39,6 +42,7 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
user: '',
loading: true, loading: true,
menu: ['线索管理', '', '', ''], menu: ['线索管理', '', '', ''],
judge: true, judge: true,
...@@ -61,8 +65,13 @@ export default { ...@@ -61,8 +65,13 @@ export default {
} }
}, },
handleClick(tab, event) { handleClick(tab, event) {
console.log(tab, event);
} }
},
mounted() {
let userInfo = JSON.parse(window.localStorage.getItem("user")) || "";
this.user = userInfo.trueName;
} }
}; };
</script> </script>
...@@ -125,9 +134,22 @@ export default { ...@@ -125,9 +134,22 @@ export default {
} }
.header_right { .header_right {
display: flex;
position: relative; position: relative;
left: 95%; left: 88%;
top: -105px; top: -105px;
color: #FFFFFF;
.user{
display: flex;
font-size: 14px;
align-items: center;
}
.outLogin{
font-size: 14px;
display: flex;
align-items: center;
margin-left: 30px;
}
} }
.title-container { .title-container {
......
src/views/login.vue
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
this.captcha.img = res.data.img; this.captcha.img = res.data.img;
this.captcha.img = this.captcha.img.replace(/\r\n/g, ""); this.captcha.img = this.captcha.img.replace(/\r\n/g, "");
} }
console.log(res);
}); });
}, },
toLogin() { toLogin() {
......
src/views/login/login.vue
...@@ -70,6 +70,8 @@ ...@@ -70,6 +70,8 @@
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import Videojs from 'video.js'; import Videojs from 'video.js';
import 'video.js/dist/video-js.css' import 'video.js/dist/video-js.css'
import axios from "axios";
import base from "@/api/base";
export default { export default {
...@@ -77,8 +79,8 @@ ...@@ -77,8 +79,8 @@
data() { data() {
return { return {
loginForm: { loginForm: {
username: "", username: "admin",
password: "", password: "founder4419",
}, },
loginRules: { loginRules: {
username: [ username: [
...@@ -99,7 +101,7 @@ ...@@ -99,7 +101,7 @@
}, },
created() { created() {
// window.addEventListener('storage', this.afterQRScan) // window.addEventListener('storage', this.afterQRScan)
console.log(this.$root.URL);
getTokenFromServer({}).then(res => { getTokenFromServer({}).then(res => {
console.log(res); console.log(res);
}).catch(err => { }).catch(err => {
...@@ -155,8 +157,6 @@ ...@@ -155,8 +157,6 @@
}else { }else {
this.$message.error(res.message); this.$message.error(res.message);
} }
console.log(res);
//this.$store.commit("user/SET_UserInfo", this.userInfo) //this.$store.commit("user/SET_UserInfo", this.userInfo)
}); });
}, },
......
src/views/test.vue
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
testXss({ testXss({
shsexsbh: "X4302000000002020100045" shsexsbh: "X4302000000002020100045"
}).then(res => { }).then(res => {
console.log(res);
}) })
}, },
submitUpload () { submitUpload () {
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
this.xss() this.xss()
}, },
httpRequest (data) { httpRequest (data) {
console.log(data);
// this.file = data.file // this.file = data.file
//this.getPicturePicture() //this.getPicturePicture()
}, },
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
this.fileLists = fileList this.fileLists = fileList
}, },
handlePreview (file) { handlePreview (file) {
console.log(file);
}, },
handleChange (file, fileList) { handleChange (file, fileList) {
this.fileLists.push(file) this.fileLists.push(file)
......
vue.config.js
...@@ -60,13 +60,21 @@ module.exports = { ...@@ -60,13 +60,21 @@ module.exports = {
}, },
proxy: { proxy: {
"/api1": { "/api1": {
target: "http://39.98.114.80:9017/", //统一的请求头部每次修改都要重启才会生效 target: "http://44.190.233.197:8001", //统一的请求头部每次修改都要重启才会生效
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/api1": "/" "^/api1": "/"
} }
} },
"/api2": {
target: "http://44.190.0.91:8002", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
"^/api2": "/"
}
},
} }
} }
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment