diff --git a/.env.development b/.env.development
index 54b9f34..ab0b6d5 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,9 @@
###
# @Author: 张涛
# @Date: 2023-07-18 13:04:50
- # @LastEditors: JC9527
- # @LastEditTime: 2023-10-12 10:31:29
- # @FilePath: \Mudu2PC\.env.development
+ # @LastEditors: 张涛
+ # @LastEditTime: 2023-10-12 13:12:38
+ # @FilePath: \suzhouyingjiPC\.env.development
###
# 页面标题
VUE_APP_TITLE = 苏州应急执法计划管理系统
@@ -15,8 +15,10 @@ ENV = 'development'
# VUE_APP_BASE_API = 'http://39.101.188.84:9033'
# VUE_APP_BASE_API = 'http://192.168.0.106:9033'
VUE_APP_BASE_API = 'http://180.108.205.123:13002'
-# VUE_APP_BASE_API = '/api'
-VUE_APP_LOCATION = 'http://2.46.4.197:8090'
+# 政务网
+# VUE_APP_LOCATION = 'http://2.46.4.197:8090'
+# 外网
+VUE_APP_LOCATION = 'http://180.108.205.123:8090'
# 路由懒加载
diff --git a/public/doc/szd_tl.xlsx b/public/doc/szd_tl.xlsx
new file mode 100644
index 0000000..bedf42f
Binary files /dev/null and b/public/doc/szd_tl.xlsx differ
diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
index 64bd813..308e474 100644
--- a/src/layout/newyjLayout.vue
+++ b/src/layout/newyjLayout.vue
@@ -51,13 +51,13 @@
退出登录
-
+
diff --git a/src/views/yingji/focusEnter.vue b/src/views/yingji/focusEnter.vue
index e79a6a3..85518e2 100644
--- a/src/views/yingji/focusEnter.vue
+++ b/src/views/yingji/focusEnter.vue
@@ -3,8 +3,8 @@
* @version:
* @Author: JC9527
* @Date: 2023-09-04 10:20:06
- * @LastEditors: JC9527
- * @LastEditTime: 2023-09-27 17:06:02
+ * @LastEditors: 张涛
+ * @LastEditTime: 2023-10-12 13:33:22
-->
@@ -59,21 +59,14 @@
删除
-
-
- 导入
-
-
+
导入
+
@@ -107,8 +100,6 @@
header-align="center"
>
-
@@ -187,7 +178,7 @@
@@ -195,32 +186,6 @@
-
-
@@ -293,6 +258,44 @@
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+ 仅允许导入xls、xlsx格式文件。
+ 下载模板
+
+
+
+
@@ -310,6 +313,7 @@ import {
// xzTree,
} from "@/api/yingji/keyEnterprise.js";
// import { mapState } from "vuex";
+import { getToken } from "@/utils/auth";
export default {
components: { myPagination, executive },
@@ -407,6 +411,23 @@ export default {
//总数
total: 0,
fileList: [],
+ // 省重点导入参数
+ upload: {
+ // 是否显示弹出层（省重点导入）
+ open: false,
+ // 弹出层标题（省重点导入）
+ title: "",
+ // 是否禁用上传
+ isUploading: false,
+ // 是否更新已经存在的用户数据
+ updateSupport: 0,
+ // 设置上传的请求头部
+ headers: { Authorization: "Bearer " + getToken() },
+ // 上传的地址
+ url:
+ process.env.VUE_APP_BASE_API +
+ "/pharmaceuticals/bKeyEnterprise/common/importExcel",
+ },
};
},
created() {
@@ -420,60 +441,38 @@ export default {
// }),
// },
methods: {
- // 匹配行政区划
- // componendDistrict(district){
- // let name
- // this.options.map((item)=>{
- // if(item.value == district) {
- // name = item.label
- // } else {
- // item.children.map((itemTwo)=>{
- // if(itemTwo.value == district) {
- // name = item.label + '-' + itemTwo.label
- // }
- // })
- // }
- // })
- // return name
- // },
- // 获取行政区划树
- // quhuadizhi(district) {
- // this.options = district
- // },
- // getTreeList() {
- // xzTree().then((res1) => {
- // if (this.dept.parentId == 0) {
- // res1.data.forEach((value, index) => {
- // this.xzList.push({
- // value: value.county,
- // label: value.institutionName,
- // children: [],
- // });
- // if (value.children.length > 0) {
- // value.children.forEach((value1, index1) => {
- // this.xzList[index].children.push({
- // value: value1.subdistrict,
- // label: value1.institutionName,
- // });
- // });
- // }
- // });
- // }
- // });
- // },
- handleRemove() {},
- // quhua(e) {
- // this.district = e;
- // },
+ handleImport() {
+ this.upload.title = "省重点企业导入";
+ this.upload.open = true;
+ },
+ // 文件上传中处理
+ handleFileUploadProgress(event, file, fileList) {
+ this.upload.isUploading = true;
+ },
+ // 文件上传成功处理
+ handleFileSuccess(response, file, fileList) {
+ this.upload.open = false;
+ this.upload.isUploading = false;
+ this.$refs.upload.clearFiles();
+ this.$alert(
+ "" +
+ response.msg +
+ "
",
+ "导入结果",
+ { dangerouslyUseHTMLString: true }
+ );
+ this.getList();
+ },
+ // 提交上传文件
+ submitFileForm() {
+ this.$refs.upload.submit();
+ },
searchList() {
this.searchBefore = {
pageSize: 10,
pageNum: 1,
};
this.$refs.mypagination.defaultPages();
- // if (this.district) {
- // this.queryParms.district = this.district;
- // }
this.searchBefore = { ...this.searchBefore, ...this.queryParms };
this.getList();
},
@@ -556,18 +555,6 @@ export default {
},
//保存
confirm() {
- // if (this.queryParmsdistrict) {
- // if (this.queryParmsdistrict.length == 1) {
- // this.form.district = this.queryParmsdistrict[0];
- // } else if (
- // this.queryParmsdistrict.length == 2 &&
- // this.queryParmsdistrict[0] == this.queryParmsdistrict[1]
- // ) {
- // this.form.district = this.queryParmsdistrict[0];
- // } else {
- // this.form.district = this.queryParmsdistrict[1];
- // }
- // }
this.$refs.form1.validate((valid) => {
if (valid) {
if (this.form.id != null) {
@@ -639,42 +626,9 @@ export default {
this.getList();
},
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.$refs.mypagination.defaultPages();
- this.getList();
- this.$refs.uploadOver.clearFiles();
- })
- .catch(() => {
- downloadLoadingInstance.close();
- this.$model.msgError("导入失败");
- });
- },
},
mounted() {
this.checkListTwo = this.checkList;
- // this.$nextTick(()=>{
- // let dom = document.getElementsByClassName('tables');
- // let height = dom[0].getBoundingClientRect();
- // let windowHeight = window.innerHeight;
- // let relativeHeight = windowHeight - height.top
- // this.main.height = relativeHeight - 80
- // })
},
};