Commit 012cab99 by 刘玉帅

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

parents 5519e930 b9894794
/*
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-09-01 16:32:07
* @LastEditTime: 2021-09-01 18:58:54
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -146,6 +146,16 @@ export default [
component: () => import("@/views/tjbb/bb.vue"),
},
{
path: 'bb2',
name: 'bb2',
hidden: true,
meta: {
title: "报表",
auth: "5"
},
component: () => import("@/views/tjbb/bb2.vue"),
},
{
path: 'dt',
name: 'dt',
hidden: true,
......
<!--
* @Author: your name
* @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-09-01 16:31:21
* @LastEditTime: 2021-09-01 18:59:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Home.vue
......@@ -53,7 +53,7 @@
</div>
</div>
<div class="content">
<div class="breadcrumb" v-if="$route.path!='/Home/tjbb' && $route.path!='/Home/sjwgh' && $route.path!='/Home/jxkh' && $route.path!='/Home/tjbb/tb' && $route.path!='/Home/tjbb/bb' && $route.path!='/Home/tjbb/dt'">
<div class="breadcrumb" v-if="$route.path!='/Home/tjbb' && $route.path!='/Home/sjwgh' && $route.path!='/Home/jxkh' && $route.path!='/Home/tjbb/tb' && $route.path!='/Home/tjbb/bb' && $route.path!='/Home/tjbb/bb2' && $route.path!='/Home/tjbb/dt'">
<div @click="goManager" class="home-path path" :class="{active: $route.path=='/Home/rwgl/rwglindex'}">任务管理</div>
<div class="path" @click="changeRouter(item)" v-for="(item, i) in paths" :key="i" :class="{active: $route.path==item.path}">
<span>{{item.name}}</span>
......@@ -153,7 +153,7 @@ export default {
},
watch: {
$route (newValue, oldValue) {
if (newValue.path != '/Home/rwgl/rwglindex' && newValue.path != '/Home/tjbb/tb' && newValue.path != '/Home/tjbb/bb' && newValue.path != '/Home/tjbb/dt') {
if (newValue.path != '/Home/rwgl/rwglindex' && newValue.path != '/Home/tjbb/tb' && newValue.path != '/Home/tjbb/bb' && newValue.path != '/Home/tjbb/bb2' && newValue.path != '/Home/tjbb/dt') {
if (this.paths.length == 0) {
this.paths.push({ name: newValue.meta.title, path: newValue.path, routeName: newValue.name })
} else {
......
<!--
* @Author: your name
* @Date: 2021-08-28 19:36:38
* @LastEditTime: 2021-09-01 16:29:06
* @LastEditTime: 2021-09-01 19:47:58
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\rwgl\rwthcl.vue
......@@ -9,20 +9,10 @@
<template>
<div class="rwthcl">
<div class="batch">
<el-button type="primary" @click="batchSubmit" plain>批量操作</el-button>
<el-button type="text" size="mini" @click="handSerchShow()">{{ MoreisSearch ? "收起" : "更多操作 " }}
<i v-if="!MoreisSearch" class="el-icon-arrow-down el-icon--right"></i>
<i v-else class="el-icon-arrow-up el-icon--right"></i>
</el-button>
<el-input placeholder="请输入内容" v-model="searchVal" class="input-with-select">
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</div>
<transition name="slide-fade">
<div class="More" v-if="MoreisSearch">
<el-button type="primary" size="mini">未知操作1</el-button>
<el-button type="primary" size="mini">未知操作2</el-button>
<el-button type="primary" size="mini">未知操作3</el-button>
</div>
</transition>
<Table :cxDefaultFormThead="cxDefaultFormThead" :tableData="tableData" :btnShow="btnShow" @init="handInit(arguments)">
</Table>
</div>
......@@ -36,7 +26,7 @@ export default {
},
data () {
return {
MoreisSearch: false,
searchVal: '',
form: {
name: "",
userId: "",
......@@ -95,17 +85,12 @@ export default {
};
},
methods: {
handSerchShow (type) {
this.MoreisSearch = !this.MoreisSearch;
},
resetForm (formName) {
this.$refs[formName].resetFields();
console.log("重置按钮");
},
batchSubmit () { },
/**
* @description: 父组件传值
* @param {*} msg
......@@ -179,31 +164,11 @@ export default {
margin-left: 21px;
}
.batch {
height: 79px;
display: flex;
align-items: center;
}
.batch {
padding-left: 24px;
.el-button {
padding: 8px 19px;
}
.el-dropdown {
margin-left: 24px;
}
.el-button--primary.is-plain {
border: 1px solid #055fe7;
background: transparent;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
}
.el-button--primary.is-plain:focus,
.el-button--primary.is-plain:hover {
background: #409eff;
border-color: #409eff;
color: #fff;
}
margin-top: 20px;
margin-left: 24px;
margin-bottom: 20px;
width: 400px;
}
}
</style>
\ No newline at end of file
<!--
* @Author: your name
* @Date: 2021-08-28 19:37:47
* @LastEditTime: 2021-08-31 15:41:57
* @LastEditTime: 2021-09-01 18:57:49
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb.vue
......@@ -26,7 +26,8 @@ export default {
return {
tabList: [
{ name: '图表', path: '/Home/tjbb/tb' },
{ name: '报表', path: '/Home/tjbb/bb' },
{ name: '重点地区来津人员排查统计表', path: '/Home/tjbb/bb' },
{ name: '杨柳青镇街镇江苏重点区域驻留和时空伴随统计表', path: '/Home/tjbb/bb2' },
{ name: '地图', path: '/Home/tjbb/dt' },
]
}
......@@ -65,8 +66,7 @@ export default {
display: flex;
.txt {
cursor: pointer;
width: 112px;
height: 40px;
padding: 9px 42px;
background: #F6F8FA;
border-radius: 4px;
display: flex;
......
<!--
* @Author: your name
* @Date: 2021-08-31 15:25:02
* @LastEditTime: 2021-09-01 16:43:54
* @LastEditTime: 2021-09-01 19:23:26
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb\bb.vue
......@@ -325,7 +325,7 @@ export default {
}
.content {
margin-top: 24px;
height: 483px;
height: 480px;
.title {
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
......@@ -344,11 +344,11 @@ export default {
}
.desc {
position: relative;
top: 400px;
top: 390px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
line-height: 19px;
// line-height: 19px;
float: right;
margin-top: 23px;
}
......
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