Skip to content

F
founder_vue
Commit 61e07903 by 刘玉帅
Options

xq

parent d1f85d05
Showing with 1183 additions and 210 deletions
public/favicon.ico
No preview for this file type
public/index.html
<!--
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-10-20 18:54:48
* @LastEditTime: 2021-11-04 14:14:37
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \uuuz\founder_vue\public\index.html
......@@ -14,10 +14,23 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title>
<link rel="stylesheet" href="../src/utils/map/FMapClient.min.css">
<link rel="stylesheet" type="text/css" href="http://172.18.71.238:8088/FMapClient8.0.6/lib/FMapClient.min.css"/>
<!-- <link rel="stylesheet" type="text/css" href="http://172.18.71.238:8088/FMapClient8.0.6/lib/FMapClient.min.css"/> -->
<script type="text/javascript" src="./lib/EzMapAPI.js"></script>
<script type="text/javascript" src="http://172.18.71.238:8088/FMapClient8.0.6/lib/FMapClient.js"></script>
<script type="text/javascript" src="./lib/FMapClient.js"></script>
<!-- <script type="text/javascript" src="http://172.18.71.238:8088/FMapClient8.0.6/lib/FMapClient.js"></script> -->
<!-- <link rel="stylesheet" href="../src/utils/map/FMapClient.min.css">
<link rel="stylesheet" type="text/css" href="http://192.168.1.135:9080/EzServerClient_bin_s/FMapClient.min.css"/>
<script type="text/javascript" src="./lib/EzMapAPI.js"></script>
<script type="text/javascript" src="http://192.168.1.135:9080/EzServerClient_bin_s/FMapClient.js"></script>
<script src="http://192.168.1.135:9080/EzServerClient_bin_s/js/EzServerClient.js" type="text/javascript" charset="gb2312" language="javascript" ></script>
<script type="text/javascript" src="http://192.168.1.135:9080/EzServerClient_bin_s/js/EzMapAPI.js"></script> -->
<script src="./lib/echarts.js"></script>
<script src="./lib/ol-echarts.js"></script>
<script src="./lib/jquery.min.js"></script>
......
public/jsonData/heatmap.json
{
"coordinates": {
"海门": [
121.15,
31.89
116.15,
39.89
],
"鄂尔多斯": [
109.781327,
116.781327,
39.608266
],
"招远": [
120.38,
1116.38,
37.35
],
"舟山": [
122.207216,
116.207216,
29.985295
],
"齐齐哈尔": [
123.97,
116.97,
47.33
],
"盐城": [
120.13,
116.13,
33.38
],
"赤峰": [
118.87,
116.87,
42.28
],
"青岛": [
......
public/lib/EzMapAPI.js
......@@ -35,10 +35,13 @@ var ezMap = {
// imageSRC: 'http://172.18.71.80:8080/images/shiliang.png',
// key: 'text'
// }],
["公司", "http://192.168.1.135:9080/EzServer/Maps/default", {
crs: '4326',
imageSRC: ''
}],
// ["sltdt", "http://110.1.6.2:3534/EzServer7/WMTS?SERVICE=WMTS", {
["sltdt", "http://172.18.71.238:8088/EzServer7/WMTS?SERVICE=WMTS&tk=f6616fa13df718e2cd6280af4c45f5a2", {
["sltdt", "http://110.1.6.2:3534/EzServer7/WMTS?SERVICE=WMTS", {
// ["sltdt", "http://172.18.71.238:8088/EzServer7/WMTS?SERVICE=WMTS&tk=f6616fa13df718e2cd6280af4c45f5a2", {
type: 'wmts',
crs: '4326',
wrapX: true,
......@@ -54,8 +57,8 @@ var ezMap = {
layers: "arcgissl12"
}
}],
// ["yxtdt", "http://110.1.6.2:3534/EzServer7/WMTS?SERVICE=WMTS", {
["yxtdt", "http://172.18.71.238:8088/EzServer7/WMTS?SERVICE=WMTS", {
["yxtdt", "http://110.1.6.2:3534/EzServer7/WMTS?SERVICE=WMTS", {
// ["yxtdt", "http://172.18.71.238:8088/EzServer7/WMTS?SERVICE=WMTS", {
type: 'wmts',
crs: '4326',
wrapX: true,
......
public/lib/FMapClient.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/App.vue
<!--
* @Author: your name
* @Date: 2021-08-27 14:30:24
* @LastEditTime: 2021-10-29 09:31:37
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \西青项目\founder_vue\src\App.vue
-->
<template>
<div id="app">
<router-view v-wechat-title="$route.meta.title"></router-view>
......@@ -8,11 +16,18 @@
export default {};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped >
/*每个页面公共css */
@import "assets/styles/main.scss";
#app {
height: 100%;
width: 100%;
}
</style>
<style>
.el-popper[x-placement^=bottom] {
max-height: 300px;
overflow: auto;
}
</style>
src/assets/jsData/demo.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-10-27 11:43:07
* @LastEditTime: 2021-10-27 11:49:10
* @LastEditors: your name
* @Description: In User Settings Edit
* @FilePath: \西青项目\founder_vue\src\assets\jsData\demo.js
*/
src/components/Upload.vue 0 → 100644
<template>
<div class="p-upload">
<el-upload
:action="action"
:file-list="fileList"
:limit="limit"
:data="data"
:http-request="handleRequest"
:on-exceed="handleExceed"
:before-upload="handleBeforeUpload"
:on-success="handleSuccess"
:before-remove="handleBeforeRemove"
:on-remove="handleRemove"
:on-error="handleError"
:list-type="listType"
ref="p-upload"
>
<template v-if="listType == 'picture-card'" v-slot:file="{ file }">
<img
class="el-upload-list__item-thumbnail"
:src="file.url"
alt=""
style="object-fit: cover"
/>
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" style="position: relative">
<el-image
class="preview-img"
style="
position: absolute;
left: 0;
top: 0;
width: 20px;
height: 36px;
"
:src="file.url"
:preview-src-list="[file.url]"
></el-image>
<!-- @click="handlePictureCardPreview(file)" -->
<i class="el-icon-zoom-in"> </i>
</span>
<span
class="el-upload-list__item-delete"
@click="handleRemoveCustom(file)"
>
<i class="el-icon-delete"></i>
</span>
</span>
</template>
<slot>
<el-button v-if="listType != 'picture-card'" size="small" type="primary"
>点击上传</el-button
>
<el-button v-else type="text">+</el-button>
</slot>
<!-- upload提供的自定义插槽 -->
<div slot="tip" class="el-upload__tip">
<slot name="tip">
<!-- 只能上传jpg,png,jpeg,gif格式的图片 -->
</slot>
</div>
</el-upload>
</div>
</template>
<script>
import {
get,
postJson,
post,
postform,
postdown,
postJsonEx,
} from "@/utils/http.js";
export default {
name: "p-upload",
props: {
action: {
required: true,
type: String,
},
"list-type": {
required: false,
type: String,
default() {
return "text";
},
},
"file-list": {
required: true,
type: Array,
default() {
return [];
},
},
limit: {
required: false,
type: Number,
default() {
return 10;
},
},
data: {
required: false,
type: Object,
default() {
return {};
},
},
"before-upload": {
required: false,
type: Function,
default() {
return function () {};
},
},
"on-success": {
required: false,
type: Function,
default() {
return function () {};
},
},
"on-error": {
required: false,
type: Function,
default() {
return function () {};
},
},
},
model: {
event: "change-file-list",
prop: "file-list",
},
methods: {
// 在请求错误时触发
handleError(err) {
this.onError(err);
},
async handleRequest(upload) {
let f = new FormData();
f.append("file", upload.file);
for (let key in upload.data) {
f.append(key, upload.data[key]);
}
// let res =await this.$http({
// url:this.action,
// method:'post',
// // data:f,
// // headers:{
// // 'Content-Type':'multipart/form-data'
// // }
// })
post(this.action, "").then((res) => {
console.log(res);
});
debugger;
// debugger
// if(res.data.code == 200){
// return Promise.resolve(res.data)
// }else{
// return Promise.reject(res.data)
// }
},
// 在选择完文件之后，执行上传文件之前触发
handleBeforeUpload(file) {
return this.beforeUpload(file);
},
handleSuccess(res, file, fileList) {
fileList[fileList.length - 1].name = res.data.fileName;
fileList[fileList.length - 1].url = res.data.url;
this.$emit("change-file-list", fileList);
this.onSuccess(res, file, fileList);
},
// 在上传的文件数量超过limit时触发
handleExceed() {
this.$notify({
title: "提示",
message: "文件最多只能上传" + this.limit + "个",
type: "error",
});
},
async handleBeforeRemove(file, fileList) {
console.log(file);
if (file.url) {
// 这里我们先询问用户是否确定要删除
let confirm = await this.$confirm(
"正在删除该文件，点击确认继续",
"提示",
{ type: "warning" }
).catch((err) => err);
if (confirm == "confirm") {
// 确定之后我们调用服务器上的删除接口
// let res =await this.$http({
// url:'/file/delete',
// params:{
// path:file.url
// },
// method:'get'
// })
// //调用完接口就返回，防止服务器上图片丢失导致本地无法删除
post(this.action, "").then((res) => {
console.log(res);
});
return true;
} else {
return Promise.reject();
}
} else {
return true;
}
},
// 在beforeRemove不被中断后执行
handleRemove(file, fileList) {
this.$emit("change-file-list", fileList);
},
async handleRemoveCustom(file) {
console.log(this.$refs["p-upload"]);
this.$refs["p-upload"].handleRemove(file);
// console.log(this.$refs['p-upload'])
// let res = await this.handleBeforeRemove(file,this.$refs['p-upload'].fileList).catch(err => err)
// if(res){
// this.handleRemove(file,this.$refs['p-upload'].fileList)
// }
},
},
};
</script>
<style scoped="scoped" lang="scss">
.p-upload {
.preview-img {
::v-deep {
.el-image__preview {
opacity: 0;
}
}
}
}
</style>
src/components/table.vue
<!--
* @Author: your name
* @Date: 2021-08-27 15:51:38
* @LastEditTime: 2021-09-28 15:58:24
* @LastEditTime: 2021-11-05 14:12:03
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\components\table.vue
......@@ -67,7 +67,7 @@
size="small"
@click="handleClick(scope.row, 'xf')"
:disabled="(scope.row.zzjgdm!=''&&scope.row.thzt!='1')"
>下发</el-button
>匹配</el-button
>
<div
class="clearimg"
......
src/router/index.js
/*
* @Author: your name
* @Date: 2021-08-27 14:30:24
* @LastEditTime: 2021-11-25 15:54:26
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \西青项目\founder_vue\src\router\index.js
*/
import Vue from "vue";
import VueRouter from "vue-router";
import store from "../store";
......@@ -44,30 +52,30 @@ const router = new VueRouter({
routes: mainRouters
});
router.beforeEach((to, from, next) => {
const token = getToken();
if (!token) {
if (to.path === '/Login/login2') {
console.log('A');
next();
}else{
next({
path:'/Login/login2'
})
}
// } else {
// console.log('B');
// next({
// path: "/login",
// query: { redirect: to.fullPath }
// });
// }
}
if (to.meta.auth < store.state.user.userAuth) {
Message.error("暂无权限");
return;
}
next();
});
// router.beforeEach((to, from, next) => {
// const token = getToken();
// if (!token) {
// if (to.path === '/Login/login2') {
// console.log('A');
// next();
// }else{
// next({
// path:'/Login/login2'
// })
// }
// // } else {
// // console.log('B');
// // next({
// // path: "/login",
// // query: { redirect: to.fullPath }
// // });
// // }
// }
// if (to.meta.auth < store.state.user.userAuth) {
// Message.error("暂无权限");
// return;
// }
// next();
// });
export default router;
\ No newline at end of file
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-10-20 14:40:51
* @LastEditTime: 2021-11-25 20:08:18
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
*/
export default [
{
export default [{
path: '/',
redirect: '/Login/login2'
},
{
path: "/Login/login2",
path: '/Login/login2/:user?/:password?',//'/Home/rwgl/rwglindex',
name: "Login",
meta: {
title: "登录",
......@@ -29,8 +28,7 @@ export default [
auth: "5"
},
component: () => import("@/views/Home.vue"),
children: [
{
children: [{
path: "rwgl",
name: "rwgl",
redirect: '/Home/rwgl/rwglindex',
......@@ -39,17 +37,18 @@ export default [
meta: {
title: "摸排任务",
auth: "5",
keepAlive: true,
},
component: () => import("@/views/rwgl/rwgl.vue"),
children: [
{
children: [{
path: "rwglindex",
name: "rwglindex",
hidden: false,
meta: {
title: "任务管理",
auth: "5"
auth: "5",
keepAlive: false,
},
component: () => import("@/views/rwgl/rwglindex.vue"),
},
......@@ -58,9 +57,9 @@ export default [
name: "rwbd",
hidden: false,
meta: {
title: "智能下派",
title: "智能匹配",
auth: "5",
},
component: () => import("@/views/rwgl/rwbd.vue"),
},
......@@ -69,7 +68,7 @@ export default [
name: "sdxfrw",
hidden: false,
meta: {
title: "手动下派",
title: "人工匹配",
auth: "5"
},
component: () => import("@/views/rwgl/sdxfrw.vue"),
......@@ -81,7 +80,7 @@ export default [
meta: {
title: "人员摸排",
auth: "5",
},
component: () => import("@/views/rwgl/rymplb.vue"),
},
......@@ -92,7 +91,7 @@ export default [
// meta: {
// title: "人员摸排列表",
// auth: "5",
// },
// component: () => import("@/views/rwgl/rymplb.vue"),
// },
......@@ -116,7 +115,7 @@ export default [
},
component: () => import("@/views/rwgl/rythfk.vue"),
},
{
path: "mptj",
name: "mptj",
......@@ -160,8 +159,7 @@ export default [
auth: "5"
},
component: () => import("@/views/tjbb.vue"),
children: [
{
children: [{
path: 'tb',
name: 'tb',
hidden: true,
......@@ -221,9 +219,23 @@ export default [
icon: './img/rhzf0.png',
meta: {
title: "入户走访",
auth: "5"
auth: "5",
keepAlive: true,
},
component: () => import("@/views/rhzf.vue"),
},
{
path: 'rybq',
name: 'rybq',
hidden: true,
meta: {
title: "人员标签",
auth: "5",
},
component: () => import("@/views/rybq.vue"),
},
{
path: 'jxkh',
......@@ -235,6 +247,17 @@ export default [
auth: "5"
},
component: () => import("@/views/jxkh.vue"),
},
{
path: 'ryda',
name: 'ryda',
hidden: true,
icon: './img/jxkh.png',
meta: {
title: "人员档案",
auth: "5"
},
component: () => import("@/views/ryda.vue"),
}
]
},
......
src/utils/http.js
......@@ -25,7 +25,8 @@ axios.defaults.responseType = "json";
var instance = axios.create({
headers: {
"content-type": "multipart/form-data"
}
},
// timeout: 1000,
});
var down = axios.create({
......@@ -35,6 +36,10 @@ var down = axios.create({
});
down.defaults.responseType = "Blob";
var Time = axios.create({
timeout: 1000,
});
// request 请求拦截器
axios.interceptors.request.use(
config => {
......@@ -57,6 +62,7 @@ axios.interceptors.request.use(
// response 响应拦截器
axios.interceptors.response.use(
response => {
console.log('响应拦截器查看',response);
const status = response.data.code;
console.log('=====', status);
const message = response.data.message;
......
src/views/Home.vue
<!--
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-10-20 14:40:28
* @LastEditTime: 2021-11-18 17:23:20
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Home.vue
......@@ -32,7 +32,7 @@
<div v-for="(menu, i) in routes" :key="i">
<el-submenu
:index="menu.name"
v-if="menu.children && menu.meta.title != '摸排统计'"
v-if="menu.children && menu.meta.title != '摸排统计' && !menu.hidden"
>
<template slot="title">
<img :src="menu.icon" alt="" />
......@@ -80,7 +80,7 @@
<el-dropdown trigger="click" @command="handleClick">
<div>
<div class="avator">
<img src="../assets/img/defaultCar.jpg" alt="" />
<img src="../assets/img/perimg.jpg" alt="" />
</div>
<div class="name">{{ userName }}</div>
</div>
......@@ -103,7 +103,10 @@
$route.path != '/Home/tjbb/tb' &&
$route.path != '/Home/tjbb/bb' &&
$route.path != '/Home/tjbb/bb2' &&
$route.path != '/Home/tjbb/dt'
$route.path != '/Home/tjbb/dt' &&
$route.path != '/Home/rhzf' &&
$route.path != '/Home/rybq' &&
$route.path != '/Home/ryda'
"
>
<div
......@@ -125,7 +128,7 @@
</div>
</div>
<!-- 路由加载 -->
<keep-alive :include="routes">
<keep-alive include="rhzf">
<router-view v-if="$route.meta.keepAlive"></router-view>
</keep-alive>
<router-view v-if="!$route.meta.keepAlive"></router-view>
......@@ -160,18 +163,37 @@ export default {
) {
this.$set(this.routes[0].children[1], "hidden", true);
// this.$set(this.routes[0].children[7], "hidden", false);
}else {
this.$set(this.routes[0].children[1], "hidden", false);
} else {
this.$set(this.routes[0].children[1], "hidden", false);
// this.$set(this.routes[0].children[7], "hidden", true);
}
if (
JSON.parse(sessionStorage.getItem("userInformation")).data.zzjglx != 13
) {
this.$set(this.routes[2], "hidden", true);
}else{
} else {
this.$set(this.routes[2], "hidden", false);
}
if (
JSON.parse(sessionStorage.getItem("userInformation")).data.zzjglx == 14
) {
this.$set(this.routes[0], "hidden", true);
// this.routes[0].children.map(item=>{
// this.$set(item, "hidden", true);
// })
this.$set(this.routes[1], "hidden", true);
// this.$set(this.routes[4], "hidden", true);
this.$set(this.routes[5], "hidden", true);
} else {
this.$set(this.routes[0], "hidden", false);
// this.routes[0].children.map(item=>{
// this.$set(item, "hidden", true);
// })
this.$set(this.routes[1], "hidden", false);
// this.$set(this.routes[4], "hidden", false);
this.$set(this.routes[5], "hidden", false);
}
},
mounted() {
this.setzzjglx();
......
src/views/Login/login2.vue
<!--
* @Author: your name
* @Date: 2021-09-08 10:36:43
* @LastEditTime: 2021-09-24 14:17:49
* @LastEditTime: 2021-11-25 15:45:16
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Login\login2.vue
......@@ -15,7 +15,8 @@
* @FilePath: \map_vue\src\components\login\login3.vue
-->
<template>
<div class="all" id="loginBox">
<!-- <div>登录.....</div> -->
<div class="all" id="loginBox" v-if="isIndexShow">
<div class="loginBox_l">
<div class="ikon">
<img :src="ikon" alt="" />
......@@ -49,12 +50,13 @@
>
</el-input>
<div class="btn">
<el-button @click="denglu" class="hbtn">登录</el-button>
<el-button @click="dengluIndex" class="hbtn">登录</el-button>
</div>
</form>
</div>
</div>
</div>
<div v-else></div>
</template>
<script>
import Vue from "vue";
......@@ -64,6 +66,7 @@ import { getToken, removeToken, setToken } from "@/utils/auth";
export default {
data() {
return {
isIndexShow : true,
ikon: require("../../assets/login/ikon.png"),
userimg: require("../../assets/login/user.png"),
username: require("../../assets/login/username.png"),
......@@ -89,14 +92,18 @@ export default {
// x.style.border = ' border: 2px solid #222;';
},
denglu() {
dengluIndex() {
this.denglu(this.username, this.password);
},
denglu(user, pass) {
this.self = this;
console.log("0");
var self = this;
self.info = "";
self.$set(self.dlList, "account", self.username);
self.$set(self.dlList, "password", self.password);
self.$set(self.dlList, "account", user);
self.$set(self.dlList, "password", pass);
// self.$set(self.dlList, "account", 'test');
// self.$set(self.dlList, "password", '123456');
self.$set(self.dlList, "grantType", "password");
self.$set(self.dlList, "tenantId", "000000");
self.$set(self.dlList, "refreshToken", "");
......@@ -137,7 +144,13 @@ export default {
// console.log(getToken());
// myJson = myJson.data[0];
// myJson.username = this.username;
this.$router.replace({ path: "/Home/rwgl/rwglindex" });
console.log(myJson.data.zzjglx);
if (myJson.data.zzjglx == "14") {
console.log("4566666666");
this.$router.replace({ path: "/Home/rhzf" });
} else {
this.$router.replace({ path: "/Home/rwgl/rwglindex" });
}
// const { href } = self.$router.resolve({
// path: "/Home/rwgl/rwglindex",
// })
......@@ -155,6 +168,37 @@ export default {
window.addEventListener("resize", function () {
zoom("loginBox");
});
// this.denglu()
// debugger
console.log('66666');
if (this.$route.params.user && this.$route.params.password) {
// debugger
console.log(this.$route.params.user ,this.$route.params.password);
this.isIndexShow = false;
this.denglu(this.$route.params.user, this.$route.params.password);
} else {
// debugger
console.log("没获取到 uer password");
this.isIndexShow = true;
this.$router.push("/Login/login2");
// debugger
// this.denglu('test',123456)
// // http://172.20.0.240:8084/#/Login/login2/test2/123456
}
},
watch: {
$route: function (to, from) {
debugger
if (this.$route.params.user && this.$route.params.password) {
this.isIndexShow = false;
this.denglu(this.$route.params.user, this.$route.params.password);
} else {
debugger
console.log("没获取到 uer password");
this.isIndexShow = true;
this.$router.push("/Login/login2");
}
},
},
};
</script>
......
src/views/rwgl/rwbd.vue
<!--
* @Author: your name
* @Date: 2021-08-28 21:28:08
* @LastEditTime: 2021-10-18 10:58:59
* @LastEditTime: 2021-11-16 16:51:00
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\rwgl\rwglindex.vue
......@@ -58,10 +58,8 @@
</el-form-item>
</div>
</el-form>
<div class="edit">
<!-- <el-button size="mini" type="primary" @click="handClick('fb')"
>发布
</el-button> -->
<!-- <div class="edit">
<el-dropdown
trigger="click"
size="small"
......@@ -75,7 +73,7 @@
<el-dropdown-item command="1" divided>发布到社区</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div> -->
<!-- <Table
:cxDefaultFormThead="cxDefaultFormThead"
:tableData="tableData"
......@@ -135,7 +133,7 @@
<img :src="clraeImg" alt="" />
</div> -->
<el-button type="text" size="small" @click="SmartDespot(scope.row)"
>比对</el-button
>智能匹配</el-button
>
</template>
</el-table-column>
......@@ -158,14 +156,38 @@
>
</el-pagination>
</div>
<!-- 比对的diolog -->
<!--智能比对的diolog -->
<el-dialog
title="提示"
:visible.sync="bddialogVisible"
width="30%"
:before-close="handleClose"
:close-on-click-modal="false"
>
<div v-if="bdShow">
<!-- <el-progress :percentage="percentageNum"></el-progress> -->
<div>
<div v-if="bdShow" style="margin-bottom: 30px">
<i class="el-icon-loading"></i>
<span>任务总数:</span><span>{{ rwTotle }}</span> <span>已完成:</span
><span>{{ rwYWC }}</span>
</div>
<div v-else style="margin-bottom: 30px">
<i class="el-icon-check"></i>
<span>智能匹配完成</span>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="bddialogVisible = false" :disabled="bdShow"
>取 消</el-button
>
<el-button
type="primary"
@click="bddialogVisible = false"
:disabled="bdShow"
>确 定</el-button
>
</span>
</div>
<!-- <div v-if="bdShow">
<i class="el-icon-loading"></i>
<span>任务比对中,请稍后......</span>
</div>
......@@ -178,7 +200,7 @@
<el-button type="primary" @click="bddialogVisible = false" :disabled="bdShow"
>确 定</el-button
>
</span>
</span> -->
</el-dialog>
<!-- 编辑的diolog -->
<el-dialog title="编辑" :visible.sync="dialogFormVisible">
......@@ -217,6 +239,8 @@ export default {
},
data() {
return {
percentageNum: 0,
bdShowIS: true,
bdShow: true,
bddialogVisible: false,
upLoadText: {}, //文件上传携带的参数
......@@ -282,9 +306,40 @@ export default {
rwmc: "",
},
rwidList: [],
timer: "",
rwTotle: "",
rwYWC: "",
};
},
beforeRouteLeave(to,from,next){
if(to.name==='rhzf'){
to.meta.keepAlive =true
}
next()
},
beforeDestroy() {
clearInterval(this.timer);
this.percentageNum = null;
},
methods: {
handleClose(done) {
if (self.rwTotle == self.rwYWC && self.rwTotle && self.rwYWC) {
done();
} else {
this.$message({
message: "智能匹配为完成....",
type: "warning",
});
}
// this.$confirm("确认停止匹配？")
// .then((_) => {
// if (self.rwTotle == self.rwYWC && self.rwTotle && self.rwYWC) {
// }
// done();
// })
// .catch((_) => {});
},
/**
* @description: 某一列鼠标移入的事件
* @param {*} row 一行的信息
......@@ -379,8 +434,8 @@ export default {
type: "success",
});
self.getList(self.selectPage);
} else if(res.code == 201){
self.bdShow = false;
} else if (res.code == 201) {
self.bdShow = false;
self.$message({
message: res.message,
type: "warning",
......@@ -388,6 +443,24 @@ export default {
}
});
self.timer = setInterval(function () {
self.bdShow = true;
post("/xqapi/rymp/progressBar", { rwid: row.rwid }).then((res) => {
if (res.code == "200") {
self.rwTotle = res.data.progressBar.total;
self.rwYWC = res.data.progressBar.ywc;
}
});
if (self.rwTotle == self.rwYWC && self.rwTotle && self.rwYWC) {
debugger;
self.bdShow = false;
clearInterval(self.timer);
}
}, 1000); //每秒打印一次i
this.$once("hook:beforeDestroy", () => {
clearInterval(self.timer);
});
//设置定时器到达 一百的时候 停止定时器
// let self = this;
// console.log(this.tableData[0].wcjd);
......
src/views/rwgl/rymplb.vue
<!--
* @Author: your name
* @Date: 2021-08-27 15:52:57
* @LastEditTime: 2021-10-19 15:20:34
* @LastEditTime: 2021-11-11 10:25:44
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\rymp.vue
......@@ -56,11 +56,18 @@
<transition name="slide-fade">
<div v-if="isSearch">
<el-form-item label="所属任务:" prop="rwmc">
<el-input
<!-- <el-input
v-model="rympForm.rwmc"
placeholder="请输入所属任务"
clearable
></el-input>
></el-input> -->
<el-autocomplete
class="inline-input"
v-model="rympForm.rwmc"
:fetch-suggestions="querySearch"
placeholder="请输入任务"
:clearable="true"
></el-autocomplete>
</el-form-item>
<el-form-item label="地址:" prop="dzxz">
<el-input
......@@ -69,6 +76,46 @@
clearable
></el-input>
</el-form-item>
<span class="ssdw">
<el-form-item
label="所属单位:"
prop="cxzzjgdm"
style="width: 50%"
>
<!-- <el-input
v-model="rympForm.cxzzjgdm"
placeholder="请输入所属单位"
clearable
></el-input> -->
<el-popover
placement="bottom"
width="400"
trigger="click"
popper-class="popper"
>
<el-tree
:props="props"
ref="tree"
lazy
:load="loadNode"
node-key="id"
:expand-on-click-node="false"
@node-click="nodeClick"
>
<span
class="tree-node"
slot-scope="{ data }"
:title="data.name"
>
<span>{{ data.name }}</span>
</span>
</el-tree>
<span slot="reference" class="tree">{{
treeName ? treeName : "--请选择--"
}}</span>
</el-popover>
</el-form-item>
</span>
</div>
</transition>
</el-form>
......@@ -536,6 +583,7 @@ export default {
address: "",
age: "",
dzxz: "",
cxzzjgdm: "",
}, //查询信息
cxDefaultFormThead: [
{
......@@ -553,13 +601,17 @@ export default {
prop: "sjh",
width: "auto",
},
{
label: "所属任务",
prop: "rwmc",
width: "auto",
},
{
label: "所属单位",
prop: "zzjgmc",
width: "auto",
},
{
label: "居住地址",
prop: "dzxz",
width: "auto",
......@@ -581,10 +633,111 @@ export default {
searchList: "", //人员摸排反馈的搜索选项
zrddisabled: false,
meMpShow: false,
list: [],
selectPage: {
limit: "10",
page: "1",
},
restaurants: [],
bh: JSON.parse(sessionStorage.getItem("userInformation")).data.zzjgdm,
mc: JSON.parse(sessionStorage.getItem("userInformation")).data.zzjgmc,
treeName: "",
treeList: "",
props: {
label: "name",
children: "child",
isLeaf: "leaf",
},
};
},
methods: {
...mapMutations(["setzzjglx"]), //调用vueX的方法修改值
//所属单位的懒加载
loadNode(node, resolve) {
let self = this;
console.log(node);
// console.log(resolve)
if (node.level === 0) {
return resolve([
{ ssjgdm: self.bh, name: this.mc },
// { name: "第一级02", id: "2" },
]);
// 这里resolve的数据是后台给的,id用于之后点击发起请求时的参数
} else {
this.getTreeChild(node.data.ssjgdm, resolve);
}
},
getTreeChild(id, resolve) {
// debugger;
console.log(id, resolve);
// 这里可以替换成向后台发起的请求修改data,为了演示我用的是写死的数据,获取到data后,resolve出去就好了
postJson("/xqapi/xjDept/selectjdzz", { ssjgdm: id }).then((res) => {
console.log(res);
// console.log({ name: res.data.rows, id: res.data.rows });
let data = res.data.rows;
if (res.code == 200) {
let arr = [];
if (data.length != "0") {
data.map((item) => {
arr.push({
ssjgdm: item.zzjgdm,
name: item.zzjgmc,
});
resolve(arr);
});
} else {
resolve([]);
}
}
});
},
/**
* @description: 懒加载的el-tree选中的数据
* @param {*} data
* @return {*}
*/
nodeClick(data) {
console.log(data);
this.treeList = data;
this.treeName = data.name;
this.$set(this.rympForm, "cxzzjgdm", data.ssjgdm);
// this.$set(this.formInline, "cxzzjglx", data.zzjglx);
},
querySearch(queryString, cb) {
var restaurants = this.restaurants;
var results = queryString
? restaurants.filter(this.createFilter(queryString))
: restaurants;
// 调用 callback 返回建议列表的数据
cb(results);
},
createFilter(queryString) {
return (restaurant) => {
return (
restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
0
);
};
},
loadAll() {
return this.list;
},
getListInput() {
let self = this;
post("/xqapi/zxrwgl/selectAllRwForPage", self.selectPage).then((res) => {
if (res.code == "200") {
// self.tableData = res.data.mpRwList;
res.data.mpRwList.map((item) => {
self.list.push({
value: item.rwmc,
rwid: item.rwid,
xtLrzzjglx: item.xtLrzzjglx,
});
});
console.log(self.list);
}
});
},
/**
* @description: 详情导出
* @param {*}
......@@ -641,7 +794,8 @@ export default {
},
})
.then((res) => {
debugger;
// debugger;
console.log(res);
const link = document.createElement("a");
let blob = new Blob([res.data], { type: "multipary/form-data" });
console.log(blob);
......@@ -654,8 +808,6 @@ export default {
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
console.log(res);
console.log(link);
});
// var list = { mpRyParam:{
// limit: 10,
......@@ -854,23 +1006,28 @@ export default {
* @return {*}
*/
onSubmit() {
console.log(this.rympForm);
if (
this.rympForm.xm ||
this.rympForm.sfzh ||
this.rympForm.rwmc ||
this.rympForm.dzxz
this.rympForm.dzxz ||
this.rympForm.cxzzjgdm
) {
this.$set(this.showList, "page", 1);
this.$set(this.showList, "xm", this.rympForm.xm);
this.$set(this.showList, "sfzh", this.rympForm.sfzh);
this.$set(this.showList, "rwmc", this.rympForm.rwmc);
this.$set(this.showList, "dzxz", this.rympForm.dzxz);
this.$set(this.showList, "cxzzjgdm", this.rympForm.cxzzjgdm);
this.getList(this.showList);
} else {
this.$set(this.showList, "xm", "");
this.$set(this.showList, "sfzh", "");
this.$set(this.showList, "rwmc", "");
this.$set(this.showList, "dzxz", "");
this.$set(this.showList, "cxzzjgdm", "");
this.getList(this.showList);
}
},
......@@ -1333,6 +1490,8 @@ export default {
},
},
mounted() {
this.getListInput();
this.restaurants = this.loadAll();
console.log(this.$axios);
this.setzzjglx();
console.log("我是vuex中存储的值", this.zzjglx);
......@@ -1574,6 +1733,34 @@ $primary-color: #055fe7;
.el-button--text {
margin-left: 21px !important;
}
.ssdw {
.tree {
-webkit-appearance: none;
background-color: #fff;
background-image: none;
border-radius: 4px;
border: 1px solid #dcdfe6;
box-sizing: border-box;
color: #606266;
display: inline-block;
font-size: inherit;
max-height: 40px;
line-height: 40px;
outline: 0;
padding: 0 15px;
transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
width: 100%;
height: 28px;
line-height: 28px;
cursor: pointer;
overflow: hidden; //溢出内容隐藏
white-space: nowrap; //强制文本在一行内显示
text-overflow: ellipsis; //当对象内文本溢出时显示省略标记
}
.el-form-item__content {
width: 30%;
}
}
}
.search {
// margin-right: 200px;
......
src/views/rwgl/sdxfrw.vue
<!--
* @Author: your name
* @Date: 2021-08-28 19:34:24
* @LastEditTime: 2021-10-18 18:01:20
* @LastEditTime: 2021-11-05 14:13:07
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\rwgl\sdxfrw.vue
......
src/views/rybq.vue 0 → 100644
<!--
* @Author: your name
* @Date: 2021-10-22 18:09:34
* @LastEditTime: 2021-11-30 13:44:27
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \西青项目\founder_vue\src\views\rwgl\rybq.vue
-->
<template>
<div>
<div class="table">
<div class="header">
<span>{{ dzxq }}</span>
<el-button @click="handleBack" size="small">返回</el-button>
</div>
<div class="tableh">
<el-scrollbar style="height: 100%">
<el-table
:data="tableData"
border
style="width: 100%"
width="auto"
:header-cell-style="{
background: '#c4ddf6',
fontWeight: 'bolder',
fontSize: '16px',
color: '#000',
'text-align': 'center',
}"
v-loading="tableLoading"
element-loading-text="拼命加载中"
:cell-style="{ 'text-align': 'center' }"
>
<el-table-column
prop=""
label="人员标签"
width="280"
show-overflow-tooltip
>
<template slot-scope="scope">
<!-- {{scope.row.yzfcs}} -->
<div class="bq bg1" v-if="scope.row.rybqlx == '红'">
<!-- ({{scope.row.bz}} -->
<span>红</span
><span style="fontsize: 12px" class="dis"
>({{ scope.row.bz }})</span
>
</div>
<div class="bq bg2" v-else-if="scope.row.rybqlx == '橙'">
<span
>橙<span style="fontsize: 12px"
>({{ scope.row.bz }})</span
></span
>
</div>
<div class="bq bg3" v-else-if="scope.row.rybqlx == '黄'">
<span
>黄<span style="fontsize: 12px"
>({{ scope.row.bz }})</span
></span
>
</div>
<div class="bq bg4" v-else-if="scope.row.rybqlx == '蓝'">
<span
>蓝<span style="fontsize: 12px"
>({{ scope.row.bz }})</span
></span
>
</div>
<div class="bq bg5" v-else-if="scope.row.rybqlx == '绿'">
<span
>绿<span style="fontsize: 12px"
>({{ scope.row.bz }})</span
></span
>
</div>
<!-- <div
class="bq bg4"
v-else-if="
scope.row.yzfcs == 1 && Math.ceil(Math.random() * 10) < 5
"
>
<span>蓝</span>
</div>
<div class="bq bg5" v-else>
<span>绿</span>
</div> -->
<!-- <div class="bq bg5" v-if="scope.row.yzfcs== 20">
<span>红</span>
</div> -->
</template>
</el-table-column>
<el-table-column prop="yzfcs" label="应走访人次" width="auto">
</el-table-column>
<el-table-column prop="sjzfcs" label="实走访次数" width="auto">
</el-table-column>
<el-table-column prop="xm" label="姓名" width="auto">
</el-table-column>
<!-- <el-table-column prop="zjhm" label="证件号码" width="auto">
</el-table-column> -->
<el-table-column prop="nl" label="年龄" width="auto">
</el-table-column>
<el-table-column prop="xbdm" label="性别" width="auto">
</el-table-column>
<el-table-column prop="lxfs" label="联系方式" width="150px">
</el-table-column>
<el-table-column prop="zxsj" label="最新走访时间" width="200px">
</el-table-column>
<el-table-column prop="" label="操作" width="auto">
<template slot-scope="scope">
<el-button
@click="handleClick(scope.row)"
type="text"
size="small"
style="font-weight: bolder; font-size: 15px"
>档案</el-button
>
</template>
</el-table-column>
</el-table>
</el-scrollbar>
</div>
<div
style="margin-top: 0px; display: flex; justify-content: space-between"
>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage2"
:page-sizes="[10, 50, 100, 500]"
:page-size="page_size"
layout=" total,sizes, prev, pager, next"
:total="tableDataLength"
>
</el-pagination>
<!-- <el-button @click="handleBack">返回</el-button> -->
</div>
</div>
</div>
</template>
<script>
import {
get,
postJson,
post,
postform,
postdown,
postJsonEx,
} from "@/utils/http.js";
import { hjlx, xb, whcd, mz, zzmm } from "@/assets/jsData/DictionaryCode.js";
export default {
data() {
return {
srk:{},
tableLoading: false, //页面table加载loding
dzxq: "",
currentPage2: 1, //表格页码
page_size: 10, //每页显示多少条
tableDataLength: 0, //当前页面总条数
bg5: true,
tableData: [
// {
// yzfcs: "20",
// sjzfcs: "0",
// xm: "张三",
// zjhm: "110110110",
// xb: "男",
// jzd: "哈尔滨南岗区王岗镇东方新天地3栋一单元1603",
// },
],
SearchList: {
dzysid: "",
page: "1",
limit: "10",
},
};
},
methods: {
handleBack() {
console.log(this.srk);
this.$router.push({
name: "rhzf",
params: { _t: this.srk },
});
},
handleClick(row) {
// {zjhm:row.zjhm,ryid:row.ryid,dzysid:row.dzysid}
this.$router.push({
path: "ryda",
query: { row: JSON.stringify(row) },
});
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.$set(this.SearchList, "limit", val);
this.getList(this.SearchList);
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.$set(this.SearchList, "page", val);
this.getList(this.SearchList);
},
ages(str) {
var r = str.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/);
if (r == null) return false;
var d = new Date(r[1], r[3] - 1, r[4]);
if (
d.getFullYear() == r[1] &&
d.getMonth() + 1 == r[3] &&
d.getDate() == r[4]
) {
var Y = new Date().getFullYear();
return Y - r[1];
}
return "输入的日期格式错误！";
},
getList(form) {
let self = this;
self.tableLoading = true;
postJson("/xqapi/rhzf/queryRhryAll", form).then((res) => {
console.log(res);
if (res.code == 200) {
this.tableData = res.data.rows;
xb.map((item) => {
self.tableData.map((item2) => {
if (item2.xbdm == item.id) {
self.$set(item2, "xbdm", item.text);
}
});
});
self.tableData.map((item) => {
self.$set(item, "nl", self.ages(item.csrq));
console.log(self.ages(item.csrq));
});
console.log(xb);
console.log(self.tableData);
this.tableDataLength = res.data.total;
self.tableLoading = false;
}
});
},
},
mounted() {
// debugger
this.dzxq = this.$route.query.dzxq;
this.SearchList.dzysid = this.$route.query.dzysid;
// this.srk = JSON.parse(this.$route.query.srk);
console.log(this.$route.query.dzysid);
// console.log(this.srk);
if (this.$route.query.dzysid) {
// debugger
this.getList(this.SearchList);
} else {
debugger;
// console.log('45454545');
this.$router.push({
name: "rhzf",
params: "",
});
}
},
};
</script>
<style lang="scss" scoped>
.table {
width: 80%;
margin: 0 auto;
.tableh /deep/ {
height: 700px;
.el-scrollbar__wrap {
overflow-x: hidden;
}
}
.el-scrollbar__wrap {
overflow-x: hidden;
}
.dis {
display: -webkit-box; /*作为弹性伸缩盒子模型显示*/
-webkit-line-clamp: 1; /*显示的行数；如果要设置2行加...则设置为2*/
overflow: hidden; /*超出的文本隐藏*/
text-overflow: ellipsis; /* 溢出用省略号*/
-webkit-box-orient: vertical; /*伸缩盒子的子元素排列：从上到下*/
}
.bq {
width: 257px;
height: 33px;
padding: 0 10px;
box-sizing: border-box;
text-align: center;
border-radius: 5px;
display: flex;
align-items: center;
justify-content: center;
color: rgb(255, 255, 255);
}
.header {
display: flex;
margin: 20px 0px;
color: #e15b5b;
font-weight: bolder;
font-size: 18px;
span {
margin: 0 auto;
}
}
.bg1 {
background: #e21515;
}
.bg2 {
background: #c06b39;
}
.bg3 {
background: #c0b339;
}
.bg4 {
background: #396fc0;
}
.bg5 {
background: #47c039;
}
}
</style>>
src/views/sjwgh.vue
<!--
* @Author: your name
* @Date: 2021-08-28 19:38:23
* @LastEditTime: 2021-10-18 10:14:21
* @LastEditTime: 2021-11-05 14:02:08
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\sjwgh.vue
......@@ -51,8 +51,8 @@
<el-button type="text" size="mini" @click="handSerchShow('unfold')"
>{{ isSearch ? "收起" : "展开 " }}
<i v-if="!isSearch" class="el-icon-arrow-up el-icon--right"></i>
<i v-else class="el-icon-arrow-down el-icon--right"></i>
<i v-if="!isSearch" class="el-icon-arrow-down el-icon--right"></i>
<i v-else class="el-icon-arrow-up el-icon--right"></i>
</el-button>
</el-form-item>
</div>
......
src/views/tjbb/dt.vue
<!--
* @Author: your name
* @Date: 2021-08-31 15:25:21
* @LastEditTime: 2021-10-08 16:08:54
* @LastEditTime: 2021-11-04 11:37:41
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb\dt.vue
......@@ -9,62 +9,54 @@
<template>
<div class="dt">
<div class="left">
<div class="title">
辖区各类数据地图展示
</div>
<div class="title">辖区各类数据地图展示</div>
<div class="map" id="leftMap"></div>
</div>
<div class="right">
<div class="title">
辖区各类数据地图展示
</div>
<div class="title">辖区各类数据地图展示</div>
<div class="map" id="rightMap"></div>
</div>
</div>
</template>
<script>
import heatmap from '@/utils/heatmap.json';
import heatmap from "@/utils/heatmap.json";
export default {
data () {
data() {
return {
leftMap: null,
rightMap: null
}
rightMap: null,
};
},
mounted () {
this.leftMap = new EzMap('leftMap')
this.leftMap.centerAndZoom(new EzCoord(117.013949, 39.141591), 14)
//删除EzMapAPI中配置的原始图层
var tileLayers = this.leftMap.getTileLayers().getLayers();
tileLayers.clear();
mounted() {
this.leftMap = new EzMap("leftMap");
this.leftMap.centerAndZoom(new EzCoord(117.013949, 39.141591), 14);
//删除EzMapAPI中配置的原始图层
// var tileLayers = this.leftMap.getTileLayers().getLayers();
// tileLayers.clear();
//TDT官网URL配置
var tdtimageurl = mapOptions.groupLayers.tdtimageurl;
var tdtAnnotationurl = mapOptions.groupLayers.tdtAnnotationurl;
//TDT官网URL配置
// var tdtimageurl = mapOptions.groupLayers.tdtimageurl;
// var tdtAnnotationurl = mapOptions.groupLayers.tdtAnnotationurl;
//使用XYZ格式图层加载TDT地图数据服务
var tdtimage = new EzTileLayerXYZ("tdtImage", tdtimageurl, {
projection: mapOptions.groupLayers.tdtProjection,
});
var tdtannotation = new EzTileLayerXYZ(
"tdtAnnotation",
tdtAnnotationurl,
{
projection: mapOptions.groupLayers.tdtProjection,
}
);
//使用XYZ格式图层加载TDT地图数据服务
// var tdtimage = new EzTileLayerXYZ("tdtImage", tdtimageurl, {
// projection: mapOptions.groupLayers.tdtProjection,
// });
// var tdtannotation = new EzTileLayerXYZ("tdtAnnotation", tdtAnnotationurl, {
// projection: mapOptions.groupLayers.tdtProjection,
// });
//使用图层组合并上面两个图层(注记+图层),Note:图层向下放在数组的首位
var tdtgroup = new EzLayerGroup({
layers: [tdtimage, tdtannotation],
});
this.leftMap.addLayer(tdtgroup);
// //使用图层组合并上面两个图层(注记+图层),Note:图层向下放在数组的首位
// var tdtgroup = new EzLayerGroup({
// layers: [tdtimage, tdtannotation],
// });
// this.leftMap.addLayer(tdtgroup);
window.rightMap = new EzMap('rightMap')
window.rightMap.centerAndZoom(new EzCoord(113.53450137499999, 34.44104525), 4)
window.rightMap.centerAndZoom(new EzCoord(117.013949, 39.141591), 14)
$.getJSON('./jsonData/heatmap.json', function (response) {
console.log(response);
console.log(response);
var convertData = function (data) {
console.log(data)
var res = [];
......@@ -110,44 +102,45 @@ export default {
var echartslayer = new EchartsLayer(options);
echartslayer.appendTo(window.rightMap);
});
},
}
};
</script>
<style lang="scss" scoped>
.dt {
display: flex;
.left {
width: 50%;
.title {
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
}
.map {
margin-top: 16px;
width: 94%;
height: calc(100vh - 450px);
background: rgba(0, 0, 0, 0.1);
border-radius: 8px;
}
}
.right {
width: 50%;
.title {
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
}
.map {
margin-top: 16px;
width: 94%;
height: calc(100vh - 450px);
background: rgba(0, 0, 0, 0.1);
border-radius: 8px;
}
}
display: flex;
.left {
width: 50%;
.title {
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
}
.map {
margin-top: 16px;
width: 94%;
height: calc(100vh - 450px);
background: rgba(0, 0, 0, 0.1);
border-radius: 8px;
}
}
.right {
width: 50%;
.title {
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
}
.map {
margin-top: 16px;
width: 94%;
height: calc(100vh - 450px);
background: rgba(0, 0, 0, 0.1);
border-radius: 8px;
}
}
}
</style>
\ No newline at end of file
src/views/tjbb/tb.vue
<!--
* @Author: your name
* @Date: 2021-08-31 15:24:48
* @LastEditTime: 2021-10-13 10:39:59
* @LastEditTime: 2021-11-05 16:16:58
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb\tb.vue
......@@ -117,6 +117,7 @@ export default {
this.searchGxqmprs();
this.searchRymppm();
this.searchLyd();
// this.initEcharts();
// this.initPieFirst(this.rympfkl)
// this.initPieSecond();
......@@ -180,7 +181,8 @@ export default {
});
}
if (this.rympPpl.length != 0) {
this.rymppplloading = true;
// debugger
this.rymppplloading = false;
this.initPieThird(this.rympPpl);
}
// console.log(this.rympPpl);
......@@ -204,13 +206,12 @@ export default {
self.Gxqmprs.push({ value: item.count, name: item.name });
});
}
debugger
if (self.Gxqmprs.length != 0) {
self.initPieSecond(self.Gxqmprs);
self.gxqmprsloading = false;
console.log('_+_+_+_+_+_+_+888', self.gxqmprsloading);
} else if (self.Gxqmprs.length == 0) {
self.initPieSecond(self.Gxqmprs);
// self.initPieSecond(self.Gxqmprs);
self.gxqmprsloading = true;
console.log('_+_+_+_+_+_+_+', self.gxqmprsloading);
}
......@@ -231,6 +232,7 @@ export default {
xtLrzzjglx:this.xtLrzzjglx
}).then((res) => {
// console.log(res);
console.log(res);
if (res.code == "200") {
this.Rymppmname = [];
this.Rymppmth = [];
......@@ -246,27 +248,22 @@ export default {
this.Rymppmyfk.push(item.yfk);
});
}
if (this.Rymppmname.length > 0) {
// debugger
if (this.Rymppmname.length > 0 || this.Rymppmth>0 ||this.Rymppmwfk>0||this.Rymppmxf>0||this.Rymppmyfk>0) {
this.loading = false;
this.initEcharts();
} else if (this.Rymppmname.length == 0) {
this.loading = true;
this.initEcharts();
// this.initEcharts();
}
// console.log(this.Rymppmname);
// console.log(this.Rymppmth);
// console.log(this.Rymppmwfk);
// console.log(this.Rymppmxf);
// console.log(this.Rymppmyfk);
console.log( this.loading);
console.log(this.Rymppmname);
console.log(this.Rymppmth);
console.log(this.Rymppmwfk);
console.log(this.Rymppmxf);
console.log(this.Rymppmyfk);
}
// if (res.code == "200") {
// res.data.rows.map((item) => {
// this.Rymppm.push({ value: item.count, name: item.name });
// });
// this.initEcharts(this.Rymppm);
// console.log(this.Rymppm);
// // res.data.rows.
// }
});
},
/**
......@@ -292,7 +289,7 @@ export default {
this.initPieFourth(this.lyd);
} else if (this.lyd.length == 0) {
this.lydloading = true;
this.initPieFourth(this.lyd);
// this.initPieFourth(this.lyd);
}
}
});
......@@ -350,6 +347,12 @@ export default {
// "李七庄街",
// "精武镇",
// "精武镇",
// "精武镇",
// "精武镇",
// "精武镇",
// "精武镇",
// "精武镇",
// "精武镇",
// ],
data: this.Rymppmname,
axisLine: {
......@@ -369,7 +372,7 @@ export default {
type: "bar",
// data: [
// 18203, 23489, 29034, 104970, 131744, 630230, 104970, 131744,
// 630230,
// 630230,18203, 23489, 29034, 104970, 131744, 630230, 104970,
// ],
data: this.Rymppmxf,
color: "#4D97FF",
......@@ -404,6 +407,8 @@ export default {
data: this.Rymppmth,
color: "#FC6864",
},
],
};
// LeftmyChart.hideLoading();
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-10-19 14:50:29
* @LastEditTime: 2021-10-29 11:31:17
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
......@@ -86,24 +86,24 @@ module.exports = {
'^/api': '/'
}
},
// "/xqapi": {
// target: "http://192.168.1.137:9022/", //打包时候的路径
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/xqapi': '/'
// }
// },
"/xqapi": {
target: "http://10.96.9.145:9022/", //打包时候的路径（另一个版本 ）
target: "http://192.168.1.137:9022/", //打包时候的路径
ws: true,
changeOrigin: true,
pathRewrite: {
'^/xqapi': '/'
}
},
// "/xqapi": {
// target: "http://10.96.9.145:9022/", //打包时候的路径（另一个版本 ）
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/xqapi': '/'
// }
// },
"/xqapi": {
target: "http://39.99.155.173:8022/", //统一的请求头部每次修改都要重启才会生效http://39.99.155.173:8022/
target: "http://39.99.155.173:8022/", //测试路径 统一的请求头部每次修改都要重启才会生效http://39.99.155.173:8022/
ws: true,
changeOrigin: true,
pathRewrite: {
......
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