合并代码

lijinlong
吕天方 1 year ago
commit bcf3d4f28a

@ -2,7 +2,7 @@
# @Author: 张涛
# @Date: 2023-07-18 13:04:50
# @LastEditors: JC9527
# @LastEditTime: 2023-09-11 15:36:50
# @LastEditTime: 2023-09-13 16:49:05
# @FilePath: \Mudu2PC\.env.development
###
# 页面标题
@ -13,7 +13,7 @@ ENV = 'development'
# 苏州应急执法计划管理系统/开发环境
# VUE_APP_BASE_API = 'http://localhost:9028'
VUE_APP_BASE_API = 'http://192.168.0.105:9033'
VUE_APP_BASE_API = '/api'
# 路由懒加载

@ -0,0 +1,87 @@
import request from '@/utils/request'
// 分页条件查询省重点企业
export function listEnterprise(query) {
return request({
url: '/bKeyEnterprise',
method: 'get',
params: query
})
}
// 新增省重点企业
export function addEnterprise(data) {
return request({
url: '/bKeyEnterprise',
method: 'post',
data
})
}
//修改省重点企业
export function updateEnterprise(data) {
return request({
url: '/bKeyEnterprise',
method: 'put',
data
})
}
//删除省重点企业
export function deleteEnterprise(data) {
return request({
url: '/bKeyEnterprise',
method: 'delete',
params: data
})
}
//导入省重点企业
export function exportEnterprise(data) {
return request({
url: '/bKeyEnterprise/common/importExcel',
method: 'post',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
//通过主键查询单条省重点企业
export function getEnterprise(id) {
return request({
url: `/bKeyEnterprise/${id}`,
method: 'get',
})
}
//查询企业信息列表
export function businessList(data) {
return request({
url: `/info/list`,
method: 'get',
params: data
})
}
//查询单条企业信息执法详情
export function enforcingDetail(data) {
return request({
url: `/bPlanEnterprise/getZhifa`,
method: 'get',
params: data
})
}
// 根据字段查询字典信息
export function listDist(query) {
return request({
url: '/dictdata',
method: 'get',
params: query
})
}
// 行政区划树结构
export function xzTree(id) {
return request({
url: '/administrative/tree',
method: 'get',
})
}

@ -9,7 +9,11 @@ import { isRelogin } from "@/utils/request";
NProgress.configure({ showSpinner: false });
const whiteList = [
'/toLogin'
'/toLogin',
'/home',
'/planManage',
"/enforcing",
"/focusEnter"
];
router.beforeEach((to, from, next) => {

@ -130,8 +130,8 @@ export default {
},
},
created() {
this.getCode();
this.getCookie();
// this.getCode();
// this.getCookie();
},
methods: {
getCode() {
@ -158,31 +158,33 @@ export default {
handleLogin() {
this.$refs.loginForm.validate((valid) => {
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), {
expires: 30,
});
Cookies.set("rememberMe", this.loginForm.rememberMe, {
expires: 30,
});
} else {
Cookies.remove("username");
Cookies.remove("password");
Cookies.remove("rememberMe");
}
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => {});
})
.catch(() => {
this.loading = false;
if (this.captchaEnabled) {
this.getCode();
}
});
// this.loading = true;
this.$router.push({ path: "/home" }).catch(() => {});
// if (this.loginForm.rememberMe) {
// Cookies.set("username", this.loginForm.username, { expires: 30 });
// Cookies.set("password", encrypt(this.loginForm.password), {
// expires: 30,
// });
// Cookies.set("rememberMe", this.loginForm.rememberMe, {
// expires: 30,
// });
// } else {
// Cookies.remove("username");
// Cookies.remove("password");
// Cookies.remove("rememberMe");
// }
// this.$store
// .dispatch("Login", this.loginForm)
// .then(() => {
// this.$router.push({ path: this.redirect || "/" }).catch(() => {});
// })
// .catch(() => {
// this.loading = false;
// if (this.captchaEnabled) {
// this.getCode();
// }
// });
}
});
},

