Commit b695a250 authored by 王玉鑫's avatar 王玉鑫

fix: 时间组件引入及环境变量修正

parent 09fcb4a1
NODE_ENV=development NODE_ENV=development
# VITE_BASE_URL=http://test.api.liyeyun.com
VITE_BASE_URL=/API VITE_BASE_URL=/API
VITE_BASE_USER_URL=/userAPI VITE_BASE_USER_URL=/userAPI
NODE_ENV=production
VITE_BASE_URL=http://test.api.liyeyun.com VITE_BASE_URL=http://test.api.liyeyun.com
# VITE_BASE_URL=/API # VITE_BASE_URL=/API
VITE_BASE_USER_URL=http://test.user.liyeyun.com VITE_BASE_USER_URL=http://test.user.liyeyun.com
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
"element-plus": "^2.4.3", "element-plus": "^2.4.3",
"jsencrypt": "^3.3.2", "jsencrypt": "^3.3.2",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"moment": "^2.29.4",
"pinia": "^2.1.7", "pinia": "^2.1.7",
"qrcode": "^1.5.3", "qrcode": "^1.5.3",
"swiper": "^11.0.5", "swiper": "^11.0.5",
...@@ -8025,14 +8024,6 @@ ...@@ -8025,14 +8024,6 @@
"ufo": "^1.3.0" "ufo": "^1.3.0"
} }
}, },
"node_modules/moment": {
"version": "2.29.4",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
"engines": {
"node": "*"
}
},
"node_modules/ms": { "node_modules/ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
...@@ -17311,11 +17302,6 @@ ...@@ -17311,11 +17302,6 @@
"ufo": "^1.3.0" "ufo": "^1.3.0"
} }
}, },
"moment": {
"version": "2.29.4",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
},
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build:prod": "npm run build-only", "build:prod": "npm run build-only -- -m development",
"build:test": "npm run build-only", "build:test": "npm run build-only -- -m test",
"preview": "vite preview", "preview": "vite preview",
"test:unit": "vitest", "test:unit": "vitest",
"build-only": "vite build", "build-only": "vite build",
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
"element-plus": "^2.4.3", "element-plus": "^2.4.3",
"jsencrypt": "^3.3.2", "jsencrypt": "^3.3.2",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"moment": "^2.29.4",
"pinia": "^2.1.7", "pinia": "^2.1.7",
"qrcode": "^1.5.3", "qrcode": "^1.5.3",
"swiper": "^11.0.5", "swiper": "^11.0.5",
......
...@@ -32,13 +32,12 @@ ...@@ -32,13 +32,12 @@
/> --> /> -->
<DatePicker <DatePicker
ref="date" ref="date"
prefix-class="lyy"
v-model:value="params.time" v-model:value="params.time"
prefix-class="lyy"
:range="true" :range="true"
separator="至" separator="至"
:confirm="false" :confirm="false"
:clearable="true" :clearable="true"
:shortcuts="ranges"
:disabled-date="notAfterToday" :disabled-date="notAfterToday"
confirm-text="确认" confirm-text="确认"
format="YYYY-MM-DD" format="YYYY-MM-DD"
...@@ -46,7 +45,7 @@ ...@@ -46,7 +45,7 @@
placeholder="请选择录入时间" placeholder="请选择录入时间"
></DatePicker> ></DatePicker>
</div> </div>
<div > <div>
<ElSelect v-model="params.status" clearable placeholder="请选择审批状态"> <ElSelect v-model="params.status" clearable placeholder="请选择审批状态">
<ElOption <ElOption
v-for="status of statusList" v-for="status of statusList"
...@@ -72,7 +71,7 @@ ...@@ -72,7 +71,7 @@
</div> </div>
</div> </div>
</div> </div>
<ElTable class="mt-3" :data="datas" row-key="id" border :header-cell-style='tableHeaderStyle'> <ElTable class="mt-3" :data="datas" row-key="id" border :header-cell-style="tableHeaderStyle">
<ElTableColumn label="序号" width="60"> <ElTableColumn label="序号" width="60">
<template #default="{ $index }"> <template #default="{ $index }">
<div>{{ $index + 1 }}</div> <div>{{ $index + 1 }}</div>
...@@ -92,7 +91,7 @@ ...@@ -92,7 +91,7 @@
<ElTableColumn prop="createTime" label="发布时间"></ElTableColumn> <ElTableColumn prop="createTime" label="发布时间"></ElTableColumn>
<ElTableColumn prop="updateTime" label="更新时间"></ElTableColumn> <ElTableColumn prop="updateTime" label="更新时间"></ElTableColumn>
<ElTableColumn prop="statusName" label="审批状态"></ElTableColumn> <ElTableColumn prop="statusName" label="审批状态"></ElTableColumn>
<ElTableColumn label="操作" width='80'> <ElTableColumn label="操作" width="80">
<template #default="{ row }"> <template #default="{ row }">
<div <div
class="cursor-pointer text-sm leading-6 text-[#2C68FF] hover:underline" class="cursor-pointer text-sm leading-6 text-[#2C68FF] hover:underline"
...@@ -124,8 +123,7 @@ import { useDict } from '@/composable/useDict.ts'; ...@@ -124,8 +123,7 @@ import { useDict } from '@/composable/useDict.ts';
import type { Dict } from '@/types/common'; import type { Dict } from '@/types/common';
import DatePicker from 'vue-datepicker-next'; import DatePicker from 'vue-datepicker-next';
import 'vue-datepicker-next/index.css'; import 'vue-datepicker-next/index.css';
import 'vue-datepicker-next/locale/zh-cn'; import 'vue-datepicker-next/locale/zh-cn.es';
import moment from 'moment';
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
...@@ -227,56 +225,16 @@ const handleReset = () => { ...@@ -227,56 +225,16 @@ const handleReset = () => {
params.value.time = ''; params.value.time = '';
searchParams.value = '' as any; searchParams.value = '' as any;
}; };
// // 日期选择
const ranges = [
{
text: '今天',
onClick() {
const date = moment().toDate();
return [date, date];
},
},
{
text: '昨天',
onClick() {
return [moment().subtract(1, 'day').toDate(), moment().subtract(1, 'day').toDate()];
},
},
{
text: '近一周',
onClick() {
return [moment().subtract(7, 'day').toDate(), moment().toDate()];
},
},
{
text: '近一个月',
onClick() {
return [moment().subtract(1, 'month').toDate(), moment().toDate()];
},
},
{
text: '近三个月',
onClick() {
return [moment().subtract(3, 'month').toDate(), moment().toDate()];
},
},
{
text: '近一年',
onClick() {
return [moment().subtract(1, 'year').toDate(), moment().toDate()];
},
},
];
const notAfterToday = (date: any) => { const notAfterToday = (date: any) => {
return date > new Date(new Date().setHours(23, 59, 59, 0)); return date > new Date(new Date().setHours(23, 59, 59, 0));
}; };
// 表格头样式 // 表格头样式
const tableHeaderStyle = { const tableHeaderStyle = {
background: '#f5f5f5' background: '#f5f5f5',
} };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep{ ::v-deep {
.lyy-datepicker { .lyy-datepicker {
width: 224px; width: 224px;
} }
...@@ -287,7 +245,7 @@ const tableHeaderStyle = { ...@@ -287,7 +245,7 @@ const tableHeaderStyle = {
} }
.el-input__wrapper { .el-input__wrapper {
box-shadow: none; box-shadow: none;
border: 1px solid rgba(0,0,0,0.08); border: 1px solid rgba(0, 0, 0, 0.08);
&:hover { &:hover {
box-shadow: none; box-shadow: none;
} }
...@@ -295,7 +253,8 @@ const tableHeaderStyle = { ...@@ -295,7 +253,8 @@ const tableHeaderStyle = {
.el-input__wrapper.is-focus { .el-input__wrapper.is-focus {
box-shadow: none; box-shadow: none;
} }
.el-select:hover:not(.el-select--disabled) .el-input__wrapper,.el-select .el-input.is-focus .el-input__wrapper { .el-select:hover:not(.el-select--disabled) .el-input__wrapper,
.el-select .el-input.is-focus .el-input__wrapper {
box-shadow: none !important; box-shadow: none !important;
} }
// .mx-calendar-content .cell.active{ // .mx-calendar-content .cell.active{
......
...@@ -25,7 +25,7 @@ export default defineConfig({ ...@@ -25,7 +25,7 @@ export default defineConfig({
Components({ Components({
resolvers: [ElementPlusResolver()], resolvers: [ElementPlusResolver()],
}), }),
legacy(), // legacy(),
splitVendorChunkPlugin(), splitVendorChunkPlugin(),
], ],
resolve: { resolve: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment