Skip to content

F
founder_vue
Commit a79e213d by wushaofei
Options

Merge branch 'gab_bz' of http://47.92.108.28/changchao/founder_vue into gab_bz

parents 4eb76021 de903a2c
Showing with 294 additions and 135 deletions
package-lock.json
......@@ -1762,6 +1762,37 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/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.1",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
"integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
"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": {
"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",
......@@ -1771,11 +1802,35 @@
"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": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.3.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz?cache=0&sync_timestamp=1624996813170&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.3.0.tgz",
"integrity": "sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -11911,63 +11966,6 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.3.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.0.tgz",
"integrity": "sha512-UDgni/tUVSdwHuQo+vuBmEgamWx88SuSlEb5fgdvHrlJSPB9qMBRF6W7bfPWSqDns425Gt1wxAUif+f+h/rWjg==",
"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.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"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",
......
src/api/cbyp.js 0 → 100644
import { get, post , postJson} from "@/utils/http.js";
export const toQueryXszxx = params =>
post("/api/cbxsz/toQueryXszxx", params);
export const queryTreeDataByType = params =>
get("/api/queryTreeDataByType", params);
src/api/dictionaryCode.js
......@@ -21,7 +21,7 @@ export const EsShrQuery = params =>
postJson("/api2/EsShrQuery", params);
export const queryDictItem = params =>
post("http://47.92.225.109:5177/dic/queryDictItem", params);
post("http://192.168.0.112:5177/dic/queryDictItem", params);
export const getDictitemByCode = params =>
post("http://47.92.225.109:5177/dic/getDictitemByCode", params);
......
src/api/home.js
......@@ -10,8 +10,7 @@ export const test = params =>
export const test1 = params =>
get("http://39.99.159.210:8051/getXyrSaxxDg", params);
export const login = params =>
post("https://uniapp.b2b2c.niuteam.cn/api/login/login", params);
export const code = params =>
post("https://uniapp.b2b2c.niuteam.cn/api/captcha/captcha", params);
export const login = params =>
post("/api/blade-auth/token", params);
src/api/zdgl.js 0 → 100644
import { get, post, postJson, postform } from "@/utils/http.js";
export const dictitemEdit = params =>
post("/api/dic/dictitemEdit", params);
export const UpdateRedisRest = params =>
post("/api/UpdateRedisRest", params);
export const xalbJoinGWDQ = params =>
post("/api/dic/xalbJoinGWDQ", params);
\ No newline at end of file
src/assets/img/title.png
src/assets/img/title.png

11.7 KB | W: | H:

src/assets/img/title.png

13 KB | W: | H:

src/assets/img/title.png
src/assets/img/title.png
src/assets/img/title.png
src/assets/img/title.png
  • 2-up
  • Swipe
  • Onion skin
src/components/bshQuery.vue
......@@ -254,7 +254,7 @@
>
<el-table-column type="expand">
<template slot-scope="props">
<span>{{props.row}}</span>
<span>{{ props.row }}</span>
<!-- <el-table
id="ajzbQuery"
v-loading="tableLoading"
......@@ -431,6 +431,7 @@ import LazySelectTreeDialog from "@c/lazy_treeCode_components.vue";
import Http from "@/utils/http.js";
import axios from "axios";
import { esAsjQuery } from "@/api/queryAj.js";
import { toQueryXszxx } from "@/api/cbyp.js";
export default {
name: "ptCxForm",
......@@ -478,9 +479,9 @@ export default {
};
},
methods: {
rowClick(row, column, event){
console.log(row, column, event);
},
rowClick(row, column, event) {
console.log(row, column, event);
},
goDetail(scope) {
this.$router.pushToTab({
path: "ajbzDetail",
......@@ -655,8 +656,13 @@ export default {
: "";
}
}
var form = new FormData();
for(let key in json){
form.append(key,json[key])
}
console.log(json)
if (flag) {
esAsjQuery(json)
toQueryXszxx(form)
.then((response) => {
if (response.status === 200) {
self.tableData = response.data;
......
src/components/formCommonPage.vue 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/lazy_treeCode_components.vue
......@@ -68,7 +68,6 @@
<script>
import Http from "@/utils/http.js";
import url from "@/api/base";
export default {
name: "treeCode_components",
props: {
......@@ -135,7 +134,8 @@ export default {
id: self.curFormData[self.curItem.id],
grade: "prev"
}
self.doQueryRequest(parm, "/queryCodeByType").then(codeResult => {
debugger
self.doQueryRequest(parm, "/api/queryTreeDataByType").then(codeResult => {
var thisCodeOptions = [];
if (codeResult.data.success) {
var codRes = codeResult.data.data.data;
......@@ -180,7 +180,7 @@ export default {
id: self.curFormData[self.curItem.id],
grade: "prev"
}
self.doQueryRequest(parm, "/queryCodeByType").then(codeResult => {
self.doQueryRequest(parm, "/api/queryTreeDataByType").then(codeResult => {
var thisCodeOptions = [];
if (codeResult.data.success) {
var codRes = codeResult.data.data.data;
......@@ -340,7 +340,7 @@ export default {
id: realFormLableAlign[realValueKey],
grade: "prev"
}
self.doQueryRequest(parm, "/queryCodeByType").then(codeResult => {
self.doQueryRequest(parm, "/api/queryTreeDataByType").then(codeResult => {
if (codeResult.data.success) {
var codRes = codeResult.data.data.data;
var codeArry = [];
......@@ -410,7 +410,7 @@ export default {
parm.id = currentNode.data.id;
parm.grade = "next"
}
self.doQueryRequest(parm, "/queryCodeByType").then(codeResult => {
self.doQueryRequest(parm, "/api/queryTreeDataByType").then(codeResult => {
if (codeResult.data.success) {
//判断是否有下级
codeResult.data.data.rows.forEach(realCodeItem => {
......@@ -428,7 +428,7 @@ export default {
doQueryRequest (form, relurl) {/*post方法*/
var currentUrl = relurl ? relurl : this.cxUrl;
return Http({
url: url.BaseURL + currentUrl,
url: currentUrl,
data: form,
params: form,
method: "get",
......
src/components/ptCxForm_components.vue
......@@ -593,10 +593,11 @@ export default {
self.propQueryField.forEach((val) => {
if (val.type == "code" || val.type == "codeTreeDialog") {
if (val.codeOptions.length == 0) {
debugger
axios
.get(`JsonData/${val.codeTree}.json`)
.then((res) => {
self.$set(val, "codeOptions", res.data.data.rows);
self.$set(val, "codeOptions", res.data.rows);
})
.catch((err) => {
console.log(err);
......
src/utils/http.js
import axios from "axios";
// import { getToken } from "./auth.js";
import { Message,MessageBox } from "element-ui";
import { Message, MessageBox } from "element-ui";
import qs from "qs";
axios.defaults.timeout = 0;
axios.defaults.headers = {
"X-Requested-With": "XMLHttpRequest"
"X-Requested-With": "XMLHttpRequest",
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
};
axios.defaults.responseType = "json";
// axios.defaults.withCredentials = true;
var instance = axios.create({
headers: { "content-type": "multipart/form-data" }
headers: { "content-type": "multipart/form-data" },
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
});
var json = axios.create({
headers: { "content-type": "application/json" }
headers: { "content-type": "application/json" },
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
});
// request 请求拦截器
axios.interceptors.request.use(
config => {
config.headers["Content-Type"] = "application/x-www-form-urlencoded";
let token = sessionStorage.getItem("token")
debugger
if (config.url.indexOf("/api/blade-auth/token") === -1) {
config.headers["blade-auth"] = token;
}
return config;
},
error => {
......
src/utils/params.js
......@@ -624,15 +624,15 @@ let jccxAjxxDefaultFormField = {
value: '',
col: '3'
},
{
name: '次类案类别',
id: 'xalbdmbcms',
type: 'code',
codeOptions: [],
codeTree: 'CODE_XALBDMBCMS',
value: '',
col: '3'
},
// {
// name: '次类案类别',
// id: 'xalbdmbcms',
// type: 'code',
// codeOptions: [],
// codeTree: 'CODE_XALBDMBCMS',
// value: '',
// col: '3'
// },
{
name: '标注状态',
id: 'bzzt',
......@@ -1972,15 +1972,15 @@ let jccxAjxxFormField = {
value: '',
col: '3'
},
{
name: '次类案类别',
id: 'xalbdmbcms',
type: 'code',
codeOptions: [],
codeTree: 'CODE_XALBDMBCMS',
value: '',
col: '3'
}
// {
// name: '次类案类别',
// id: 'xalbdmbcms',
// type: 'code',
// codeOptions: [],
// codeTree: 'CODE_XALBDMBCMS',
// value: '',
// col: '3'
// }
]
}
let jccxXyrxxDefaultFormField = {
......@@ -3835,10 +3835,10 @@ let AllAjformThead = [
label: '类案类别',
prop: 'ajxzlbMc'
},
{
label: '次类案类别',
prop: 'xalbdmbcmsMc'
},
// {
// label: '次类案类别',
// prop: 'xalbdmbcmsMc'
// },
{
label: '案事件发生地经度',
prop: 'asjfsddDqjd'
......
src/views/cbyp/bshcb.vue
......@@ -13,6 +13,7 @@
<script>
import rightContent from '@c/bshQuery.vue'
import { toQueryXszxx } from "@/api/cbyp.js";
export default {
name: 'bshcb',
components: {
......@@ -243,7 +244,22 @@ export default {
width: '220'
}
],
cxUrl: '/tbstAsj/stasj/queryAllMaAsjxx'
cxUrl: '/tbstAsj/stasj/queryAllMaAsjxx',
}
},
created(){
this.gettoQueryXszxx()
},
methods: {
gettoQueryXszxx(){
toQueryXszxx({
sEcho:1,
draw:1,
start:1,
length:10,
typeFlag:'bshcb',
cbxsly:'qs'
})
}
}
}
......
src/views/index/home.vue
<!--
* @Author: your name
* @Date: 2021-07-12 17:42:38
* @LastEditTime: 2021-07-12 21:46:32
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\index\home.vue
-->
<template>
<div id="home">
<div class="header-message">
<div class="header-admin">
<span class="img-span"></span>
<span>欢迎您：</span>
<span>河北省公安厅</span>
<span>系统管理员：</span>
</div>
<div class="header-nav">
<span class="big-tv-nav">
<img src="../../assets/img/bigTvNav.png" width="15px" height="13.4px">
</span>
<span @click="goBigTV">数据大屏</span>
</div>
</div>
<div class="title">
<img src="../../assets/img/title.png" />
</div>
<div class="nav">
<div class="navList" v-for="item in navList" :key="item.id">
<img :src="item.url" @click="goDetail(item.id)">
<img :src="item.url" @click="goDetail(item.id)" />
</div>
</div>
</div>
......@@ -15,42 +37,98 @@
export default {
data() {
return {
navList:[
{
id:'zdgl',
url: require('../../assets/img/zd.png')
},
{
id:'/queryAj',
url: require('../../assets/img/ajbz.png')
},
{
id:'bztj',
url: require('../../assets/img/bztj.png')
},
{
id:'gwrq',
url: require('../../assets/img/gwrq.png')
},
{
id:'stfx',
url: require('../../assets/img/stfx.png')
},
{
id:'/bshcb',
url: require('../../assets/img/cbyp.png')
}
]
navList: [
{
id: "/queryAj",
url: require("../../assets/img/nav1.png"), //案件标注
},
{
id: "/dwcx",
url: require("../../assets/img/nav2.png"), //标注统计
},
{
id: "/bshcb",
url: require("../../assets/img/nav3.png"), //串并研判
},
{
id: "/kshData",
url: require("../../assets/img/nav4.png"), //态势分析
},
{
id: "/bztj",
url: require("../../assets/img/nav5.png"), //高危人群
},
{
id: "/zdgl",
url: require("../../assets/img/nav6.png"), //字典管理
},
],
};
},
methods: {
goDetail(id){
this.$router.push(id)
}
goDetail(id) {
this.$router.push(id);
},
/**
* @description: 去打屏幕
* @param {*}
* @return {*}
*/
goBigTV(){
this.$router.push({
path:'/kshData'
})
}
},
};
</script>
<style scoped lang="scss">
@import "@/assets/styles/home.scss";
#home{
width: 100%;
.header-message {
color: #FFFFFF;
font-size: 14px;
height: 50px;
display: flex;
.header-admin {
display: inline-block;
width: 400px;
height: 100%;
border-radius: 32px;
margin-top: 16px;
.img-span {
display: inline-block;
width: 32px;
height: 32px;
background-color: #FFFFFF;
border-radius: 32px;
margin-left: 24px;
}
span {
vertical-align: middle;
margin-left: 16px;
}
}
.header-nav {
float: right;
flex: 1;
text-align: right;
margin-right: 40px;
margin-top: 20px;
font-size: 14px;
vertical-align: middle;
color: #FFFFFF;
cursor: pointer;
.big-tv-nav {
margin-right: 7px;
}
}
}
.title {
margin-top: 45px;
}
}
</style>
\ No newline at end of file
src/views/index/login.vue
......@@ -65,6 +65,7 @@
<script>
import { mapGetters } from "vuex";
import { login } from "@/api/home.js";
export default {
data() {
return {
......@@ -83,8 +84,22 @@ export default {
},
methods: {
handleSubmit() {
debugger
this.$router.push('/home')
login({
account:this.ruleForm2.account,
password:this.ruleForm2.password
}).then(res=>{
if(res.code == 200){
sessionStorage.setItem('token', 'bearer ' + res.data.accessToken);
sessionStorage.setItem("userInfo",JSON.stringify(res.data.data))
}else{
this.$confirm("账号或密码错误！", {
confirmButtonText: "确定",
showCancelButton: false,
type: "warning",
});
}
})
// this.$router.push('/home')
}
},
computed: {
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-07-13 10:11:15
* @LastEditTime: 2021-07-13 11:31:59
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
*/
const path = require("path");
// const CompressionPlugin = require('compression-webpack-plugin');
// const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
......@@ -58,16 +66,24 @@ module.exports = {
}
},
"/api2": {
target: "http://47.92.225.109:3002/",
target: "http://47.92.225.109:3002/",
ws: true,
changeOrigin: true,
pathRewrite: {
'^/api2': '/'
}
},
"/cbypApi": {
target: "http://47.92.225.109:8762/",
ws: true,
changeOrigin: true,
pathRewrite: {
'^/cbypApi': '/'
}
}
},
},
css: {
sourceMap: process.env.NODE_ENV === "development" ?true:false // 在开发环境下开启 CSS sourcemaps
sourceMap: process.env.NODE_ENV === "development" ? true : false // 在开发环境下开启 CSS sourcemaps
}
};
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