diff --git a/.env.production b/.env.production index 4e6f237..bef27bb 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,4 @@ VUE_APP_TITLE = 苏州工业园区工业上楼项目系统 ENV = 'production' # 苏州工业园区工业上楼项目系统/生产环境 -VUE_APP_BASE_API = 'http://39.101.188.84:7071' +# VUE_APP_BASE_API = 'http://39.101.188.84:7071' diff --git a/src/api/ManageApi/index.js b/src/api/ManageApi/index.js index 458e8da..596a9a5 100644 --- a/src/api/ManageApi/index.js +++ b/src/api/ManageApi/index.js @@ -1,19 +1,5 @@ // src/api/ManageApi/index.js import request from '@/utils/request'; -import { getToken } from '@/utils/auth'; - - -// 企业--基本信息==下载模板(基本信息模板) -export function exportBasicInformationTemplate() { - return request({ - url: '/gysl/basicInformation/importTemplate', - method: 'post', - responseType: 'blob', - headers: { - 'Authorization': `Bearer ${getToken()}` - } - }); -} // 分页查询所有数据 export function getBasicInformationPage(params) { return request({ @@ -22,21 +8,6 @@ export function getBasicInformationPage(params) { params }) } -// 企业基本信息--的导入功能 -export function importBasicInformation(data) { - const formData = new FormData(); - formData.append('file', data.file); - - return request({ - url: '/gysl/basicInformation/import', - method: 'post', - data: formData, - headers: { - 'Content-Type': 'multipart/form-data', - 'Authorization': `Bearer ${getToken()}`, - }, - }); -} // 企业--基本信息==展示 export function getBasicInformationById(id) { return request({ diff --git a/src/views/components/ProjectDetails/Basic.vue b/src/views/components/ProjectDetails/Basic.vue index c1becd8..6ac8c86 100644 --- a/src/views/components/ProjectDetails/Basic.vue +++ b/src/views/components/ProjectDetails/Basic.vue @@ -13,18 +13,19 @@ style="width: 0.6rem; height: 0.6rem; margin-right: 4px;"> 编辑 - 编辑 导出 - + -->
- 项目代表性照片 + + 项目代表性照片
@@ -170,16 +171,6 @@ - - - - - - - - - - @@ -197,7 +188,8 @@ - +
@@ -205,7 +197,6 @@ \ No newline at end of file diff --git a/src/views/components/ProjectDetails/Models.vue b/src/views/components/ProjectDetails/Models.vue index e91f4f9..b17099c 100644 --- a/src/views/components/ProjectDetails/Models.vue +++ b/src/views/components/ProjectDetails/Models.vue @@ -8,10 +8,11 @@
+ style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" + @click="toggleEditAll"> 编辑 - 编辑 + {{ isEditingAll ? '保存' : '编辑' }}
@@ -20,11 +21,17 @@
- - - - - + + +
{{ row.left }}{{ row.label1 }} {{ row.right1 }}{{ row.label2 }} {{ row.right2 }}{{ row.label3 }} {{ row.right3 }}
{{ row.ysmc }} +
+ {{ item.zdname }}: + +
+
+ {{ item.zdname }}: {{ item.zdinfor || '无' }} +
+
@@ -35,27 +42,52 @@ + \ No newline at end of file diff --git a/src/views/components/ProjectDetails/Others.vue b/src/views/components/ProjectDetails/Others.vue index 31f5280..31f730d 100644 --- a/src/views/components/ProjectDetails/Others.vue +++ b/src/views/components/ProjectDetails/Others.vue @@ -13,12 +13,12 @@ style="width: 0.6rem; height: 0.6rem; margin-right: 4px;"> 新增 - 编辑 编辑 - + --> 导出
- + {{ item.zdinfor }} @@ -64,18 +64,18 @@ + + \ No newline at end of file diff --git a/src/views/components/ProjectDetails/companyenter(备份).vue b/src/views/components/ProjectDetails/companyenter(备份).vue deleted file mode 100644 index 2a97dc0..0000000 --- a/src/views/components/ProjectDetails/companyenter(备份).vue +++ /dev/null @@ -1,197 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/components/dialog/basicinfo.vue b/src/views/components/dialog/basicinfo.vue deleted file mode 100644 index c0657a2..0000000 --- a/src/views/components/dialog/basicinfo.vue +++ /dev/null @@ -1,337 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/components/qiyexinxi/qiyexinxi.vue b/src/views/components/qiyexinxi/qiyexinxi.vue new file mode 100644 index 0000000..da85c3b --- /dev/null +++ b/src/views/components/qiyexinxi/qiyexinxi.vue @@ -0,0 +1,289 @@ + + + + + \ No newline at end of file diff --git a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue new file mode 100644 index 0000000..73cbb36 --- /dev/null +++ b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue @@ -0,0 +1,308 @@ + + + + + \ No newline at end of file diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue index a6b08ce..ae0c81a 100644 --- a/src/views/manage-info/index.vue +++ b/src/views/manage-info/index.vue @@ -9,7 +9,8 @@
- 已提交
+ 已提交 +
@@ -23,56 +24,61 @@
- + +
- + +
- +
- + +
- +
- + +
- +
- +
- +
- +
- +
- + +
@@ -81,20 +87,21 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index dfe5f7f..c575267 100644 --- a/vue.config.js +++ b/vue.config.js @@ -37,7 +37,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.111:7071/`, + target: `192.168.0.111:7071`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''