diff --git a/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue b/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue index 47e3694..fa91adb 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue +++ b/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue @@ -212,7 +212,8 @@ const emits = defineEmits(["update:detailsDialog", "confirm"]); const showIsAuthority = ref(false); const isOpen = ref(false); const governNameList = ref([]); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const copyBool = ref(false); const filelist = ref([]); const ruleForm = ref({ @@ -429,12 +430,12 @@ const rules = ref({ }); const confirmSubmit = (ruleFormRef: FormInstance | undefined) => { if (!ruleFormRef) return; - if (!copyBool.value) { - ElMessage.error("请先复制账号密码以及手机号和登录地址"); - return; - } ruleFormRef.validate(async (valid, fields) => { if (valid) { + if (!copyBool.value) { + ElMessage.error("请先复制账号密码以及手机号和登录地址"); + return; + } ruleForm.value.enterpriseMains = [ { leadName: ruleForm.value.legalPerson, diff --git a/src/views/goverment/huizhou/assessmentManagement/unitScore/components/addCompany.vue b/src/views/goverment/huizhou/assessmentManagement/unitScore/components/addCompany.vue index 3f437c4..9b01548 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitScore/components/addCompany.vue +++ b/src/views/goverment/huizhou/assessmentManagement/unitScore/components/addCompany.vue @@ -191,7 +191,8 @@ const emits = defineEmits(["update:detailsDialog", "confirm"]); const showIsAuthority = ref(false); const isOpen = ref(false); const governNameList = ref([]); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const filelist = ref([]); const ruleForm = ref({ enterpriseName: "", diff --git a/src/views/goverment/huizhou/droneImaging/index.vue b/src/views/goverment/huizhou/droneImaging/index.vue index f1615a5..cc5f60c 100644 --- a/src/views/goverment/huizhou/droneImaging/index.vue +++ b/src/views/goverment/huizhou/droneImaging/index.vue @@ -163,7 +163,8 @@ const active = ref(1); const store = GlobalStore(); const headers = ref({ Authorization: "Bearer " + store.token }); const ruleFormRef = ref(); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; interface formData { title: string; uploadTime: string; diff --git a/src/views/goverment/huizhou/enterpriseList/components/editForm/basic-form.vue b/src/views/goverment/huizhou/enterpriseList/components/editForm/basic-form.vue index 47496cb..82d168d 100644 --- a/src/views/goverment/huizhou/enterpriseList/components/editForm/basic-form.vue +++ b/src/views/goverment/huizhou/enterpriseList/components/editForm/basic-form.vue @@ -178,7 +178,8 @@ const emit = defineEmits<{ const globalStore = GlobalStore(); const ruleFormRef = ref(); const governNameList = ref([]); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const isOpen = ref(false); const showIsAuthority = ref(false); const filelist = ref([]); diff --git a/src/views/goverment/huizhou/enterpriseList/components/editForm/unit-table.vue b/src/views/goverment/huizhou/enterpriseList/components/editForm/unit-table.vue index 5e04120..08378f1 100644 --- a/src/views/goverment/huizhou/enterpriseList/components/editForm/unit-table.vue +++ b/src/views/goverment/huizhou/enterpriseList/components/editForm/unit-table.vue @@ -148,7 +148,8 @@ const rules = reactive({ ] }); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const options = ref([]); diff --git a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue index 3066245..7f7aa57 100644 --- a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue +++ b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue @@ -362,7 +362,8 @@ const pages = ref({ }); const records = ref([]); const active = ref(1); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const globalStore = GlobalStore(); const fileList = ref([]); const fileList1 = ref([]); diff --git a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue index 0420fa8..4367be4 100644 --- a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue +++ b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue @@ -110,7 +110,8 @@ const records = ref([]); const active = ref(1); const store = GlobalStore(); const headers = ref({ Authorization: "Bearer " + store.token }); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; // 表格配置项 const columns: ColumnProps[] = [ { prop: "projectCode", label: "子目号", width: 150 }, diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue index c54e42d..96d3f62 100644 --- a/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue +++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue @@ -114,11 +114,11 @@ const addVisible = ref(false); // 弹窗中的配置 const formConfig = { formItemConfig: [ - { - label: "累计拨款金额(元)", - prop: "totalAmount", - type: "input" - }, + // { + // label: "累计拨款金额(元)", + // prop: "totalAmount", + // type: "input" + // }, { label: "付款金额(元)", prop: "payAmount", @@ -131,16 +131,16 @@ const formConfig = { format: "YYYY-MM-DD", valueFormat: "YYYY-MM-DD" }, - { - label: "未支付工程款(元)", - prop: "unPayAmount", - type: "input" - }, - { - label: "支付百分比(%)", - prop: "payRatio", - type: "input" - }, + // { + // label: "未支付工程款(元)", + // prop: "unPayAmount", + // type: "input" + // }, + // { + // label: "支付百分比(%)", + // prop: "payRatio", + // type: "input" + // }, { label: "申报时段", prop: "applyIdList", @@ -253,13 +253,13 @@ const getApplyTimeData = async () => { const res = await govermentApplyTimeList(requestData); console.log(res, "------------未支付申报时段"); if (res && res.result.length > 0) { - formConfig.formItemConfig[5].data = res.result.map(i => { + formConfig.formItemConfig[2].data = res.result.map(i => { return { label: i.name, value: i.id }; }); - console.log(formConfig.formItemConfig[5].data); + console.log(formConfig.formItemConfig[2].data); } }; // 新增,编辑数据 @@ -352,7 +352,7 @@ watch( (n, o) => { visible1.value = n; if (n) { - formConfig.formItemConfig[5].data = []; + formConfig.formItemConfig[2].data = []; getSubItemList(); } else { emits("confirm"); diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue index c383178..598bbbf 100644 --- a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue +++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue @@ -189,7 +189,7 @@ -
+ + 表格无数据情况 -
+ -->
下一步
diff --git a/src/views/goverment/huizhou/projectList/components/fileListDialog/index.vue b/src/views/goverment/huizhou/projectList/components/fileListDialog/index.vue index f7b323b..e85a141 100644 --- a/src/views/goverment/huizhou/projectList/components/fileListDialog/index.vue +++ b/src/views/goverment/huizhou/projectList/components/fileListDialog/index.vue @@ -121,7 +121,8 @@ const columns: ColumnProps[] = [ { prop: "operation", label: "操作" } ]; const store = GlobalStore(); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const headers = ref({ Authorization: "Bearer " + store.token }); const current = ref([]); const addDialogVisible = ref(false); diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/orderAdd.vue b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/orderAdd.vue index 67f22d2..bd2073a 100644 --- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/orderAdd.vue +++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/orderAdd.vue @@ -468,7 +468,8 @@ const dangerForm = ref({ image: [] }); const storeVisible = ref(false); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const props = defineProps({ orderDialog: Boolean }); diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue index b99d92a..931d0c1 100644 --- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue +++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue @@ -352,7 +352,8 @@ const reformInfo = ref({ recommend: "", solveImage: [] }); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; // 提交打印 const submitPrint = async () => { printJS({ diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/orderAdd.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/orderAdd.vue index 5f0e09a..1820e6e 100644 --- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/orderAdd.vue +++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/orderAdd.vue @@ -454,7 +454,8 @@ const dangerForm = ref({ image: [] }); const storeVisible = ref(false); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const props = defineProps({ orderDialog: Boolean }); diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue index 3e07636..30d1301 100644 --- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue +++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue @@ -317,7 +317,8 @@ import type { FormInstance, UploadProps } from "element-plus"; import { relativeInfo, timeLineData, singleOptionAudit, allOptionAudit } from "@/api/modules/goverment"; import { submitReform } from "@/api/modules/project"; import printJS from "print-js"; -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const props = defineProps({ detailsDialog: Boolean, relativeId: String diff --git a/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue b/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue index 845f331..2f11fdc 100644 --- a/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue +++ b/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue @@ -292,7 +292,8 @@ const searchForm = ref({ timeRange: [] }); const globalStore = GlobalStore(); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const fileList1 = ref([]); const fileList = ref([]); const headers = ref({ Authorization: "Bearer " + globalStore.token }); diff --git a/src/views/hz-enterprise/projectMonitor/qualityManagement/components/transformInfo.vue b/src/views/hz-enterprise/projectMonitor/qualityManagement/components/transformInfo.vue index 299b37a..0ffee24 100644 --- a/src/views/hz-enterprise/projectMonitor/qualityManagement/components/transformInfo.vue +++ b/src/views/hz-enterprise/projectMonitor/qualityManagement/components/transformInfo.vue @@ -261,7 +261,8 @@ import { onMounted, ref, watch, reactive } from "vue"; import { ElMessage, ElMessageBox } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus"; import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project"; -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const props = defineProps({ detailsDialog: Boolean, relativeId: String diff --git a/src/views/hz-enterprise/projectMonitor/safetyManagement/components/transformInfo.vue b/src/views/hz-enterprise/projectMonitor/safetyManagement/components/transformInfo.vue index b2fe196..50ac5a9 100644 --- a/src/views/hz-enterprise/projectMonitor/safetyManagement/components/transformInfo.vue +++ b/src/views/hz-enterprise/projectMonitor/safetyManagement/components/transformInfo.vue @@ -259,7 +259,8 @@ import { onMounted, ref, watch, reactive } from "vue"; import { ElMessage, ElMessageBox } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus"; import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project"; -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const props = defineProps({ detailsDialog: Boolean, relativeId: String diff --git a/src/views/hz-enterprise/smartSite/unmannedVideo/videoData/index.vue b/src/views/hz-enterprise/smartSite/unmannedVideo/videoData/index.vue index 18e6321..4ad604d 100644 --- a/src/views/hz-enterprise/smartSite/unmannedVideo/videoData/index.vue +++ b/src/views/hz-enterprise/smartSite/unmannedVideo/videoData/index.vue @@ -156,7 +156,8 @@ const fileList = ref([]); const store = GlobalStore(); const headers = ref({ Authorization: "Bearer " + store.token }); const ruleFormRef = ref(); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; interface formData { title: string; uploadTime: string; diff --git a/src/views/hz-project/progressManagement/subItemManagement/index.vue b/src/views/hz-project/progressManagement/subItemManagement/index.vue index 19dd96a..a1d0e77 100644 --- a/src/views/hz-project/progressManagement/subItemManagement/index.vue +++ b/src/views/hz-project/progressManagement/subItemManagement/index.vue @@ -252,7 +252,8 @@ const searchForm = ref({ timeRange: [] }); const globalStore = GlobalStore(); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const fileList1 = ref([]); const fileList = ref([]); const headers = ref({ Authorization: "Bearer " + globalStore.token }); diff --git a/src/views/hz-project/projectMonitor/qualityManagement/components/transformInfo.vue b/src/views/hz-project/projectMonitor/qualityManagement/components/transformInfo.vue index 299b37a..0ffee24 100644 --- a/src/views/hz-project/projectMonitor/qualityManagement/components/transformInfo.vue +++ b/src/views/hz-project/projectMonitor/qualityManagement/components/transformInfo.vue @@ -261,7 +261,8 @@ import { onMounted, ref, watch, reactive } from "vue"; import { ElMessage, ElMessageBox } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus"; import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project"; -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const props = defineProps({ detailsDialog: Boolean, relativeId: String diff --git a/src/views/hz-project/projectMonitor/safetyManagement/components/transformInfo.vue b/src/views/hz-project/projectMonitor/safetyManagement/components/transformInfo.vue index b2fe196..50ac5a9 100644 --- a/src/views/hz-project/projectMonitor/safetyManagement/components/transformInfo.vue +++ b/src/views/hz-project/projectMonitor/safetyManagement/components/transformInfo.vue @@ -259,7 +259,8 @@ import { onMounted, ref, watch, reactive } from "vue"; import { ElMessage, ElMessageBox } from "element-plus"; import type { FormInstance, UploadProps } from "element-plus"; import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project"; -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const props = defineProps({ detailsDialog: Boolean, relativeId: String diff --git a/src/views/hz-project/smartSite/unmannedVideo/videoData/index.vue b/src/views/hz-project/smartSite/unmannedVideo/videoData/index.vue index c215361..43d5e4f 100644 --- a/src/views/hz-project/smartSite/unmannedVideo/videoData/index.vue +++ b/src/views/hz-project/smartSite/unmannedVideo/videoData/index.vue @@ -128,7 +128,8 @@ const fileList = ref([]); const store = GlobalStore(); const headers = ref({ Authorization: "Bearer " + store.token }); const ruleFormRef = ref(); -const baseUrl = import.meta.env.VITE_API_URL; +const baseUrl = window.location.protocol + "//" + window.location.host; +// const baseUrl = import.meta.env.VITE_API_URL; const isBool = ref(true); interface formData { title: string;