ljf
/
shuili-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into release-sy-v1.0.0

sy-water-data-board-ui
hxh 6 months ago
parent
a62ad1f026 c0364d2434
commit
efc3d74103
33 changed files with 127 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .env.production
  2. 3
      src/components/myUpload/index.vue
  3. 9
      src/views/dike/engineeringCondition/dikeBaseInfo copy/options/projectManagement.vue
  4. 2
      src/views/dike/engineeringCondition/identificationPlate/components/markForm.vue
  5. 4
      src/views/dike/managementGuarantee/archivesManagement/index.vue
  6. 2
      src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
  7. 2
      src/views/dike/safetyManage/confirmDelimitationManage/index.vue
  8. 6
      src/views/dike/safetyManage/declarationManage/declare/components/listPage/transform.vue
  9. 4
      src/views/dike/safetyManage/floodControlManagement/preplan.vue
  10. 2
      src/views/dike/safetyManage/safeProduction/components/list.vue
  11. 8
      src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
  12. 6
      src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
  13. 10
      src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/options/projectManagement.vue
  14. 20
      src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/options/projectManagement.vue
  15. 3
      src/views/engineeringCondition/identificationPlate/dyke/components/markForm.vue
  16. 4
      src/views/engineeringCondition/identificationPlate/sluice/components/markForm.vue
  17. 5
      src/views/safetyManage/confirmDelimitationManage/sluice/index.vue
  18. 7
      src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
  19. 5
      src/views/safetyManage/floodControlManagement/sluice/preplan.vue
  20. 5
      src/views/safetyManage/safeProduction/sluice/index.vue
  21. 9
      src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue
  22. 7
      src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection.vue
  23. 2
      src/views/sluice/engineeringCondition/identificationPlate/components/markForm.vue
  24. 21
      src/views/sluice/engineeringCondition/sluiceBaseInfo copy/options/projectManagement.vue
  25. 4
      src/views/sluice/managementGuarantee/archivesManagement/index.vue
  26. 2
      src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
  27. 2
      src/views/sluice/safetyManage/confirmDelimitationManage/index.vue
  28. 7
      src/views/sluice/safetyManage/declarationManage/declare/components/listPage/transform.vue
  29. 5
      src/views/sluice/safetyManage/floodControlManagement/preplan.vue
  30. 5
      src/views/sluice/safetyManage/safeProduction/components/list.vue
  31. 9
      src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
  32. 7
      src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
  33. 6
      vue.config.js

2
.env.production
View File

@ -2,5 +2,5 @@
ENV = 'admin'
# 若依管理系统/生产环境
VUE_APP_BASE_API = '/thinking'
VUE_APP_BASE_API = '/sgcyy-slgcyxgl/thinking'
VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/'

3
src/components/myUpload/index.vue
View File