File diff suppressed because it is too large Load Diff

@ -12,179 +12,429 @@
<div class="filtrate-condition">
<div class="select-input">
<div class="select-span">年份:</div>
<el-select v-model="form.year" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
<div>
<el-date-picker
v-model="queryParms.year"
type="year"
placeholder="请选择"
value-format="yyyy"
size="small"
>
</el-option>
</el-select>
</el-date-picker>
</div>
</div>
</div>
<div style="display: flex">
<div class="export" @click="exportFile">
<div class="export" @click="addkeys">
<span>新增</span>
</div>
<div class="export" @click="searchList">
<span>搜索</span>
</div>
<div class="export export1" @click="exportFile">
<span>导入</span>
<div class="export" @click="chongzhiList">
<span>重置</span>
</div>
<div class="export" style="background: #f71052" @click="deleteItem">
<span>删除</span>
</div>
<el-upload
class="upload-demo"
action="1"
ref="uploadOver"
:http-request="exportFile"
:on-success="handleSuccess"
:multiple="false"
:show-file-list="false"
:limit="1"
:file-list="fileList"
>
<div class="export export1">
<span>导入</span>
</div>
</el-upload>
</div>
</div>
<div class="tables">
<el-table
:data="tableData"
style="width: 100%"
v-loading="loading"
:height="484"
:border="false"
:row-class-name="tableRowClassName"
:cell-style="columnStyle"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="year" label="计划年份" header-align="center">
</el-table-column>
<el-table-column
prop="date"
label="计划年份"
prop="enterpriseName"
label="企业名称"
header-align="center"
>
</el-table-column>
<el-table-column
prop="address"
label="企业名称"
prop="entCode"
label="统一社会信用代码"
header-align="center"
>
</el-table-column>
<el-table-column prop="frim" label="企业类别" header-align="center">
<el-table-column prop="type" label="企业类别" header-align="center">
</el-table-column>
<!-- <el-table-column label="操作" header-align="center">
<el-table-column label="操作" header-align="center">
<template slot-scope="scope">
<div class="tabs-btns">
<div class="look" @click="look(scope.row)">
<span>查看执法详情</span>
<img src="@/assets/images/look.png" alt="" />
<span>查看</span>
</div>
<div class="change" @click="change(scope.row)">
<img src="@/assets/images/change.png" alt="" />
<span>修改</span>
</div>
<div class="delete" @click="deleteItem(scope.row)">
<img src="@/assets/images/delete.png" alt="" />
<span>删除</span>
</div>
</div>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
</div>
<div class="pagination">
<my-pagination :total="28" @pagesChange="pagesChange"></my-pagination>
<my-pagination :total="total" @pagesChange="pagesChange"></my-pagination>
</div>
<!-- 新增修改 -->
<el-dialog
:visible.sync="dialogVisible"
custom-class="dialog-boxed"
append-to-body
width="50%"
>
<div class="dialog-slot">
<div class="closeClick">
<div class="newplan">
<div class="line"></div>
<div class="span">{{ headerText }}省重点企业</div>
</div>
<img src="@/assets/images/close.png" alt="" @click="closeDetail" />
</div>
<div class="content">
<div class="filtrate">
<el-form
:model="form"
label-width="100px"
class="demo-ruleForm"
ref="form1"
:rules="rules"
>
<el-row>
<el-col :span="24">
<el-form-item label="企业名称" prop="enterpriseName">
<el-input
v-model="form.enterpriseName"
size="small"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="企业代码:" prop="entCode">
<el-input
v-model="form.entCode"
size="small"
placeholder="请输入企业代码"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="年份:" prop="year">
<el-date-picker
v-model="form.year"
type="year"
placeholder="请选择年份"
value-format="yyyy"
size="small"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="大类:" prop="type">
<el-input
v-model="form.type"
size="small"
placeholder="请输入大类"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="备注:" prop="remark">
<el-input
type="textarea"
v-model="form.remark"
size="small"
:rows="5"
placeholder="请输入备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<div
style="
display: flex;
align-items: center;
justify-content: center;
"
>
<div class="select-btn" @click="confirm"></div>
<div class="select-btn" @click="closeDetail"></div>
</div>
</el-form>
</div>
</div>
</div>
</el-dialog>
<!-- 查看 -->
<el-dialog
:visible.sync="addShow"
:show-close="false"
:destroy-on-close="true"
:close-on-click-modal="false"
append-to-body
custom-class="dialog-boxed"
width="50%"
>
<div class="dialog-slot">
<div class="closeClick">
<div class="newplan">
<div class="line"></div>
<div class="span">查看省重点企业详细</div>
</div>
<img src="@/assets/images/close.png" alt="" @click="shutDownDetail" />
</div>
<div class="content">
<div class="filtrate">
<el-descriptions :column="2" border>
<el-descriptions-item label="计划年份">
{{ parseTime(details.year, "{y}") }}
</el-descriptions-item>
<el-descriptions-item label="企业名称">
{{ details.enterpriseName }}
</el-descriptions-item>
<el-descriptions-item label="企业代码">{{
details.entCode
}}</el-descriptions-item>
<el-descriptions-item label="企业大类">{{
details.type
}}</el-descriptions-item>
<el-descriptions-item label="备注">{{
details.remark
}}</el-descriptions-item>
</el-descriptions>
</div>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import myPagination from "@/views/components/myPagination/index.vue";
import { Loading } from "element-ui";
import {
listEnterprise,
addEnterprise,
updateEnterprise,
deleteEnterprise,
exportEnterprise,
getEnterprise,
} from "@/api/yingji/keyEnterprise.js";
export default {
components: { myPagination },
name: "Article",
data() {
return {
tableData: [
{
date: "2022年",
name: "王小虎",
address: "苏州",
frim: "扬子石化有限公司",
state: "未执法",
},
{
date: "2022年",
name: "王小虎",
address: "张家港市",
frim: "扬子石化有限公司",
state: "未执法",
},
{
date: "2022年",
name: "王小虎",
address: "常熟市",
frim: "扬子石化有限公司",
state: "未执法",
},
{
date: "2022年",
name: "王小虎",
address: "太仓市",
frim: "扬子石化有限公司",
state: "未执法",
},
{
date: "2022年",
name: "王小虎",
address: "昆山市",
frim: "扬子石化有限公司",
state: "未执法",
},
{
date: "2022年",
name: "王小虎",
address: "吴江区",
frim: "扬子石化有限公司",
state: "已执法",
},
{
date: "2022年",
name: "王小虎",
address: "吴中区",
frim: "扬子石化有限公司",
state: "已执法",
},
{
date: "2022年",
name: "王小虎",
address: "姑苏区",
frim: "扬子石化有限公司",
state: "已执法",
},
{
date: "2022年",
name: "王小虎",
address: "相城区",
frim: "扬子石化有限公司",
state: "已执法",
},
{
date: "2022年",
name: "王小虎",
address: "工业园区",
frim: "扬子石化有限公司",
state: "已执法",
},
],
tableData: [],
options: [],
checkList: ["全部"],
checkListTwo: [],
loading: false,
headerText: "",
ids: null,
//
dialogVisible: false,
queryParms: {
year: "",
},
searchBefore: {
pageSize: 10,
pageNum: 1,
},
//
form: {
//
enterpriseName: "",
//
entCode: "",
//
remark: "",
//
type: "",
//
year: "",
compartment: "",
},
checkList: ["全部"],
checkListTwo: [],
addShow: false,
//
details: {},
rules: {
enterpriseName: [
{ required: true, message: "请输入企业名称", trigger: "blur" },
],
entCode: [
{ required: true, message: "请输入企业代码", trigger: "blur" },
],
remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
type: [{ required: true, message: "请输入大类", trigger: "blur" }],
year: [{ required: true, message: "请选择年份", trigger: "blur" }],
},
//
total: 0,
fileList: [],
};
},
// watch: {
// checkListTwo:{
// handler(newArray,oldArray){
// console.log(newArray,'newArray')
// console.log(oldArray,'oldArray')
// },
// deep:true,
// immediate:true,
// }
// },
created() {
this.getList();
},
methods: {
//
setmealSelect() {
this.checkList = this.checkList.slice(-1);
if (this.checkList.length > 0) {
this.checkListTwo = this.checkList;
this.changeList();
} else {
this.checkList = this.checkListTwo;
handleRemove() {},
searchList() {
this.searchBefore = Object.assign(this.searchBefore, this.queryParms);
this.getList();
},
reset() {
this.form = {
enterpriseName: "",
//
entCode: "",
//
remark: "",
//
type: "",
//
year: "",
};
},
//
chongzhiList() {
this.searchBefore = {
pageSize: 10,
pageNum: 1,
};
this.queryParms.year = "";
this.getList();
},
//
getList() {
this.loading = true;
listEnterprise(this.searchBefore).then((res) => {
this.tableData = res.data.list;
this.loading = false;
this.total = res.data.total;
});
},
//
shutDownDetail() {
this.addShow = false;
},
//
addkeys() {
this.reset();
this.headerText = "新增";
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs.form1.clearValidate();
});
},
//
closeDetail() {
this.reset();
this.dialogVisible = false;
},
//
look(e) {
getEnterprise(e.id).then((res) => {
this.details = res.data;
this.addShow = true;
});
},
//
change(e) {
this.headerText = "修改";
getEnterprise(e.id).then((res) => {
this.form = res.data;
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs.form1.clearValidate();
});
});
},
//
confirm() {
this.$refs.form1.validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateEnterprise(this.form).then((response) => {
this.$model.msgSuccess("修改成功");
this.dialogVisible = false;
this.getList();
});
} else {
addEnterprise(this.form).then((res) => {
this.$model.msgSuccess("新增成功");
this.dialogVisible = false;
this.getList();
});
}
}
});
},
//
deleteItem(row) {
/** 删除按钮操作 */
const ids = row.id || this.ids;
if (!ids) {
this.$model.msgError("请选择数据");
return;
}
this.$confirm("是否确认删除该数据?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return deleteEnterprise({ idList: ids });
})
.then(() => {
this.$model.msgSuccess("删除成功");
this.getList();
})
.catch(() => {});
},
changeList() {
console.log(this.checkList[0]); //
//
handleSelectionChange(rows) {
let arr = rows.map((item) => item.id);
this.ids = arr.join(",");
},
// tabsclass
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 !== 0) {
@ -204,11 +454,35 @@ export default {
},
//
pagesChange(pages) {
console.log(pages);
this.searchBefore.pageSize = pages.size;
this.searchBefore.pageNum = pages.current;
this.getList();
},
//
exportFile() {
// console.log(this.multipleSelection)
handleSuccess() {},
//
exportFile(e) {
let downloadLoadingInstance = Loading.service({
text: "正在导入数据,请稍候",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
let a = new FormData();
a.append("file", e.file);
exportEnterprise(a)
.then((res) => {
downloadLoadingInstance.close();
this.queryParms.year = "";
this.searchBefore = {
pageSize: 10,
pageNum: 1,
};
this.getList();
this.$refs.uploadOver.clearFiles();
})
.catch(() => {
downloadLoadingInstance.close();
this.$model.msgError("导入失败");
});
},
},
mounted() {
@ -224,6 +498,53 @@ export default {
};
</script>
<style lang="scss" scoped>
::v-deep .el-descriptions-row th {
width: 20% !important;
font-size: 14px;
font-family: "Alibaba PuHuiTi";
font-weight: 400;
}
::v-deep .el-descriptions-row td {
width: 30% !important;
font-size: 14px;
font-family: "Alibaba PuHuiTi";
font-weight: 400;
}
.tabs-btns {
display: flex;
align-items: center;
justify-content: center;
.look,
.change,
.delete {
display: flex;
align-items: center;
margin-right: 30px;
cursor: pointer;
img {
width: 20px;
margin-right: 5px;
}
span {
font-size: 15px;
font-family: Alibaba PuHuiTi;
font-weight: 400;
color: #045ffd;
}
}
.delete {
margin-right: 0;
span {
color: #f71052;
}
}
}
::v-deep .el-date-editor {
width: 100%;
}
::v-deep .el-dialog__body {
padding-bottom: 10px;
}
.container-main {
// height: calc(100vh - 84px);
overflow: hidden;
@ -298,6 +619,7 @@ export default {
justify-content: center;
padding: 6px 19px;
background-color: #2378ec;
margin-right: 10px;
cursor: pointer;
img {
width: 22px;
@ -312,29 +634,12 @@ export default {
}
.export1 {
background-color: #28b384;
margin-left: 20px;
}
}
.tables {
margin-top: 10px;
background-color: #eaf2fd;
.tabs-btns {
display: flex;
align-items: center;
justify-content: center;
.look {
display: flex;
align-items: center;
cursor: pointer;
span {
font-size: 15px;
font-family: Alibaba PuHuiTi;
font-weight: 400;
color: #045ffd;
text-decoration: underline;
}
}
}
::v-deep .el-table {
.success-row {
background-color: rgba(234, 242, 253, 0.25);
@ -367,5 +672,120 @@ export default {
margin-top: 40px;
}
}
.dialog-slot {
.closeClick {
position: absolute;
top: 0;
right: 0;
padding: 10px 20px;
width: 100%;
z-index: 1000;
display: flex;
justify-content: space-between;
align-items: center;
text-align: center;
background: #f8f9fa;
box-shadow: 0px 1px 0px 0px #dbe0e8;
background-color: #e0eaf8;
img {
width: 18px;
height: 18px;
cursor: pointer;
}
.newplan {
display: flex;
align-items: center;
.line {
margin-right: 10px;
width: 5px;
height: 16px;
background-color: #1e70de;
}
.span {
font-size: 16px;
font-family: "Alibaba PuHuiTi";
font-weight: bold;
color: #1e70de;
}
}
}
.content {
// padding: 15px 10px;
.filtrate {
padding-bottom: 10px;
.select-input {
// margin-right: 10px;
margin-top: 20px;
display: flex;
align-items: center;
.select-span {
font-size: 13px;
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #525966;
// line-height: 40px;
margin-right: 10px;
}
::v-deep .el-select,
.el-cascader {
background-color: transparent;
width: 180px;
.el-input__inner {
height: 33px;
}
// border-radius: 2px;
.el-input
.el-input__suffix
.el-input__suffix-inner
.el-icon-arrow-up::before {
content: "";
background: url(../../assets/images/down2.png) center center
no-repeat;
background-size: cover;
position: absolute;
width: 10px;
height: 7px;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
}
.select-input {
width: 45%;
::v-deep .el-input {
.el-input__inner {
height: 33px;
}
}
}
.select-btn {
width: 80px;
height: 33px;
background: #2378ec;
border-radius: 2px;
display: flex;
align-items: center;
justify-content: center;
font-size: 15px;
font-family: Alibaba PuHuiTi;
font-weight: 500;
color: #ffffff;
cursor: pointer;
margin-right: 10px;
}
.select-btn1 {
background: #28b384;
}
}
}
}
::v-deep .el-form-item__label {
font-size: 14px;
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #525966;
// line-height: 40px;
}
</style>

@ -41,13 +41,21 @@ module.exports = {
open: true,
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.0.113:9033`,
// [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.0.117:9028`,
// changeOrigin: true,
// pathRewrite: {
// ["^" + process.env.VUE_APP_BASE_API]: "",
// },
// },
'/api': {
target: `http://192.168.0.105:9033/pharmaceuticals`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",
'^/api': ''
},
},
},
disableHostCheck: true,
},

Loading…
Cancel
Save