diff --git a/.env.development b/.env.development index 719816d..4a874b9 100644 --- a/.env.development +++ b/.env.development @@ -5,6 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' diff --git a/public/xx.xlsx b/public/xx.xlsx new file mode 100644 index 0000000..fb25b99 Binary files /dev/null and b/public/xx.xlsx differ diff --git a/src/api/largeScreen/index.ts b/src/api/largeScreen/index.ts index 87acda0..e5ef999 100644 --- a/src/api/largeScreen/index.ts +++ b/src/api/largeScreen/index.ts @@ -98,3 +98,18 @@ export const cashTotal = () => { method: 'get' }); }; +//安全天数 +export const getSafetyDay = (projectId) => { + return request({ + url: '/money/big/screen/safetyDay/' + projectId, + method: 'get' + }); +}; + +//安全天数 +export const getWeather = (projectId) => { + return request({ + url: '/money/big/screen/weather/' + projectId, + method: 'get' + }); +}; diff --git a/src/api/supplierInput/supplierInput/index.ts b/src/api/supplierInput/supplierInput/index.ts index 834b072..0838699 100644 --- a/src/api/supplierInput/supplierInput/index.ts +++ b/src/api/supplierInput/supplierInput/index.ts @@ -61,3 +61,22 @@ export const delSupplierInput = (id: string | number | Array) = method: 'delete' }); }; +//导入供商入库 +export const leadingIn = (formData: FormData, projectId) => { + return request({ + url: '/supplierInput/supplierInput/import?projectId=' + projectId, + method: 'post', + data: formData, + + headers: { + 'Content-Type': 'multipart/form-data' + } + }); +}; +//导入供商出库 +export const leadingOut = () => { + return request({ + url: '/supplierInput/supplierInput/export', + method: 'post' + }); +}; diff --git a/src/views/ProjectScreen/components/header.vue b/src/views/ProjectScreen/components/header.vue index 5450f69..e4679a5 100644 --- a/src/views/ProjectScreen/components/header.vue +++ b/src/views/ProjectScreen/components/header.vue @@ -19,8 +19,12 @@
-
+
{{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°
{{ item.week }}({{ item.date }})
@@ -78,15 +82,15 @@ const props = defineProps({ type: Boolean, default: false } -}) +}); -const emit = defineEmits(['changePage']) +const emit = defineEmits(['changePage']); const safetyDay = ref(0); -const weatherList = ref([]) -const timer = ref(0) -const offsetY = ref(0) -const curIndex = ref(0) +const weatherList = ref([]); +const timer = ref(0); +const offsetY = ref(0); +const curIndex = ref(0); const transition = ref('transform 0.5s ease'); const pendingPause = ref(false); @@ -106,18 +110,16 @@ function judgeDayOrNight(sunRise: string, sunSet: string) { const now = new Date(); const currentMinutes = now.getHours() * 60 + now.getMinutes(); // true 白天 false 夜晚 - return currentMinutes >= sunRiseMinutes && currentMinutes <= sunSetMinutes - ? true - : false; + return currentMinutes >= sunRiseMinutes && currentMinutes <= sunSetMinutes ? true : false; } /** * 设置天气周期滑动 */ const setWeatherScroll = () => { - curIndex.value += 1 + curIndex.value += 1; transition.value = 'transform 0.3s ease'; - offsetY.value = curIndex.value * 60 + offsetY.value = curIndex.value * 60; if (curIndex.value === weatherList.value.length - 1) { setTimeout(() => { @@ -126,7 +128,7 @@ const setWeatherScroll = () => { offsetY.value = 0; }, 350); } -} +}; function startScroll() { if (timer.value) clearInterval(timer.value); @@ -135,57 +137,56 @@ function startScroll() { function requestPause() { if (timer.value) { - clearInterval(timer.value) - timer.value = null + clearInterval(timer.value); + timer.value = null; } pendingPause.value = true; } function resumeScroll() { - console.log('resumeScroll') + console.log('resumeScroll'); pendingPause.value = false; startScroll(); } - onMounted(() => { /** * 获取安全生产天数 */ - getScreenSafetyDay(props.projectId).then(res => { - const { data, code } = res + getScreenSafetyDay(props.projectId).then((res) => { + const { data, code } = res; if (code === 200) { safetyDay.value = data.safetyDay; } - }) + }); /** * 获取近三天天气 */ - getScreenWeather(props.projectId).then(res => { - const { data, code } = res + getScreenWeather(props.projectId).then((res) => { + const { data, code } = res; if (code === 200) { - data.forEach(item => { + data.forEach((item) => { if (judgeDayOrNight(item.sunRise, item.sunSet)) { - item.weather = item.dayStatus - item.icon = item.dayIcon + item.weather = item.dayStatus; + item.icon = item.dayIcon; } else { - item.weather = item.nightStatus - item.icon = item.nightIcon + item.weather = item.nightStatus; + item.icon = item.nightIcon; } - }) - weatherList.value = data + }); + weatherList.value = data; // 多添加第一项 实现无缝衔接 - weatherList.value = [...weatherList.value, weatherList.value[0]] - startScroll() + weatherList.value = [...weatherList.value, weatherList.value[0]]; + startScroll(); } - }) + }); }); onUnmounted(() => { if (timer.value) { - clearInterval(timer.value) + clearInterval(timer.value); } -}) +}); diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue index 930bbd8..a0e8afc 100644 --- a/src/views/materials/overallPlanMaterialSupply/index.vue +++ b/src/views/materials/overallPlanMaterialSupply/index.vue @@ -38,7 +38,6 @@ - + - - - - - + + + + + - - + + - + diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue index 56c849b..0781865 100644 --- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue +++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue @@ -73,12 +73,12 @@ --> - - - - - - + + + + + +
@@ -214,7 +214,7 @@ const getInfo = () => { console.log('res.data', masterDataRes); Object.assign(form.value, masterDataRes?.data[0]); // console.log('form', form.value); - tableData.value = res.rows.reverse();//翻转 + tableData.value = res.rows; //正序显示 loading.value = false; buttonLoading.value = false; }); @@ -319,9 +319,7 @@ onMounted(() => { .el-input__inner, .el-select .el-input__inner { border-radius: 4px; - transition: - border-color 0.2s, - box-shadow 0.2s; + transition: border-color 0.2s, box-shadow 0.2s; &:focus { border-color: var(--primary-light); @@ -331,9 +329,7 @@ onMounted(() => { .el-textarea__inner { border-radius: 4px; - transition: - border-color 0.2s, - box-shadow 0.2s; + transition: border-color 0.2s, box-shadow 0.2s; &:focus { border-color: var(--primary-light); diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue index 931ce16..e92ea01 100644 --- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue +++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue @@ -74,10 +74,10 @@ - + - - + + - + @@ -223,8 +228,8 @@ - - + + @@ -243,7 +248,7 @@ - + @@ -309,7 +314,14 @@