zhangzhaoyuan
/
gnny-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

农业

Browse Source
master
zhy521521 12 months ago
parent a258a496fe
commit db023f8524
9 changed files with 451 additions and 620 deletions
Show Stats Download Patch File Download Diff File

2
src/components/SizeSelect/index.vue
Unescape View File

@ -34,7 +34,7 @@ export default {
this.$store.dispatch('app/setSize', size)
this.refreshView()
this.$message({
message: 'Switch Size Success',
message: '修改成功!',
type: 'success'
})
},

10
src/layout/components/Navbar.vue
Unescape View File

@ -9,13 +9,13 @@
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
</el-tooltip> -->
<el-tooltip content="文档地址" effect="dark" placement="bottom">
<!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
</el-tooltip> -->
<screenfull id="screenfull" class="right-menu-item hover-effect" />
@ -96,7 +96,7 @@ export default {
this.$store.dispatch('app/toggleSideBar')
},
async logout() {
this.$confirm('确定注销并退出系统吗？', '提示', {
this.$confirm('确定退出系统吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

562
src/router/index.js
Unescape View File

@ -64,11 +64,11 @@ export const constantRoutes = [
{
path: '/',
component: Layout,
redirect: 'index',
redirect: 'baseresource',
children: [
{
path: '/',
component: () => import('@/views/system/user/index'),
path: '/baseresource',
component: () => import('@/views/system/baseresource/index'),
}
]
@ -87,295 +87,295 @@ export const constantRoutes = [
}
]
},
{
path: '/resource',//资源管理
component: () => import('@/views/system/resource/index'),
hidden: true,
redirect: 'noredirect',
// {
// path: '/resource',//资源管理
// component: () => import('@/views/system/resource/index'),
// hidden: true,
// redirect: 'noredirect',
},
{
path: '/patent',//资源管理:专利
component: () => import('@/views/system/patent/index'),
hidden: true,
redirect: 'noredirect',
// },
// {
// path: '/patent',//资源管理:专利
// component: () => import('@/views/system/patent/index'),
// hidden: true,
// redirect: 'noredirect',
},
{
path: '/model',//资源管理:典型
component: () => import('@/views/system/model1/index'),
hidden: true,
redirect: 'noredirect',
// },
// {
// path: '/model',//资源管理:典型
// component: () => import('@/views/system/model1/index'),
// hidden: true,
// redirect: 'noredirect',
},
{
path: '/lifecycle',//资源管理:生命周期
component: () => import('@/views/system/lifecycle/index'),
hidden: true,
redirect: 'noredirect',
// },
// {
// path: '/lifecycle',//资源管理:生命周期
// component: () => import('@/views/system/lifecycle/index'),
// hidden: true,
// redirect: 'noredirect',
},
{
path: '/bigques',//资源管理:大事件
component: () => import('@/views/system/bigques/index'),
hidden: true,
redirect: 'noredirect',
// },
// {
// path: '/bigques',//资源管理:大事件
// component: () => import('@/views/system/bigques/index'),
// hidden: true,
// redirect: 'noredirect',
},
{
path: '/issue',//资源管理:发布量
component: () => import('@/views/system/issue/index'),
hidden: true,
redirect: 'noredirect',
// },
// {
// path: '/issue',//资源管理:发布量
// component: () => import('@/views/system/issue/index'),
// hidden: true,
// redirect: 'noredirect',
},
{
path: '/batch',//资源管理:批号
component: () => import('@/views/system/batch/index'),
hidden: true,
redirect: 'noredirect',
// },
// {
// path: '/batch',//资源管理:批号
// component: () => import('@/views/system/batch/index'),
// hidden: true,
// redirect: 'noredirect',
},
{
path: '/demon',//资源管理:示范
component: () => import('@/views/system/demon/index'),
hidden: true,
redirect: 'noredirect',
// },
// {
// path: '/demon',//资源管理:示范
// component: () => import('@/views/system/demon/index'),
// hidden: true,
// redirect: 'noredirect',
},
/////////////////////////////
{
path: '/production',//生产管理
component: () => import('@/views/system/production/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/consumables',//生产管理:消耗品投入
component: () => import('@/views/system/consumables/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/area',//生产管理:农业基地面积
component: () => import('@/views/system/area/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/output',//生产管理:产品产量
component: () => import('@/views/system/output/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/distribution',//生产管理:资源分布
component: () => import('@/views/system/distribution/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/internet',//生产管理:物联网设备
component: () => import('@/views/system/internet/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/weather',//生产管理:气象预警
component: () => import('@/views/system/weather/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/suggest',//生产管理:农事建议
component: () => import('@/views/system/suggest/index'),
hidden: true,
redirect: 'noredirect',
},
////////////////////////////////////////
{
path: '/industry',//产业规划
hidden: true,
redirect: 'noredirect',
},
{
path: '/baseresource',//产业规划：基本资源
component: () => import('@/views/system/baseresource/index.vue'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/selenium',//产业规划：富硒产业
component: () => import('@/views/system/selenium/index.vue'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/demonstrate',//产业规划：示范项目
component: () => import('@/views/system/demonstrate/index.vue'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/cultivation',//产业规划：富硒市场主体
component: () => import('@/views/system/cultivation/index.vue'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/productionval',//产业规划：富硒市场产值
component: () => import('@/views/system/productionval/index.vue'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/curve',//产业规划：产值曲线
component: () => import('@/views/system/curve/index.vue'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/policy',//产业规划：政策支持
component: () => import('@/views/system/policy/index.vue'),
hidden: true,
redirect: 'noredirect',
},
//////////////////////////////
{
path: '/standard',//标准体系
component: () => import('@/views/system/standard/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/tixistatistics',//标准体系:体系统计
component: () => import('@/views/system/tixistatistics/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/bzstatistics',//标准体系:标准统计
component: () => import('@/views/system/bzstatistics/index'),
hidden: true,
redirect: 'noredirect',
},
// ///////////////////////////
{
path: '/recommend',//产品推荐
component: () => import('@/views/system/recommend/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/commerce',//产品推荐:电商销售额
component: () => import('@/views/system/commerce/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/journalism',//产品推荐：新闻报道
component: () => import('@/views/system/journalism/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/enterprisesales',//产品推荐：企业销售数据
component: () => import('@/views/system/enterprisesales/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/tongji',//产品推荐：统计
component: () => import('@/views/system/tongji/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/regionalbrand',//产品推荐：统计
component: () => import('@/views/system/regionalbrand/index'),
hidden: true,
redirect: 'noredirect',
},
{
path: '/specialist',//产品推荐：专家
component: () => import('@/views/system/specialist/index'),
hidden: true,
redirect: 'noredirect',
},
// },
// /////////////////////////////
// {
// path: '/production',//生产管理
// component: () => import('@/views/system/production/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/consumables',//生产管理:消耗品投入
// component: () => import('@/views/system/consumables/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/area',//生产管理:农业基地面积
// component: () => import('@/views/system/area/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/output',//生产管理:产品产量
// component: () => import('@/views/system/output/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/distribution',//生产管理:资源分布
// component: () => import('@/views/system/distribution/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/internet',//生产管理:物联网设备
// component: () => import('@/views/system/internet/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/weather',//生产管理:气象预警
// component: () => import('@/views/system/weather/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/suggest',//生产管理:农事建议
// component: () => import('@/views/system/suggest/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// //产业规划
// {
// path: '/industry',//产业规划
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/baseresource',//产业规划：基本资源
// component: () => import('@/views/system/baseresource/index.vue'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/selenium',//产业规划：富硒产业
// component: () => import('@/views/system/selenium/index.vue'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/demonstrate',//产业规划：示范项目
// component: () => import('@/views/system/demonstrate/index.vue'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/cultivation',//产业规划：富硒市场主体
// component: () => import('@/views/system/cultivation/index.vue'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/productionval',//产业规划：富硒市场产值
// component: () => import('@/views/system/productionval/index.vue'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/curve',//产业规划：产值曲线
// component: () => import('@/views/system/curve/index.vue'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/policy',//产业规划：政策支持
// component: () => import('@/views/system/policy/index.vue'),
// hidden: true,
// redirect: 'noredirect',
// },
// //////////////////////////////
// {
// path: '/standard',//标准体系
// component: () => import('@/views/system/standard/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/tixistatistics',//标准体系:体系统计
// component: () => import('@/views/system/tixistatistics/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/bzstatistics',//标准体系:标准统计
// component: () => import('@/views/system/bzstatistics/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// // ///////////////////////////
// {
// path: '/recommend',//产品推荐
// component: () => import('@/views/system/recommend/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/commerce',//产品推荐:电商销售额
// component: () => import('@/views/system/commerce/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/journalism',//产品推荐：新闻报道
// component: () => import('@/views/system/journalism/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/enterprisesales',//产品推荐：企业销售数据
// component: () => import('@/views/system/enterprisesales/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/tongji',//产品推荐：统计
// component: () => import('@/views/system/tongji/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/regionalbrand',//产品推荐：统计
// component: () => import('@/views/system/regionalbrand/index'),
// hidden: true,
// redirect: 'noredirect',
// },
// {
// path: '/specialist',//产品推荐：专家
// component: () => import('@/views/system/specialist/index'),
// hidden: true,
// redirect: 'noredirect',
// },
]
// 动态路由，基于用户权限动态去加载
export const dynamicRoutes = [
{
path: '/system/user-auth',
component: Layout,
hidden: true,
permissions: ['system:user:edit'],
children: [
{
path: 'role/:userId(\\d+)',
component: () => import('@/views/system/user/authRole'),
name: 'AuthRole',
meta: { title: '分配角色', activeMenu: '/system/user' }
}
]
},
{
path: '/system/role-auth',
component: Layout,
hidden: true,
permissions: ['system:role:edit'],
children: [
{
path: 'user/:roleId(\\d+)',
component: () => import('@/views/system/role/authUser'),
name: 'AuthUser',
meta: { title: '分配用户', activeMenu: '/system/role' }
}
]
},
{
path: '/system/dict-data',
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
children: [
{
path: 'index/:dictId(\\d+)',
component: () => import('@/views/system/dict/data'),
name: 'Data',
meta: { title: '字典数据', activeMenu: '/system/dict' }
}
]
},
{
path: '/monitor/job-log',
component: Layout,
hidden: true,
permissions: ['monitor:job:list'],
children: [
{
path: 'index/:jobId(\\d+)',
component: () => import('@/views/monitor/job/log'),
name: 'JobLog',
meta: { title: '调度日志', activeMenu: '/monitor/job' }
}
]
},
{
path: '/tool/gen-edit',
component: Layout,
hidden: true,
permissions: ['tool:gen:edit'],
children: [
{
path: 'index/:tableId(\\d+)',
component: () => import('@/views/tool/gen/editTable'),
name: 'GenEdit',
meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
}
]
}
// {
// path: '/system/user-auth',
// component: Layout,
// hidden: true,
// permissions: ['system:user:edit'],
// children: [
// {
// path: 'role/:userId(\\d+)',
// component: () => import('@/views/system/user/authRole'),
// name: 'AuthRole',
// meta: { title: '分配角色', activeMenu: '/system/user' }
// }
// ]
// },
// {
// path: '/system/role-auth',
// component: Layout,
// hidden: true,
// permissions: ['system:role:edit'],
// children: [
// {
// path: 'user/:roleId(\\d+)',
// component: () => import('@/views/system/role/authUser'),
// name: 'AuthUser',
// meta: { title: '分配用户', activeMenu: '/system/role' }
// }
// ]
// },
// {
// path: '/system/dict-data',
// component: Layout,
// hidden: true,
// permissions: ['system:dict:list'],
// children: [
// {
// path: 'index/:dictId(\\d+)',
// component: () => import('@/views/system/dict/data'),
// name: 'Data',
// meta: { title: '字典数据', activeMenu: '/system/dict' }
// }
// ]
// },
// {
// path: '/monitor/job-log',
// component: Layout,
// hidden: true,
// permissions: ['monitor:job:list'],
// children: [
// {
// path: 'index/:jobId(\\d+)',
// component: () => import('@/views/monitor/job/log'),
// name: 'JobLog',
// meta: { title: '调度日志', activeMenu: '/monitor/job' }
// }
// ]
// },
// {
// path: '/tool/gen-edit',
// component: Layout,
// hidden: true,
// permissions: ['tool:gen:edit'],
// children: [
// {
// path: 'index/:tableId(\\d+)',
// component: () => import('@/views/tool/gen/editTable'),
// name: 'GenEdit',
// meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
// }
// ]
// }
]
// 防止连续点击多次路由报错
@ -391,7 +391,7 @@ Router.prototype.replace = function push(location) {
}
export default new Router({
mode: 'history', // 去掉url中的#
mode: 'hash', // 去掉url中的#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})

123
src/views/system/demonstrate/index.vue
Unescape View File

@ -1,30 +1,16 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="100px">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="项目时间" prop="projectTime">
<el-date-picker
v-model="queryParams.projectTime"
clearable
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择项目时间"
/>
<el-date-picker v-model="queryParams.projectTime" clearable type="date" value-format="yyyy-MM-dd"
placeholder="请选择项目时间" />
</el-form-item>
<el-form-item label="项目负责人" prop="projectLeader">
<el-input
v-model="queryParams.projectLeader"
placeholder="请输入项目负责人"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.projectLeader" placeholder="请输入项目负责人" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -34,46 +20,20 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:info:add']"
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
<el-button v-hasPermi="['system:info:add']" type="primary" plain icon="el-icon-plus" size="mini"
@click="handleAdd">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:info:edit']"
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button>
<el-button v-hasPermi="['system:info:edit']" type="success" plain icon="el-icon-edit" size="mini"
:disabled="single" @click="handleUpdate">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:info:remove']"
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
<el-button v-hasPermi="['system:info:remove']" type="danger" plain icon="el-icon-delete" size="mini"
:disabled="multiple" @click="handleDelete">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:info:export']"
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
<el-button v-hasPermi="['system:info:export']" type="warning" plain icon="el-icon-download" size="mini"
@click="handleExport">导出</el-button>
</el-col>
<right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
</el-row>
@ -89,51 +49,35 @@
</el-table-column>
<el-table-column label="项目负责人" align="center" prop="projectLeader" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
v-hasPermi="['system:info:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
v-hasPermi="['system:info:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-button v-hasPermi="['system:info:edit']" size="mini" type="text" icon="el-icon-edit"
@click="handleUpdate(scope.row)">修改</el-button>
<el-button v-hasPermi="['system:info:remove']" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改产业规划示范项目信息库对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="form.projectName" placeholder="请输入项目名称" />
</el-form-item>
<el-form-item label="项目时间" prop="projectTime">
<el-date-picker
v-model="form.projectTime"
clearable
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择项目时间"
/>
<el-date-picker v-model="form.projectTime" clearable type="date" value-format="yyyy-MM-dd"
placeholder="请选择项目时间" />
</el-form-item>
<el-form-item label="项目负责人" prop="projectLeader">
<el-input v-model="form.projectLeader" placeholder="请输入项目负责人" />
</el-form-item>
<el-form-item label="项目内容" prop="projectLeader">
<el-input v-model="form.projectLeader" placeholder="请输入项目负责人" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -242,12 +186,9 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getInfo(id).then(response => {
this.form = response.row[0]
this.open = true
this.title = '修改产业规划示范项目信息库'
})
this.form = row
this.open = true
this.title = '修改产业规划示范项目信息库'
},
/** 提交按钮 */
submitForm() {
@ -272,12 +213,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除产业规划示范项目信息库编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除产业规划示范项目信息库编号为"' + ids + '"的数据项？').then(function () {
return delInfo(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {})
}).catch(() => { })
},
/** 导出按钮操作 */
handleExport() {

8
src/views/system/journalism/index.vue
Unescape View File

@ -72,9 +72,9 @@
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="新闻标题" align="center" prop="newsTitle" />
<el-table-column label="新闻内容" align="center" prop="newsContent" />
<el-table-column label="编号" align="center" prop="id" width="10"/>
<el-table-column label="新闻标题" align="center" prop="newsTitle" show-overflow-tooltip/>
<el-table-column label="新闻内容" align="center" prop="newsContent" width="1000" show-overflow-tooltip/>
<el-table-column label="新闻时间" align="center" prop="newsTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.newsTime, '{y}-{m}-{d}') }}</span>
@ -116,7 +116,7 @@
</el-form-item>
<el-form-item label="新闻内容">
<!-- <editor v-model="form.newsContent" :min-height="192" /> -->
<el-input v-model="form.newsContent" type="textarea" placeholder="请输入新闻标题" />
<el-input v-model="form.newsContent" type="textarea" placeholder="请输入新闻标题" autosize/>
</el-form-item>
<el-form-item label="新闻时间" prop="newsTime">
<el-date-picker

2
src/views/system/lifecycle/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="100px">
<el-form-item label="专利数量" prop="patentQuantity">
<el-input
v-model="queryParams.patentQuantity"

2
src/views/system/output/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="100px">
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="queryParams.productName"

4
src/views/system/suggest/index.vue
Unescape View File

@ -71,9 +71,9 @@
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="编号" align="center" prop="id" width="10"/>
<el-table-column label="农事建议标题" align="center" prop="farmingOpinionTitle" />
<el-table-column label="农事建议内容" align="center" prop="farmingOpinionContent" />
<el-table-column label="农事建议内容" align="center" prop="farmingOpinionContent" width="800"/>
<el-table-column label="农事建议时间" align="center" prop="farmingOpinionTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.farmingOpinionTime, '{y}-{m}-{d}') }}</span>

352
src/views/system/user/index.vue
Unescape View File

@ -1,78 +1,38 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<!--部门数据-->
<!--区域数据-->
<el-col :span="4" :xs="24">
<div class="head-container">
<el-input
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
<el-input v-model="deptName" placeholder="请输入区域名称进行过滤" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 20px" />
</div>
<div class="head-container">
<el-tree
:data="deptOptions"
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
node-key="id"
default-expand-all
highlight-current
@node-click="handleNodeClick"
/>
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
:filter-node-method="filterNode" ref="tree" node-key="id" highlight-current @node-click="handleNodeClick" />
</div>
</el-col>
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="queryParams.phonenumber"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="用户状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -82,104 +42,60 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:user:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
>修改</el-button>
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:user:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:user:remove']">删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
v-hasPermi="['system:user:import']">导入</el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:user:export']">导出</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="归属地区" align="center" key="deptName" prop="areaAuthName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
:show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
:show-overflow-tooltip="true" />
<el-table-column label="归属地区" align="center" key="deptName" prop="areaAuthName" v-if="columns[3].visible"
:show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
width="120" />
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']">删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
@ -192,13 +108,8 @@
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</el-col>
</el-row>
@ -213,7 +124,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="归属地区" prop="deptId">
<treeselect v-model="value" :options="deptOptions" :show-count="true" placeholder="请选择归属地区" :normalizer="normalizer" @select="handleSelect"/>
<treeselect v-model="value" :options="deptOptions" :show-count="true" placeholder="请选择归属地区"
:normalizer="normalizer" @select="handleSelect" />
</el-form-item>
</el-col>
</el-row>
@ -225,14 +137,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="角色" prop="roleIds">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
<el-select v-model="form.roleIds" placeholder="请选择角色">
<el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
:disabled="item.status == 1"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -245,7 +152,8 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password
autocomplete="new-password" />
</el-form-item>
</el-col>
</el-row>
@ -253,23 +161,17 @@
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
dict.label
}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -283,18 +185,9 @@
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
@ -302,7 +195,8 @@
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
@click="importTemplate">下载模板</el-link>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
@ -314,7 +208,7 @@
</template>
<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus,getAreaTree } from "@/api/system/user";
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, getAreaTree } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -343,13 +237,11 @@ export default {
title: "",
// 部门树选项
deptOptions: undefined,
value:null,
value: null,
// 是否显示弹出层
open: false,
// 部门名称
// 区域名称
deptName: undefined,
// 默认密码
initPassword: undefined,
// 日期范围
dateRange: [],
// 岗位选项
@ -381,11 +273,11 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
userName: undefined,
phonenumber: undefined,
status: undefined,
deptId: undefined,
areaAuthCode:undefined
userName: '',
phonenumber: '',
status: '',
deptId: '',
areaAuthCode: ''
},
// 列信息
columns: [
@ -403,8 +295,8 @@ export default {
{ required: true, message: "用户名称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
roleIds:[
{required: true, message: "角色不能为空", trigger: "blur" }
roleIds: [
{ required: true, message: "角色不能为空", trigger: "blur" }
],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
@ -433,6 +325,7 @@ export default {
watch: {
// 根据名称筛选部门树
deptName(val) {
console.log(this.$refs.tree)
this.$refs.tree.filter(val);
}
},
@ -440,75 +333,72 @@ export default {
this.getList();
this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then(response => {
this.initPassword = response.msg;
});
},
methods: {
/** 查询用户列表 */
getList(value) {
console.log(value,'shuju');
this.loading = true;
this.queryParams.areaAuthCode = value
// console.log(this.queryParams,'jjh');
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows;
this.total = response.total;
this.loading = false;
}
this.queryParams.areaAuthCode = value || ''
console.log(this.queryParams)
console.log(this.queryParams, 'jjh');
listUser(this.queryParams).then(response => {
this.userList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
/** 查询部门下拉树结构 */
getDeptTree() {
getAreaTree().then(response => {
console.log(response,'jjk');
console.log(response, 'jjk');
this.deptOptions = response.data;
console.log(this.deptOptions,'kk');
console.log(this.deptOptions, 'kk');
this.normalizer()
});
},
normalizer(node){
if(node.children && !node.children.length){
delete node.children;
}
return {
id: node.id,
label: node.areaName,
children: node.children,
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.areaName,
children: node.children,
}
},
}
},
handleSelect(treeNode){
console.log(treeNode,'treeNode');
this.form.areaAuthCode = treeNode.subAreaCode
console.log(this.form,'form');
console.log(this.value,'value');
},
handleSelect(treeNode) {
console.log(treeNode, 'treeNode');
this.form.areaAuthCode = treeNode.subAreaCode
console.log(this.form, 'form');
console.log(this.value, 'value');
},
// ！！！！！！！！！！！！！！！！
// ！！！！！！！！！！！！！！！！
// 筛选节点
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
return data.areaName.indexOf(value) !== -1;
},
///////////
// 节点单击事件
handleNodeClick(data) {
console.log(data.subAreaCode,'jj');
console.log(data.subAreaCode, 'jj');
this.getList(data.subAreaCode)
// this.handleQuery(data.areaAuthCode);
},
// 用户状态修改
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
return changeUserStatus(row.userId, row.status);
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function() {
}).catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
},
@ -531,7 +421,7 @@ export default {
status: "0",
remark: undefined,
postIds: [],
roleIds: []
roleIds: ''
};
this.resetForm("form");
},
@ -570,13 +460,13 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
console.log('新增', this.form)
getUser().then(response => {
console.log(response,'kkj');
console.log(response, 'kkj');
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.open = true;
this.title = "添加用户";
this.form.password = this.initPassword;
});
},
/** 修改按钮操作 */
@ -603,18 +493,18 @@ export default {
inputPattern: /^.{5,20}$/,
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
}).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value);
});
}).catch(() => {});
resetUserPwd(row.userId, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value);
});
}).catch(() => { });
},
/** 分配角色操作 */
handleAuthRole: function(row) {
handleAuthRole: function (row) {
const userId = row.userId;
this.$router.push("/system/user-auth/role/" + userId);
},
/** 提交按钮 */
submitForm: function() {
submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.userId != undefined) {
@ -636,12 +526,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const userIds = row.userId || this.ids;
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
return delUser(userIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {

Write Preview
Loading…
Cancel
Save