diff --git a/.env.development b/.env.development index d3e8059..2ee1390 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.180: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/enterpriseLarge/index.ts b/src/api/enterpriseLarge/index.ts new file mode 100644 index 0000000..d94bf2c --- /dev/null +++ b/src/api/enterpriseLarge/index.ts @@ -0,0 +1,13 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; + +/** + * 查询企业关键指标 + */ + +export const keyIndex = () => { + return request({ + url: '/enterprise/big/screen/keyIndex', + method: 'get' + }); +}; 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/api/system/oss/index.ts b/src/api/system/oss/index.ts index 9980610..eb7f6d2 100644 --- a/src/api/system/oss/index.ts +++ b/src/api/system/oss/index.ts @@ -31,3 +31,20 @@ export function delOss(ossId: string | number | Array) { export function downLoadOss(ossId: { id?: string | number; idList?: string | number | Array }, url: string, fileName: string) { return download(url, ossId, fileName); } + +//识别身份证 +export function recognizeidCard(data: any, type: any) { + return request({ + url: '/contractor/constructionUser/idCard?idCardSide=' + type, + method: 'post', + data: data + }); +} +//识别银行卡 +export function recognizeBankCard(data: any) { + return request({ + url: '/contractor/constructionUser/bankCard', + method: 'post', + data: data + }); +} diff --git a/src/assets/images/beUnder.png b/src/assets/images/beUnder.png new file mode 100644 index 0000000..e21b397 Binary files /dev/null and b/src/assets/images/beUnder.png differ diff --git a/src/assets/images/break.png b/src/assets/images/break.png new file mode 100644 index 0000000..80fc33d Binary files /dev/null and b/src/assets/images/break.png differ diff --git a/src/assets/images/constructor.png b/src/assets/images/constructor.png new file mode 100644 index 0000000..adb48c8 Binary files /dev/null and b/src/assets/images/constructor.png differ diff --git a/src/assets/images/contract.png b/src/assets/images/contract.png new file mode 100644 index 0000000..a7c6947 Binary files /dev/null and b/src/assets/images/contract.png differ diff --git a/src/assets/images/manager.png b/src/assets/images/manager.png new file mode 100644 index 0000000..ee256c7 Binary files /dev/null and b/src/assets/images/manager.png differ diff --git a/src/assets/images/subcontractor.png b/src/assets/images/subcontractor.png new file mode 100644 index 0000000..16ad7a5 Binary files /dev/null and b/src/assets/images/subcontractor.png differ diff --git a/src/assets/images/todayConstruction.png b/src/assets/images/todayConstruction.png new file mode 100644 index 0000000..720ede2 Binary files /dev/null and b/src/assets/images/todayConstruction.png differ diff --git a/src/assets/images/totalCapacity.png b/src/assets/images/totalCapacity.png new file mode 100644 index 0000000..8b83b68 Binary files /dev/null and b/src/assets/images/totalCapacity.png differ diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 4921a6d..bac4213 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -41,7 +41,7 @@ diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue index 9e6e857..7e0c7e5 100644 --- a/src/views/design/designChange/indexEdit.vue +++ b/src/views/design/designChange/indexEdit.vue @@ -145,7 +145,13 @@ > - diff --git a/src/views/ProjectScreen/components/centerPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue similarity index 100% rename from src/views/ProjectScreen/components/centerPage.vue rename to src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/header.vue b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue new file mode 100644 index 0000000..d911f88 --- /dev/null +++ b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue @@ -0,0 +1,327 @@ + + + + + diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue new file mode 100644 index 0000000..47717e6 --- /dev/null +++ b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue @@ -0,0 +1,540 @@ + + + + + diff --git a/src/views/ProjectScreen/components/header.vue b/src/views/projectLarge/ProjectScreen/components/header.vue similarity index 85% rename from src/views/ProjectScreen/components/header.vue rename to src/views/projectLarge/ProjectScreen/components/header.vue index 5450f69..e4679a5 100644 --- a/src/views/ProjectScreen/components/header.vue +++ b/src/views/projectLarge/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/ProjectScreen/components/title.vue b/src/views/projectLarge/ProjectScreen/components/title.vue similarity index 100% rename from src/views/ProjectScreen/components/title.vue rename to src/views/projectLarge/ProjectScreen/components/title.vue diff --git a/src/views/projectLarge/ProjectScreen/index.vue b/src/views/projectLarge/ProjectScreen/index.vue new file mode 100644 index 0000000..fead15c --- /dev/null +++ b/src/views/projectLarge/ProjectScreen/index.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 540bb57..872df4a 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -46,16 +46,16 @@ :load="loadChildren" :has-children="hasChildren" > - - + + - - - - + + + + @@ -65,7 +65,7 @@ {{ scope.row.createTime }} - +