Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
duanxiaohai 2024-06-04 15:55:47 +08:00
commit 9aac87f484
11 changed files with 41 additions and 11 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/assets/eduImg/pp1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

BIN
src/assets/eduImg/pp2.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

BIN
src/assets/eduImg/pp3.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

View File

@ -5,6 +5,8 @@ import App from './App.vue'
import router from "./router";
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import './assets/css/common.css'
createApp(App).use(router).use(ElementPlus).mount('#app')
import './assets/css/common.css'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
createApp(App).use(router).use(ElementPlus,{
locale: zhCn,
}).mount('#app')

View File

@ -58,7 +58,7 @@
<el-table-column
:key="item.label"
v-if="item.type === 'slot'"
:width="item.width"
:show-overflow-tooltip="true"
:label="item.label"
:property="item.property"
align="center"
@ -75,7 +75,7 @@
:key="item.label"
:property="item.property"
:label="item.label"
:width="item.width"
:show-overflow-tooltip="true"
align="center"
v-else
/>
@ -86,7 +86,7 @@
<div class="pagePart">
<el-pagination
background
layout="prev, pager, next"
layout="prev, pager, next,total"
:page-size="pagination.pageSize"
:total="pagination.total"
prev-text="上一页"
@ -153,7 +153,7 @@ const data = reactive({
const gridData = [];
//
const tableKey = ref(Math.random())
const tableKey = ref(Math.random());
//
watch(
() => props.dialogShow,
@ -167,7 +167,7 @@ watch(
() => props.tableData,
(newVal, oldVal) => {
data.tableData = props.tableData;
tableKey.value = Math.random()
tableKey.value = Math.random();
}
);
// 使
@ -176,6 +176,9 @@ onMounted(() => {
data.columns = props.columns;
data.title = props.title;
data.tableData = props.tableData;
const paginationTotal = document.querySelector(".el-pagination__total");
console.log(paginationTotal);
// paginationTotal.innerText = ` ${props.pagination.total} `;
});
const closeDialog = () => {
@ -190,6 +193,7 @@ const handle = (current) => {
<style lang="scss" scoped>
:deep(.el-dialog) {
--el-dialog-bg-color: none;
--el-dialog-width: 76% !important;
}
.my-header {
@ -198,7 +202,6 @@ const handle = (current) => {
}
.tabelPart {
height: 80vh;
padding: 16px;
background: linear-gradient(
270deg,
@ -248,6 +251,9 @@ const handle = (current) => {
:deep(.el-pagination button:disabled) {
background-color: rgba(0, 116, 255, 0) !important;
}
:deep(.el-pagination > .is-last) {
color: #ffffff;
}
}
.bo {

View File

@ -226,6 +226,11 @@
src="@/assets/eduImg/jyImg10.png"
alt=""
/>
<img
src="@/assets/eduImg/pp3.gif"
alt=""
class="ppImg"
/>
<div class="historyimg historyimg1">
<span>绿色预警</span>
</div>
@ -238,6 +243,11 @@
src="@/assets/eduImg/jyImg9.png"
alt=""
/>
<img
src="@/assets/eduImg/pp2.gif"
alt=""
class="ppImg"
/>
<div class="historyimg historyimg2">
<span>黄色预警</span>
</div>
@ -250,6 +260,11 @@
src="@/assets/eduImg/jyImg8.png"
alt=""
/>
<img
src="@/assets/eduImg/pp1.gif"
alt=""
class="ppImg"
/>
<div class="historyimg historyimg3">
<span>红色预警</span>
</div>
@ -1079,6 +1094,13 @@ onMounted(() => {
display: flex;
flex-direction: column;
align-items: center;
position: relative;
.ppImg{
position: absolute;
width: 500px;
height: 170px;
}
img {
width: 136px;

View File

@ -373,7 +373,7 @@ const tableType = reactive({
//
const pagination = reactive({
total: 100,
pageSize: 20,
pageSize: 10,
currentPage: 1,
});
const change = (name, index) => {

View File

@ -8,7 +8,7 @@ export default defineConfig({
server: {
host: "0.0.0.0", //解决vite use--host to expose
port: 8080,
open: true,
open: false,
base: "./ ", //生产环境路径
// hmr: true,
proxy: {