@ -1,7 +1,7 @@
<template>
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:before-upload="(file) => $fileBeforeUpload(file, 'fileList')"
:on-preview="handlePreview"
@ -35,6 +35,7 @@ export default {
},
data() {
return {
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
headers: {
shuili: "water " + getToken(),
},

9
src/views/dike/engineeringCondition/dikeBaseInfo copy/options/projectManagement.vue
View File

@ -231,7 +231,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="
@ -298,7 +298,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="
@ -361,7 +361,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList3')"
@ -399,7 +399,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList4')"
@ -508,6 +508,7 @@ export default {
protectionDelimitationOptions: [],
// 监控类型字典
monitoringTypeOptions: [],
uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",
// 查询参数
queryParams: {
pageNum: 1,

2
src/views/dike/engineeringCondition/identificationPlate/components/markForm.vue
View File

@ -32,7 +32,7 @@
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList')"

4
src/views/dike/managementGuarantee/archivesManagement/index.vue
View File

@ -249,7 +249,7 @@
<myUpload :fileList="fileList1" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -272,7 +272,7 @@
<myUpload :fileList="fileLis2" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"

2
src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
View File

@ -197,7 +197,7 @@
<myUpload :fileList="fileList1" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"

2
src/views/dike/safetyManage/confirmDelimitationManage/index.vue
View File

@ -261,7 +261,7 @@
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"

6
src/views/dike/safetyManage/declarationManage/declare/components/listPage/transform.vue
View File

@ -216,7 +216,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -268,7 +268,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -360,6 +360,8 @@ export default {
securityIsPassOptions: [],
// 安全类别是否通过字典
securityCategoryIsPassOptions: [],
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 查询参数
queryParams: {
pageNum: 1,

4
src/views/dike/safetyManage/floodControlManagement/preplan.vue
View File

@ -278,7 +278,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"
@ -339,6 +339,8 @@ export default {
checkStrictly: true, //选择任意一级
},
areasOptions: [],
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 遮罩层
loading: true,
// 选中数组

2
src/views/dike/safetyManage/safeProduction/components/list.vue
View File

@ -307,7 +307,7 @@
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"

8
src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
View File

@ -159,7 +159,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -187,7 +187,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -215,7 +215,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList3')"
@ -283,6 +283,8 @@ export default {
approvalDepartmentLevelOptions: [],
// 安全类别字典
securityCategoryOptions: [],
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 查询参数
queryParams: {
pageNum: 1,

6
src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
View File

@ -69,7 +69,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -97,7 +97,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -165,6 +165,8 @@ export default {
gateTypeOptions: [],
// 启闭机型式字典
hoistTypeOptions: [],
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 查询参数
queryParams: {
pageNum: 1,

10
src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/options/projectManagement.vue
View File

@ -227,7 +227,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="
@ -294,7 +294,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="
@ -357,7 +357,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList3')"
@ -395,7 +395,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList4')"
@ -504,6 +504,8 @@ export default {
protectionDelimitationOptions: [],
// 监控类型字典
monitoringTypeOptions: [],
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 查询参数
queryParams: {
pageNum: 1,

20
src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/options/projectManagement.vue
View File

@ -227,7 +227,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="
@ -294,7 +294,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="
@ -357,7 +357,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList3')"
@ -395,7 +395,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList4')"
@ -428,7 +428,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList5')"
@ -461,7 +461,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList6')"
@ -493,7 +493,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList7')"
@ -526,7 +526,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList8')"
@ -559,7 +559,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList9')"
@ -643,6 +643,8 @@ export default {
managementConfirmationOptions: [],
// 保护范围划界字典
protectionDelimitationOptions: [],
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 查询参数
queryParams: {
pageNum: 1,

3
src/views/engineeringCondition/identificationPlate/dyke/components/markForm.vue
View File

@ -32,7 +32,7 @@
<!-- <el-input v-model="form.photo" placeholder="请输入上传图片" /> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList')"
@ -118,6 +118,7 @@ export default {
return {
form: {},
valid: false,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 请求头
headers: {
shuili: "water " + getToken(),

4
src/views/engineeringCondition/identificationPlate/sluice/components/markForm.vue
View File

@ -33,7 +33,7 @@
<!-- <el-input v-model="form.photo" placeholder="请输入上传图片" /> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList')"
@ -119,6 +119,8 @@ export default {
return {
form: {},
valid: false,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 请求头
headers: {
shuili: "water " + getToken(),

5
src/views/safetyManage/confirmDelimitationManage/sluice/index.vue
View File

@ -242,7 +242,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"
@ -422,6 +422,9 @@ export default {
securityCategoryOptions: [],
// 安全鉴定状态字典
securityStatusOptions: [],
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 查询参数
queryParams: {
pageNum: 1,

7
src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
View File

@ -219,7 +219,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -271,7 +271,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -348,6 +348,9 @@ export default {
showSearch: true,
// 总条数
total: 0,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 水闸换证信息表格数据
hzxxList: [],
// 弹出层标题

5
src/views/safetyManage/floodControlManagement/sluice/preplan.vue
View File

@ -263,7 +263,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"
@ -319,6 +319,9 @@ export default {
ids: [],
// 非单个禁用
single: true,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 非多个禁用
multiple: true,
// 显示搜索条件

5
src/views/safetyManage/safeProduction/sluice/index.vue
View File

@ -305,7 +305,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"
@ -361,6 +361,9 @@ export default {
multiple: true,
// 显示搜索条件
showSearch: true,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 总条数
total: 0,
// 水闸隐患信息表格数据

9
src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue
View File

@ -159,7 +159,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -187,7 +187,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -215,7 +215,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList3')"
@ -267,6 +267,9 @@ export default {
ids: [],
// 非单个禁用
single: true,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 非多个禁用
multiple: true,
// 显示搜索条件

7
src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection.vue
View File

@ -69,7 +69,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -97,7 +97,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -155,6 +155,9 @@ export default {
showSearch: true,
// 总条数
total: 0,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 水闸安全检测表格数据
aqjcList: [],
// 弹出层标题

2
src/views/sluice/engineeringCondition/identificationPlate/components/markForm.vue
View File

@ -33,7 +33,7 @@
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList')"

21
src/views/sluice/engineeringCondition/sluiceBaseInfo copy/options/projectManagement.vue
View File

@ -231,7 +231,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="
@ -298,7 +298,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="
@ -361,7 +361,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList3')"
@ -399,7 +399,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList4')"
@ -432,7 +432,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList5')"
@ -465,7 +465,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList6')"
@ -497,7 +497,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList7')"
@ -530,7 +530,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList8')"
@ -563,7 +563,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handleOpinionPreview"
:on-remove="(file) => handleOpinionRemove(file, 'fileList9')"
@ -629,6 +629,9 @@ export default {
sluiceEngineerMangeInfoList: [],
// 弹出层标题
title: "",
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 是否显示弹出层
open: false,
// 工程管理单位性质字典

4
src/views/sluice/managementGuarantee/archivesManagement/index.vue
View File

@ -249,7 +249,7 @@
<myUpload :fileList="fileList1" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -272,7 +272,7 @@
<myUpload :fileList="fileList2" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"

2
src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
View File

@ -197,7 +197,7 @@
<myUpload :fileList="fileList1" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"

2
src/views/sluice/safetyManage/confirmDelimitationManage/index.vue
View File

@ -254,7 +254,7 @@
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"

7
src/views/sluice/safetyManage/declarationManage/declare/components/listPage/transform.vue
View File

@ -219,7 +219,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -271,7 +271,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -352,6 +352,9 @@ export default {
hzxxList: [],
// 弹出层标题
title: "",
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 是否显示弹出层
open: false,
// 水闸类型字典

5
src/views/sluice/safetyManage/floodControlManagement/preplan.vue
View File

@ -295,7 +295,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"
@ -368,6 +368,9 @@ export default {
showSearch: true,
// 总条数
total: 0,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 水闸预案表格数据
yaxxList: [],
// 弹出层标题

5
src/views/sluice/safetyManage/safeProduction/components/list.vue
View File

@ -302,7 +302,7 @@
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList')"
@ -358,6 +358,9 @@ export default {
ids: [],
// 非单个禁用
single: true,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 非多个禁用
multiple: true,
// 显示搜索条件

9
src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
View File

@ -159,7 +159,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -187,7 +187,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -215,7 +215,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList3')"
@ -277,6 +277,9 @@ export default {
aqjdxxList: [],
// 弹出层标题
title: "",
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 是否显示弹出层
open: false,
// 审定部门级别字典

7
src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
View File

@ -69,7 +69,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
@ -97,7 +97,7 @@
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:action="uploadUrl"
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList2')"
@ -151,6 +151,9 @@ export default {
single: true,
// 非多个禁用
multiple: true,
uploadUrl: process.env.VUE_APP_BASE_API + "/system/upload",
// 显示搜索条件
showSearch: true,
// 总条数

6
vue.config.js
View File

@ -18,7 +18,7 @@ module.exports = {
// 部署生产环境和开发环境下的URL。
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
publicPath: './',
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
outputDir: 'dist',
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@ -67,6 +67,10 @@ module.exports = {
// ['^' + process.env.VUE_APP_BASE_API]: '/tianhui-admin-web'
// }
// },
["profile"]: {
target: 'http://shuili-admin.product.dev.com:30115',
changeOrigin: true
},
[process.env.VUE_APP_BASE_API]: {
target: 'http://shuili-admin.product.dev.com:30115',
// target: 'http://172.16.34.59:18082',

Write Preview
Loading…
Cancel
Save