fix: BUG修改

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<FormRules>({
 });
 const confirmSubmit = (ruleFormRef: FormInstance | undefined) => {
 	if (!ruleFormRef) return;
+	ruleFormRef.validate(async (valid, fields) => {
+		if (valid) {
 			if (!copyBool.value) {
 				ElMessage.error("请先复制账号密码以及手机号和登录地址");
 				return;
 			}
-	ruleFormRef.validate(async (valid, fields) => {
-		if (valid) {
 			ruleForm.value.enterpriseMains = [
 				{
 					leadName: ruleForm.value.legalPerson,

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: "",

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<FormInstance>();
-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;

src/views/goverment/huizhou/enterpriseList/components/editForm/basic-form.vue

@@ -178,7 +178,8 @@ const emit = defineEmits<{
 const globalStore = GlobalStore();
 const ruleFormRef = ref<FormInstance>();
 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([]);

src/views/goverment/huizhou/enterpriseList/components/editForm/unit-table.vue

@@ -148,7 +148,8 @@ const rules = reactive<FormRules>({
 	]
 });
 
-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<Options[]>([]);
 

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([]);

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 },

src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue

@@ -114,11 +114,11 @@ const addVisible = ref(false);
 // 弹窗中的配置
 const formConfig = {
 	formItemConfig: [
-		{
+		// {
-			label: "累计拨款金额(元)",
+		// 	label: "累计拨款金额(元)",
-			prop: "totalAmount",
+		// 	prop: "totalAmount",
-			type: "input"
+		// 	type: "input"
-		},
+		// },
 		{
 			label: "付款金额(元)",
 			prop: "payAmount",
@@ -131,16 +131,16 @@ const formConfig = {
 			format: "YYYY-MM-DD",
 			valueFormat: "YYYY-MM-DD"
 		},
-		{
+		// {
-			label: "未支付工程款(元)",
+		// 	label: "未支付工程款(元)",
-			prop: "unPayAmount",
+		// 	prop: "unPayAmount",
-			type: "input"
+		// 	type: "input"
-		},
+		// },
-		{
+		// {
-			label: "支付百分比(%)",
+		// 	label: "支付百分比(%)",
-			prop: "payRatio",
+		// 	prop: "payRatio",
-			type: "input"
+		// 	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");

src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue

@@ -189,7 +189,7 @@
 			</div>
 		</el-form>
 
-		<div class="table">
+		<!-- <div class="table">
 			<h4>单体项目</h4>
 			<el-table
 				:data="form.engineeringSingles"
@@ -240,7 +240,7 @@
 						<el-button type="danger" link @click="removeEngineeringSingle(row)">删除</el-button>
 					</template>
 				</el-table-column>
-				<!-- 表格无数据情况 -->
+				表格无数据情况
 				<template #empty>
 					<div class="table-empty">
 						<slot name="empty">
@@ -250,7 +250,7 @@
 					</div>
 				</template>
 			</el-table>
-		</div>
+		</div> -->
 		<footer class="footer">
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>

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<any>([]);
 const addDialogVisible = ref(false);

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
 });

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({

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
 });

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

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 });

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

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

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<FormInstance>();
-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;

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 });

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

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

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<FormInstance>();
-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;