Skip to content

F
founder_vue
Commit 02581c32 by 刘玉帅
Options

xq

parent 8c575169
Showing with 513 additions and 216 deletions
src/api/base.js
/*
* @Author: your name
* @Date: 2021-08-27 14:30:24
* @LastEditTime: 2021-10-18 18:17:45
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \西青项目\founder_vue\src\api\base.js
*/
var relUrlIp = window.location.host.substring(
0,
window.location.host.length - 5
);
console.log('ip', relUrlIp);
let base = {
BaseURL: '', //西青IP
bigurl: "",
mapurl: "",
bigwfwurl: "",
......@@ -16,61 +26,41 @@ let base = {
ebss: "",
test: ""
};
if (
relUrlIp == "68.174.69.46" ||
relUrlIp == "68.175.7.118" ||
relUrlIp == "65.65.100.205" ||
relUrlIp == "68.175.7.150" ||
relUrlIp == "68.175.7.95" ||
relUrlIp == "68.174.25.98" ||
relUrlIp == "68.175.7.120"
) {
//地图后台服务路径 公安网
base.XingZhen = "http://68.174.69.95";
base.mapurl = "http://68.174.25.99:8051";
/*登陆*/
base.Ptlogin = "http://68.174.25.99:8061";
base.ebss = "http://68.174.25.107:8090";
/*脑图服务旧 公安网*/
base.bigurl = "http://77.1.24.51:8080";
/*东莞智通服务*/
base.ZhiTu_url = "http://39.99.159.210:8053";
/*脑图微服务新*/
base.bigwfwurl = "http://77.1.24.51:8050";
/*以图搜图*/
base.naotuurl = "http://47.92.226.24:8051";
base.bigservicesurl = "http://77.1.24.51:9040";
base.naotuPath = "http://68.174.25.90:8101";
/*阿里云ip*/
base.alyIP = "47.92.48.137";
} else if (relUrlIp == "47.92.48.137") {
debugger;
//地图后台服务路径
base.XingZhen = "http://68.174.69.95";
base.mapurl = "http://47.92.48.137:8050";
base.bigurl = "http://47.92.48.137:8080";
base.bigwfwurl = "http://47.92.225.109:8050";
base.bigservicesurl = "http://47.92.225.109:9040";
base.naotuPath = "http://47.92.48.137:9099";
base.naotuurl = "http://39.99.159.210:8051";
base.ZhiTu_url = "http://39.99.159.210:8053";
/*阿里云ip*/
base.alyIP = "47.92.48.137";
base.test = "http://39.99.159.210:8052";
} else {
if (relUrlIp == "192.168.1.137") {
//---------------------------本地测试---------------------
base.BaseURL = '/xqapifw'
}
// else if (relUrlIp == "47.92.48.137") {
// // debugger;
// // //地图后台服务路径
// // base.XingZhen = "http://68.174.69.95";
// // base.mapurl = "http://47.92.48.137:8050";
// // base.bigurl = "http://47.92.48.137:8080";
// // base.bigwfwurl = "http://47.92.225.109:8050";
// // base.bigservicesurl = "http://47.92.225.109:9040";
// // base.naotuPath = "http://47.92.48.137:9099";
// // base.naotuurl = "http://39.99.159.210:8051";
// // base.ZhiTu_url = "http://39.99.159.210:8053";
// // /*阿里云ip*/
// // base.alyIP = "47.92.48.137";
// // base.test = "http://39.99.159.210:8052";
// }
else {
//---------------------------打包后台地址------------------
base.BaseURL = '/xqapi'
//地图后台服务路径
base.XingZhen = "http://192.168.1.110";
base.mapurl = "http://39.99.159.210:8051";
base.bigurl = "http://47.92.48.137:8080";
base.bigwfwurl = "http://47.92.225.109:8050";
base.bigservicesurl = "http://47.92.225.109:9040";
base.naotuPath = "http://47.92.48.137:9099";
base.naotuurl = "http://39.99.159.210:8051";
base.ZhiTu_url = "http://39.99.159.210:8053";
base.Ptlogin = "http://39.99.159.210:8052";
/*阿里云ip*/
base.alyIP = "localhost";
base.test = "http://39.99.159.210:8052";
// base.XingZhen = "http://192.168.1.110";
// base.mapurl = "http://39.99.159.210:8051";
// base.bigurl = "http://47.92.48.137:8080";
// base.bigwfwurl = "http://47.92.225.109:8050";
// base.bigservicesurl = "http://47.92.225.109:9040";
// base.naotuPath = "http://47.92.48.137:9099";
// base.naotuurl = "http://39.99.159.210:8051";
// base.ZhiTu_url = "http://39.99.159.210:8053";
// base.Ptlogin = "http://39.99.159.210:8052";
// /*阿里云ip*/
// base.alyIP = "localhost";
// base.test = "http://39.99.159.210:8052";
}
export default base;
export default base;
\ No newline at end of file
src/components/Icons.vue
<!--
* @Author: your name
* @Date: 2021-08-31 12:55:41
* @LastEditTime: 2021-09-27 17:28:56
* @LastEditTime: 2021-10-12 10:59:38
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\components\Icons.vue
......@@ -74,10 +74,11 @@ export default {
thzs: null,
wcl: null,
rwid: "",
xtLrzzjglx:''
};
},
mounted() {
postJson("/xqapi/rymptj/selectRympJcxxtj", { rwid: this.rwid }).then(
postJson("/xqapi/rymptj/selectRympJcxxtj", { rwid: this.rwid ,xtLrzzjglx:this.xtLrzzjglx}).then(
(res) => {
if ((res.code = "200")) {
if (res.data) {
......@@ -106,7 +107,8 @@ export default {
//eventbus传值
this.$bus.on("selectValue", (msg) => {
this.rwid = msg.rwid;
postJson("/xqapi/rymptj/selectRympJcxxtj", { rwid: this.rwid }).then(
this.xtLrzzjglx = msg.xtLrzzjglx;
postJson("/xqapi/rymptj/selectRympJcxxtj", { rwid: this.rwid ,xtLrzzjglx:this.xtLrzzjglx}).then(
(res) => {
if ((res.code = "200")) {
if (res.data) {
......
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-09-28 12:37:09
* @LastEditTime: 2021-10-18 18:00:32
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -65,7 +65,7 @@ export default [
component: () => import("@/views/rwgl/rwbd.vue"),
},
{
path: "/Home/rwgl/sdxfrw/:id/:type",
path: "/Home/rwgl/sdxfrw/:id/:type/:rwlx?",
name: "sdxfrw",
hidden: false,
meta: {
......@@ -75,7 +75,7 @@ export default [
component: () => import("@/views/rwgl/sdxfrw.vue"),
},
{
path: "/Home/rwgl/rymplb/:id/:type",
path: "/Home/rwgl/rymplb/:id/:type/:rwlx?",
name: "rymplb",
hidden: false,
meta: {
......@@ -128,6 +128,16 @@ export default [
component: () => import("@/views/rwgl/mptj.vue"),
},
{
path: "zxmp",
name: "zxmp",
hidden: false,
meta: {
title: "自行摸排",
auth: "5"
},
component: () => import("@/views/rwgl/zxmp.vue"),
},
{
path: "rwthcl",
name: "rwthcl",
hidden: true,
......
src/utils/http.js
import axios from "axios";
import route from '../router/index'
import {
getToken
} from "./auth.js";
......@@ -32,7 +33,7 @@ var down = axios.create({
"content-type": "multipart/form-data"
}
});
down.defaults.responseType = "arraybuffer";
down.defaults.responseType = "Blob";
// request 请求拦截器
axios.interceptors.request.use(
......@@ -63,7 +64,7 @@ axios.interceptors.response.use(
0,
window.location.host.length - 5
);
console.log('88888', relUrlIp);
console.log('88888', window.location.host);
var self = this
if (status == "401") {
MessageBox.confirm("系统登录超时，请重新登录", "提示", {
......@@ -72,12 +73,13 @@ axios.interceptors.response.use(
type: "warning",
})
.then((res) => {
if (relUrlIp == '172.20.0.240') {
// window.open('http://47.92.225.109:8300/#/login', '_blank')
window.location.href = 'http://172.20.0.240:8083/#/Login/login2';
} else if (relUrlIp == '192.168.1.137') {
window.location.href = 'http://192.168.1.137:9022/#/Login/login2';
}
route.replace({ path: "/Login/login2" });
// if (relUrlIp == '172.20.0.240') {
// // window.open('http://47.92.225.109:8300/#/login', '_blank')
// // window.location.href = 'http://172.20.0.240:8083/#/Login/login2';
// } else if (relUrlIp == '192.168.1.137') {
// window.location.href = 'http://192.168.1.137:9022/#/Login/login2';
// }
// } else if (relUrlIp == '10.142.16.177') {
// window.location.href = 'http://10.142.16.177:8050/#/login';
// } else {
......@@ -189,6 +191,28 @@ export function postJson(url, data) {
reject(err.data);
});
};
/**
* 请求文件 json格式
* @param url
* @param data
* @returns {Promise}
*/
export function postJsonEx(url, data) {
return new Promise((resolve, reject) => {
// axios.post(url, data)
axios({
url: url,
method: "POST",
data: data,
responseType: "blob",
})
.then(response => {
resolve(response);
})
}).catch(err => {
reject(err.data);
});
};
/**
* 封装post请求 multipart/form-data
......
src/views/Home.vue
<!--
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-09-28 12:47:40
* @LastEditTime: 2021-10-09 16:41:07
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Home.vue
......@@ -39,15 +39,24 @@
<span v-show="!isCollapse">{{ menu.meta.title }}</span>
</template>
<div v-for="(item, index) in menu.children" :key="index">
<el-menu-item v-if="!item.hidden" :index="item.name" :disabled='item.meta.title=="智能下派" && zzjglx!="11"'>{{
item.meta.title
}}</el-menu-item>
<el-menu-item
v-if="!item.hidden"
:index="item.name"
:disabled="item.meta.title == '智能下派' && zzjglx != '11'"
>{{ item.meta.title }}</el-menu-item
>
</div>
</el-submenu>
<el-menu-item :index="menu.name" v-else :disabled='menu.meta.title =="数据网格化" && zzjglx!="13"'>
<img :src="menu.icon" alt="" />
<span slot="title">{{ menu.meta.title }}</span>
</el-menu-item>
<template v-else>
<el-menu-item
:index="menu.name"
v-if="!menu.hidden"
:disabled="menu.meta.title == '数据网格化' && zzjglx != '13'"
>
<img :src="menu.icon" alt="" />
<span slot="title">{{ menu.meta.title }}</span>
</el-menu-item>
</template>
</div>
<div class="fz">
<img src="../assets/img/logo.png" alt="" />
......@@ -68,7 +77,7 @@
<div class="circle"></div>
</div> -->
<!-- <div class="name">{{ userName }}</div> -->
<el-dropdown trigger="click" @command="handleClick" >
<el-dropdown trigger="click" @command="handleClick">
<div>
<div class="avator">
<img src="../assets/img/defaultCar.jpg" alt="" />
......@@ -76,9 +85,9 @@
<div class="name">{{ userName }}</div>
</div>
<el-dropdown-menu slot="dropdown" >
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="exit">
<span style="display: block" >退出登录</span>
<span style="display: block">退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -126,8 +135,8 @@
</template>
<script>
import { mapGetters,mapMutations, mapState } from "vuex";
import { getToken ,removeToken} from "../utils/auth";
import { mapGetters, mapMutations, mapState } from "vuex";
import { getToken, removeToken } from "../utils/auth";
import Bus from "@/utils/Bus.js";
import indexRoutes from "@/router/modules/index";
......@@ -144,6 +153,26 @@ export default {
userName: "admin",
};
},
created() {
console.log(this.routes);
if (
JSON.parse(sessionStorage.getItem("userInformation")).data.zzjglx != 11
) {
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);
// 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{
this.$set(this.routes[2], "hidden", false);
}
},
mounted() {
this.setzzjglx();
// console.log(JSON.parse(window.sessionStorage.getItem('userInformation')).data.userName);
......@@ -162,21 +191,20 @@ export default {
// }
},
methods: {
...mapMutations(["setzzjglx"]), //调用vueX的方法修改值
async handleClick(command){
if(command == 'exit'){
let res = await this.$confirm('正在退出系统','提示',{
type:'warning',
}).catch(err => err)
if(res == 'confirm'){
removeToken()
delete sessionStorage.userInformation;
delete sessionStorage.token;
this.$router.replace('/Login/login2')
}
}
},
...mapMutations(["setzzjglx"]), //调用vueX的方法修改值
async handleClick(command) {
if (command == "exit") {
let res = await this.$confirm("正在退出系统", "提示", {
type: "warning",
}).catch((err) => err);
if (res == "confirm") {
removeToken();
delete sessionStorage.userInformation;
delete sessionStorage.token;
this.$router.replace("/Login/login2");
}
}
},
/**
* @description: 调回任务管理
* @param {*}
......@@ -201,7 +229,6 @@ export default {
} else {
this.$router.push({ name: index });
}
},
/**
* @description: 关闭标签
......@@ -209,7 +236,6 @@ export default {
* @return {*}
*/
closePaths(pathName) {
debugger;
let res = this.paths.filter((item) => {
return item.name != pathName;
......@@ -239,16 +265,12 @@ export default {
this.isCollapse = !this.isCollapse;
Bus.$emit("isCollapse", this.isCollapse);
},
handleOpen(key, keyPath) {
},
handleClose(key, keyPath) {
},
handleOpen(key, keyPath) {},
handleClose(key, keyPath) {},
},
computed: {
...mapGetters(["defaultGoodsImage", "userAuth"]),
...mapState(["zzjglx"]),
...mapState(["zzjglx"]),
},
watch: {
$route(newValue, oldValue) {
......@@ -362,6 +384,8 @@ export default {
flex: 1;
display: flex;
flex-direction: column;
overflow: auto;
max-height: calc(100vh - 10px);
.header {
height: 64px;
background: #ffffff;
......
src/views/jxkh.vue
<!--
* @Author: your name
* @Date: 2021-08-28 19:38:56
* @LastEditTime: 2021-08-28 19:38:57
* @LastEditTime: 2021-10-09 17:56:06
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\jxkh.vue
-->
<template>
<div>
绩效考核
</div>
<div>
绩效考核
<div class="container">
<div class="item a">
<p>A</p>
<p>width:300</p>
<p>flex-shrink: 1</p>
</div>
<div class="item b">
<p>B</p>
<p>width:150</p>
<p>flex-shrink: 2</p>
</div>
<div class="item c">
<p>C</p>
<p>width:200</p>
<p>flex-shrink: 3</p>
</div>
</div>
</div>
</template>
<script>
export default {
}
export default {
data() {
return {
List: [
{ name: "海门", value: 9, xpos: 121.15, ypos: 31.89 },
{ name: "鄂尔多斯", value: 12, xpos: 110.15, ypos: 66.66 },
],
tbList: { coordinates: {}, attr: [] },
};
},
methods: {
clsj() {
for (const key of this.List) {
this.$set(this.tbList.coordinates, key.name, [key.xpos, key.ypos]);
this.tbList.attr.push({ name: key.name, value: key.value });
// this.tbList.coordinates[key.name]
console.log(this.tbList);
// console.log(key);
}
this.tbList.coordinates;
},
},
mounted() {
this.clsj();
},
};
</script>
<style lang="scss" scoped>
.container {
margin:10px;
display: flex;
width: 500px;
height: 200px;
background-color: #eee;
color: #666;
text-align:center;
}
.item {
height: 100px;
}
.item p {
margin: 0;
}
.a{
width: 300px;
flex-grow: 1;
flex-shrink: 1;
background-color:#ff4466;
}
.b{
width: 150px;
flex-shrink: 2;
background-color:#42b983;
}
.c{
width: 200px;
flex-shrink: 3;
background-color:#61dafb;
}
</style>
\ No newline at end of file
src/views/rwgl/rwbd.vue
<!--
* @Author: your name
* @Date: 2021-08-28 21:28:08
* @LastEditTime: 2021-09-28 09:40:28
* @LastEditTime: 2021-10-18 10:58:59
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\rwgl\rwglindex.vue
......@@ -158,6 +158,28 @@
>
</el-pagination>
</div>
<!-- 比对的diolog -->
<el-dialog
title="提示"
:visible.sync="bddialogVisible"
width="30%"
>
<div v-if="bdShow">
<i class="el-icon-loading"></i>
<span>任务比对中,请稍后......</span>
</div>
<div v-else>
<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>
</el-dialog>
<!-- 编辑的diolog -->
<el-dialog title="编辑" :visible.sync="dialogFormVisible">
<el-form :model="formDiolog" :inline="true">
......@@ -195,6 +217,8 @@ export default {
},
data() {
return {
bdShow: true,
bddialogVisible: false,
upLoadText: {}, //文件上传携带的参数
FBformDiolog: { rwmc: "" },
FBdialogFormVisible: false,
......@@ -343,16 +367,20 @@ export default {
*/
SmartDespot(row) {
let self = this;
self.bddialogVisible = true;
self.bdShow = true;
post("/xqapi/rymp/matching", { rwid: row.rwid }).then((res) => {
console.log(res);
if (res.code == "200") {
debugger;
// debugger;
self.bdShow = false;
self.$message({
message: "智能匹配完成，请将未匹配的人员进行手动下派",
type: "success",
});
self.getList(self.selectPage);
} else {
} else if(res.code == 201){
self.bdShow = false;
self.$message({
message: res.message,
type: "warning",
......
src/views/rwgl/rwglindex.vue
<!--
* @Author: your name
* @Date: 2021-08-28 21:28:08
* @LastEditTime: 2021-09-28 10:45:27
* @LastEditTime: 2021-10-18 17:13:42
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\rwgl\rwglindex.vue
......@@ -9,7 +9,7 @@
<template>
<div class="rwgl" id="rwglindex">
<el-form ref="form" :model="selectPage" label-width="80px" :inline="true">
<div class="rybdsearch" >
<div class="rybdsearch">
<el-form-item label="">
<!-- <el-input
v-model="form.name"
......@@ -31,11 +31,20 @@
@click="handdleSearch"
></el-button>
</el-input>
<el-button type="primary" @click="onSubmit('mbxz')" size="mini" v-if="zzjglx == 11"
<el-button
type="primary"
@click="onSubmit('mbxz')"
size="mini"
v-if="zzjglx == 11"
>模板下载</el-button
>
<div class="dr">
<el-button size="mini" plain class="uploaddr" @click="upLoadFile" v-if="zzjglx == 11"
<el-button
size="mini"
plain
class="uploaddr"
@click="upLoadFile"
v-if="zzjglx == 11"
>导入</el-button
>
<!-- <el-button @click="onSubmit('dr')" size="mini">导入</el-button> -->
......@@ -50,7 +59,7 @@
:file-list="fileList"
:show-file-list="true"
:on-success="handSuccess"
:on-error='handError'
:on-error="handError"
:before-upload="beforeUpload"
:headers="headers"
ref="upload"
......@@ -61,8 +70,8 @@
</el-form-item>
</div>
</el-form>
<div class="edit">
<el-button size="mini" type="primary" @click="handClick('xz')"
<div class="edit" v-if="zzjglx == 11">
<el-button size="mini" type="primary" @click="handClick('xz') "
>新增
</el-button>
</div>
......@@ -104,9 +113,9 @@
size="small"
@selection-change="handleSelectionChange"
:cell-class-name="addClass"
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" width="50" label='序号'> </el-table-column>
<template v-if="zzjglx == 11">
<el-table-column
v-for="columnTitle in cxDefaultFormThead"
......@@ -115,7 +124,7 @@
:label="columnTitle.label"
:width="columnTitle.width"
sortable:true
:show-overflow-tooltip='true'
:show-overflow-tooltip="true"
>
</el-table-column>
</template>
......@@ -127,7 +136,7 @@
:label="columnTitle.label"
:width="columnTitle.width"
sortable:true
:show-overflow-tooltip='true'
:show-overflow-tooltip="true"
>
</el-table-column>
</template>
......@@ -262,6 +271,7 @@ import { get, postJson, post } from "@/utils/http.js";
import axios from "axios";
import utils from "@/utils/util.js";
import { mapMutations, mapState } from "vuex";
import url from "@/api/base";
export default {
components: {
Table,
......@@ -283,7 +293,7 @@ export default {
},
XGformDiolog: {
rwmc: "",
rwms:'',
rwms: "",
},
formLabelWidth: "120px",
BJdialogFormVisible: false, //点击编辑的diolog
......@@ -366,7 +376,7 @@ export default {
prop: "wfk",
width: "auto",
},
{
{
label: "任务简介",
prop: "rwms",
width: "auto",
......@@ -456,9 +466,9 @@ export default {
* @description: 文件上传失败时的钩子
* @param {*}
* @return {*}
*/
handError(err, file, fileList){
this.$message.error('上传失败');
*/
handError(err, file, fileList) {
this.$message.error("上传失败");
},
/**
* @description: 上传成功的回调
......@@ -557,7 +567,7 @@ export default {
this.$router.push("/Home/rwgl/sdxfrw/" + row.rwid + "/wpp");
// this.$router.push({ name: "rymplb", params: { wppList: row } });
} else if (column.label == "退回") {
this.$router.push("/Home/rwgl/rymplb/" + row.rwid + "/th");
this.$router.push("/Home/rwgl/sdxfrw/" + row.rwid + "/th");
// this.$router.push({ name: "rymplb", params: { thList: row} });
} else if (column.label == "已匹配") {
this.$router.push("/Home/rwgl/rymplb/" + row.rwid + "/ypp");
......@@ -637,10 +647,10 @@ export default {
// debugger
let self = this;
self.tableLoading = true;
post("/xqapi/rwgl/selectRwForPage", self.selectPage).then((res) => {
post(`/xqapi/rwgl/selectRwForPage`, self.selectPage).then((res) => {
if (res.code == "200") {
console.log("分页返回的数据", res);
self.tableData = res.data.mpRwList;
console.log(self.tableData);
self.tableDataLength = res.data.mrRwSize;
......@@ -697,9 +707,9 @@ export default {
* @return {*}
*/
handdleSearch() {
console.log('000');
console.log("000");
let self = this;
self.$set(self.selectPage,'page',1)
self.$set(self.selectPage, "page", 1);
post("/xqapi/rwgl/selectRwForPage", self.selectPage).then((res) => {
console.log(res);
if (res.code == "200") {
......@@ -799,6 +809,10 @@ export default {
},
},
mounted() {
console.log(window.location.host.substring(
0,
window.location.host.length - 5
));
this.setzzjglx();
this.handSizePageSearch();
},
......@@ -812,8 +826,8 @@ export default {
padding: 0 24px 0 24px;
}
.rwgl {
--redColor:#e02020;
--bluerColor:blue;
--redColor: #e02020;
--bluerColor: blue;
.colortable {
@include setPosition;
// position: absolute;
......
src/views/rwgl/sdxfrw.vue
<!--
* @Author: your name
* @Date: 2021-08-28 19:34:24
* @LastEditTime: 2021-09-28 17:37:57
* @LastEditTime: 2021-10-18 18:01:20
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\rwgl\sdxfrw.vue
......@@ -41,8 +41,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>
......@@ -63,11 +63,11 @@
<el-form-item
label="下发状态:"
prop="xfzt"
style="margin-left: -12px"
style="margin-left: 15px"
>
<el-select v-model="sdxpForm.xfzt" placeholder="请选择下发状态">
<el-option label="未下发" value="0"></el-option>
<el-option label="下发" value="1"></el-option>
<el-option label="已下发" value="1"></el-option>
</el-select>
</el-form-item>
</div>
......@@ -82,7 +82,7 @@
:disabled="selectRow.length > 1 ? false : true"
type="primary"
@click="handSubmitPLXF"
v-if="zzjglx != 13"
v-if="zzjglx != 13 && showList.xfzt != 1"
>批量下发</el-button
>
</div>
......@@ -214,9 +214,7 @@ export default {
width: "auto",
},
],
tableData: [
],
tableData: [],
form: {
name: "",
userId: "",
......@@ -402,7 +400,6 @@ export default {
* @return {*}
*/
handSubmitPLXF() {
let self = this;
// console.log(self.selectRow);
self.PLXFdialogFormVisible = true;
......@@ -516,6 +513,8 @@ export default {
let formList = {
page: 1,
limit: 10,
xfzt: 0,
rwcjlx: 3,
};
this.showList = formList;
// console.log(this.showList);
......@@ -526,6 +525,22 @@ export default {
page: 1,
limit: 10,
ppzt: "0",
rwcjlx: 1,
};
this.showList = formList;
this.getList(formList);
} else if (this.$route.params.type == "zxwpp") {
if (this.$route.params.rwlx == "上级下派") {
this.meMpShow = false;
} else {
this.meMpShow = true;
}
let formList = {
rwid: this.$route.params.id,
page: 1,
limit: 10,
ppzt: "0",
rwcjlx: 2,
};
this.showList = formList;
this.getList(formList);
......@@ -536,6 +551,32 @@ export default {
limit: 10,
ppzt: "0",
rwlx: 1,
rwcjlx: 1,
};
this.showList = formList;
this.getList(formList);
} else if (this.$route.params.type == "th") {
let formList = {
rwid: this.$route.params.id,
page: 1,
limit: 10,
thzt: 1,
rwcjlx: 1,
};
this.showList = formList;
this.getList(formList);
} else if (this.$route.params.type == "zxth") {
if (this.$route.params.rwlx == "上级下派") {
this.meMpShow = false;
} else {
this.meMpShow = true;
}
let formList = {
rwid: this.$route.params.id,
page: 1,
limit: 10,
thzt: 1,
rwcjlx: 2,
};
this.showList = formList;
this.getList(formList);
......@@ -548,6 +589,8 @@ export default {
let formList = {
page: 1,
limit: 10,
xfzt: 0,
rwcjlx: 3,
};
this.showList = formList;
// console.log(this.showList);
......@@ -558,6 +601,22 @@ export default {
page: 1,
limit: 10,
ppzt: "0",
rwcjlx: 1,
};
this.showList = formList;
this.getList(formList);
} else if (this.$route.params.type == "zxwpp") {
if (this.$route.params.rwlx == "上级下派") {
this.meMpShow = false;
} else {
this.meMpShow = true;
}
let formList = {
rwid: this.$route.params.id,
page: 1,
limit: 10,
ppzt: "0",
rwcjlx: 1,
};
this.showList = formList;
this.getList(formList);
......@@ -568,6 +627,32 @@ export default {
limit: 10,
ppzt: "0",
rwlx: 1,
rwcjlx: 2,
};
this.showList = formList;
this.getList(formList);
} else if (this.$route.params.type == "th") {
let formList = {
rwid: this.$route.params.id,
page: 1,
limit: 10,
thzt: 1,
rwcjlx: 1,
};
this.showList = formList;
this.getList(formList);
} else if (this.$route.params.type == "zxth") {
if (this.$route.params.rwlx == "上级下派") {
this.meMpShow = false;
} else {
this.meMpShow = true;
}
let formList = {
rwid: this.$route.params.id,
page: 1,
limit: 10,
thzt: 1,
rwcjlx: 2,
};
this.showList = formList;
this.getList(formList);
......
src/views/sjwgh.vue
<!--
* @Author: your name
* @Date: 2021-08-28 19:38:23
* @LastEditTime: 2021-09-28 17:40:44
* @LastEditTime: 2021-10-18 10:14:21
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\sjwgh.vue
......@@ -163,7 +163,7 @@
:page-sizes="[10, 20, 50, 100]"
:page-size="10"
layout="sizes, prev, pager, next"
:total="1000"
:total="rfglTotal"
>
</el-pagination>
<div slot="footer" class="dialog-footer">
......@@ -189,6 +189,7 @@ export default {
},
data() {
return {
rfglTotal:100,
rfglList: {
page: 1,
limit: 10,
......@@ -253,7 +254,7 @@ export default {
width: "auto",
},
],
tableData: [{xm:'000'}], //表格数据
tableData: [], //表格数据
dataRyid: "", //人员 id
selectRythb: "", //人员退回返回的信息
showList: {
......@@ -358,8 +359,10 @@ export default {
*/
rfglhandleSizeChange(val) {
this.$set(this.rfglList, "limit", val);
this. handInit(this.rfglRow)
console.log(`每页 ${val} 条`);
console.log(this.rfglList);
console.log(this.rfglRow);
},
/**
* @description: 人房关联当前页数
......@@ -368,6 +371,7 @@ export default {
*/
rfglhandleCurrentChange(val) {
this.$set(this.rfglList, "page", val);
this. handInit(this.rfglRow)
console.log(`当前页: ${val}`);
console.log(this.rfglList);
},
......@@ -377,6 +381,7 @@ export default {
* @return {*}
*/
rfglhandleClick(type, row) {
console.log('@#$%^&*&^%$#@#$%^');
let self = this;
if (type == "searchok") {
//搜所的确定按钮
......@@ -432,13 +437,14 @@ export default {
*/
handInit(row) {
let self = this;
self.rfglRow = row;
this.rfgldialogFormVisible = true;
self.rfgltableLoading =true;
postJson("/xqapi/sjwgh/selectXjfwdzBySqdm", this.rfglList).then((res) => {
console.log(res);
if (res.code == "200") {
self.rfgltableLoading =true;
self.rfgltableData = res.data.rows;
self.rfglRow = row;
self.rfglTotal = res.data.total
self.rfgltableLoading =false;
}
});
......
src/views/tjbb.vue
<!--
* @Author: your name
* @Date: 2021-08-28 19:37:47
* @LastEditTime: 2021-09-27 18:58:16
* @LastEditTime: 2021-10-12 10:55:39
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb.vue
......@@ -97,6 +97,7 @@ export default {
*/
handleSelect(item) {
if (item) {
console.log(item);
this.SelectedValue = item; //一条数据
console.log("66", this.SelectedValue);
}
......@@ -110,7 +111,7 @@ export default {
let self = this;
console.log("00", Boolean(this.state1)); //选中的值
console.log("11", Boolean(this.SelectedValue.value)); //选中的值
console.log(this.SelectedValue.value);
console.log('$%$%$$%$%$%$',this.SelectedValue);
//里面有任务id
if (self.SelectedValue) {
if(!this.state1){
......@@ -128,11 +129,11 @@ export default {
},
getListInput() {
let self = this;
post("/xqapi/rwgl/selectRwForPage", self.selectPage).then((res) => {
post("/xqapi/zxrwgl/selectAllRwForPage", self.selectPage).then((res) => {
if (res.code == "200") {
self.tableData = res.data.mpRwList;
self.tableData.map((item) => {
self.list.push({ value: item.rwmc, rwid: item.rwid });
self.list.push({ value: item.rwmc, rwid: item.rwid ,xtLrzzjglx:item.xtLrzzjglx});
});
console.log(self.list);
}
......
src/views/tjbb/bb2.vue
<!--
* @Author: your name
* @Date: 2021-08-31 15:25:02
* @LastEditTime: 2021-09-03 16:56:43
* @LastEditTime: 2021-10-18 11:04:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb\bb.vue
......@@ -10,14 +10,14 @@
<div class="bb">
<div class="header">
<div class="time">
<span class="demonstration">时间选择：</span>
<!-- <span class="demonstration">时间选择：</span>
<el-date-picker class="data-picker" v-model="time" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
<el-radio-group v-model="radio" class="select">
<el-radio :label="1">当天</el-radio>
<el-radio :label="2">当月</el-radio>
<el-radio :label="3">当季</el-radio>
</el-radio-group>
</el-radio-group> -->
</div>
<div class="export" @click="exportExcel('杨柳青镇街镇江苏重点区域驻留和时空伴随统计表')">导出</div>
</div>
......@@ -25,49 +25,49 @@
<div class="title">杨柳青镇街镇江苏重点区域驻留和时空伴随统计表</div>
<div class="table">
<el-table id="tableData2" ref="report-table" :data="tableData" max-height="400" style="width: 100%" :span-method="arraySpanMethod" :cell-class-name="addClass" :header-cell-style="headClass">
<el-table-column prop="pc" label="批次" width="150" align="center">
<el-table-column prop="rwmc" label="批次" width="auto" align="center">
</el-table-column>
<el-table-column label="推送数" prop="tss" align="center" fixed>
</el-table-column>
<el-table-column label="已排查人数" prop="ypcrs" align="center">
<el-table-column label="已排查人数" prop="ljpcry" align="center">
</el-table-column>
<el-table-column label="待排查人数" prop="dpcrs" align="center">
<el-table-column label="其中：转外区人数" prop="zwq" align="center">
<el-table-column label="其中：转外区人数" prop="dpczwq" align="center">
</el-table-column>
<el-table-column label="其中：本区人数" prop="bq" align="center">
<el-table-column label="其中：本区人数" prop="dpcbqrs" align="center">
</el-table-column>
</el-table-column>
<el-table-column label="失访" prop="sf" align="center">
<el-table-column label="失访" prop="sfrs" align="center">
</el-table-column>
<el-table-column label="查重" prop="cc" align="center">
<!-- <el-table-column label="查重" prop="cc" align="center">
</el-table-column>
<el-table-column label="离津" prop="lj" align="center">
</el-table-column>
<el-table-column label="有暴露史人数" prop="yblsrs" align="center">
</el-table-column>
<el-table-column label="核酸阴性人数" prop="hsyxrs" align="center">
</el-table-column> -->
<!-- <el-table-column label="有暴露史人数" prop="yblsrs" align="center">
</el-table-column> -->
<el-table-column label="核酸阴性人数" prop="hsyxs" align="center">
</el-table-column>
<el-table-column label="待检测人数" align="center">
<el-table-column prop="zwqrs" label="其中：转外区人数" width="80" align="center">
<el-table-column prop="hsdjczwqs" label="其中：转外区人数" width="auto" align="center">
</el-table-column>
<el-table-column prop="bqrs" label="其中：本区人数" width="80" align="center">
<el-table-column prop="hsdjcbqs" label="其中：本区人数" width="auto" align="center">
</el-table-column>
</el-table-column>
<el-table-column prop="qz" label="确诊" width="90" align="center">
</el-table-column>
<el-table-column prop="wzzgrz" label="无症状感染者" width="90" align="center">
<el-table-column prop="hsqzs" label="确诊" width="auto" align="center">
</el-table-column>
<!-- <el-table-column prop="wzzgrz" label="无症状感染者" width="90" align="center">
</el-table-column> -->
<el-table-column label="正在管控人数（实时数）" align="center">
<el-table-column prop="hj" label="合计" width="100" align="center">
<el-table-column prop="gks" label="合计" width="auto" align="center">
</el-table-column>
<el-table-column prop="jzgl" label="其中：集中隔离" class="redBg" width="100" align="center">
<el-table-column prop="gkjzgl" label="其中：集中隔离" class="redBg" width="auto" align="center">
</el-table-column>
<el-table-column prop="jjgl" label="其中：居家隔离" width="100" align="center">
<el-table-column prop="jjgl" label="其中：居家隔离" width="auto" align="center">
</el-table-column>
<el-table-column prop="jjyxgc" label="其中：居家医学观察" width="100" align="center">
</el-table-column>
</el-table-column>
<el-table-column prop="jjglrs" label="备注" width="90" align="center">
<el-table-column prop="jjglrs" label="备注" width="auto" align="center">
</el-table-column>
</el-table>
</div>
......@@ -81,6 +81,7 @@
<script>
import FileSaver from 'file-saver';
import XLSX from 'xlsx';
import { get, postJson, post } from "@/utils/http.js";
export default {
data () {
return {
......@@ -223,20 +224,27 @@ export default {
}
},
mounted () {
document.querySelector('.el-range-separator').innerHTML = '~';
document.querySelector('.el-range-separator').style.color = '#999';
document.querySelector('.el-range-separator').style.lineHeight = '23px';
document.querySelector('.el-input__icon.el-range__close-icon').style.lineHeight = '26px';
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.lineHeight = '26px';
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.position = 'absolute';
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.right = '5px';
// document.querySelector('.el-range-separator').innerHTML = '~';
// document.querySelector('.el-range-separator').style.color = '#999';
// document.querySelector('.el-range-separator').style.lineHeight = '23px';
// document.querySelector('.el-input__icon.el-range__close-icon').style.lineHeight = '26px';
// document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.lineHeight = '26px';
// document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.position = 'absolute';
// document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.right = '5px';
let self = this;
postJson("/xqapi/rymptj/selectRympskbstjb").then(res=>{
console.log(res);
if (res.code == "200") {
self.tableData = res.data.rows;
}
})
},
updated () {
if (document.querySelector('.el-range-input').value != '') {
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'none'
} else {
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'block'
}
// if (document.querySelector('.el-range-input').value != '') {
// document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'none'
// } else {
// document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'block'
// }
},
methods: {
/**
......
src/views/tjbb/dt.vue
<!--
* @Author: your name
* @Date: 2021-08-31 15:25:21
* @LastEditTime: 2021-09-02 10:06:15
* @LastEditTime: 2021-10-08 16:08:54
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb\dt.vue
......@@ -35,6 +35,31 @@ export default {
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;
//使用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);
window.rightMap = new EzMap('rightMap')
window.rightMap.centerAndZoom(new EzCoord(113.53450137499999, 34.44104525), 4)
......@@ -45,10 +70,12 @@ export default {
var res = [];
for (var i = 0; i < data.length; i++) {
var geoCoord = response['coordinates'][data[i].name];
console.log(geoCoord);
if (geoCoord) {
res.push(geoCoord.concat(data[i].value));
}
}
console.log(res);
return res;
};
var options = {
......
src/views/tjbb/tb.vue
<!--
* @Author: your name
* @Date: 2021-08-31 15:24:48
* @LastEditTime: 2021-09-28 16:52:46
* @LastEditTime: 2021-10-13 10:39:59
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb\tb.vue
......@@ -87,6 +87,7 @@ export default {
Rymppmwfk: [],
Rymppmxf: [],
rwid: "",
xtLrzzjglx:"",
};
},
watch: {
......@@ -104,6 +105,7 @@ export default {
this.$bus.on("selectValue", (msg) => {
console.log("===========", msg);
this.rwid = msg.rwid;
this.xtLrzzjglx = msg.xtLrzzjglx
this.searchrympfkl();
this.searchRympppl();
this.searchGxqmprs();
......@@ -144,7 +146,7 @@ export default {
* @return {*}
*/
searchrympfkl() {
post("/xqapi/rymptj/selectRympfkl", { rwid: this.rwid }).then((res) => {
post("/xqapi/rymptj/selectRympfkl", { rwid: this.rwid ,xtLrzzjglx:this.xtLrzzjglx}).then((res) => {
// console.log(res);
if (res.code == "200") {
this.rympfkl = [];
......@@ -168,7 +170,7 @@ export default {
* @return {*}
*/
searchRympppl() {
post("/xqapi/rymptj/selectRympPpl", { rwid: this.rwid }).then((res) => {
post("/xqapi/rymptj/selectRympPpl", { rwid: this.rwid,xtLrzzjglx:this.xtLrzzjglx }).then((res) => {
// console.log(res);
if (res.code == "200") {
this.rympPpl = [];
......@@ -192,22 +194,25 @@ export default {
* @return {*}
*/
searchGxqmprs() {
post("/xqapi/rymptj/selectRympRstj", { rwid: this.rwid }).then((res) => {
let self = this;
post("/xqapi/rymptj/selectRympRstj", { rwid: self.rwid,xtLrzzjglx:self.xtLrzzjglx }).then((res) => {
// console.log(res);
if (res.code == "200") {
this.Gxqmprs = [];
self.Gxqmprs = [];
if (res.data.rows) {
res.data.rows.map((item) => {
this.Gxqmprs.push({ value: item.count, name: item.name });
self.Gxqmprs.push({ value: item.count, name: item.name });
});
}
if (this.Gxqmprs.length != 0) {
this.initPieSecond(this.Gxqmprs);
this.gxqmprsloading = false;
} else if (this.Gxqmprs.length == 0) {
this.initPieSecond(this.Gxqmprs);
this.gxqmprsloading = true;
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.gxqmprsloading = true;
console.log('_+_+_+_+_+_+_+', self.gxqmprsloading);
}
// console.log(this.Gxqmprs);
// res.data.rows.
......@@ -223,6 +228,7 @@ export default {
post("/xqapi/rymptj/selectRympPmtj", {
tjlx: "000",
rwid: this.rwid,
xtLrzzjglx:this.xtLrzzjglx
}).then((res) => {
// console.log(res);
if (res.code == "200") {
......@@ -269,7 +275,7 @@ export default {
* @return {*}
*/
searchLyd() {
post("/xqapi/rymptj/selectRymplydtj", { rwid: this.rwid }).then((res) => {
post("/xqapi/rymptj/selectRymplydtj", { rwid: this.rwid ,xtLrzzjglx:this.xtLrzzjglx}).then((res) => {
console.log(res);
if (res.code == "200") {
this.lyd = [];
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-09-28 17:42:40
* @LastEditTime: 2021-10-18 17:06:37
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
......@@ -86,14 +86,14 @@ module.exports = {
'^/api': '/'
}
},
// "/xqapi": {
// target: "http://192.168.1.137:9022/", //打包时候的路径
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/xqapi': '/'
// }
// },
"/xqapifw": {
target: "http://192.168.1.137:9022/", //打包时候的路径
ws: true,
changeOrigin: true,
pathRewrite: {
'^/xqapifw': '/'
}
},
"/xqapi": {
target: "http://39.99.155.173:8022/", //统一的请求头部每次修改都要重启才会生效http://39.99.155.173:8022/
ws: true,
......
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