Merge branch 'develop' of https://git.openserver.cn:8089/XinJiang/TheProjectOfFour/kelamayireligongsi/plrl/vue into develop
This commit is contained in:
commit
d2e2d448ad
|
@ -39,7 +39,6 @@
|
|||
"ant-design-vue": "^4.2.3",
|
||||
"big.js": "^6.2.1",
|
||||
"common-utils": "workspace:*",
|
||||
"common-utils2": "workspace:*",
|
||||
"dayjs": "^1.11.13",
|
||||
"exceljs": "^4.4.0",
|
||||
"lodash-es": "^4.17.21",
|
||||
|
|
|
@ -107,6 +107,12 @@ const gridOptions = reactive(
|
|||
backgroundColor: '#f6fbfb',
|
||||
};
|
||||
}
|
||||
// 判断 remark 字段是否有值
|
||||
if (row.remark) {
|
||||
return {
|
||||
backgroundColor: '#fffae6', // 浅黄色背景
|
||||
};
|
||||
}
|
||||
console.log(rowIndex);
|
||||
},
|
||||
pagerConfig: {
|
||||
|
@ -252,7 +258,8 @@ onMounted(() => {
|
|||
<div class="mx-auto flex h-screen flex-col bg-gray-100 px-8">
|
||||
<p class="my-6 text-center text-3xl font-bold text-gray-800">值班信息栏</p>
|
||||
|
||||
<div class="mb-6 flex items-center justify-center">
|
||||
<div class="mb-6 flex items-center justify-center h-4">
|
||||
<!-- 增加按钮区域的高度 -->
|
||||
<button
|
||||
class="bg-primary hover:bg-primary/90 rounded-l-xl px-4 py-2 text-white"
|
||||
@click="prevMonth"
|
||||
|
@ -266,27 +273,14 @@ onMounted(() => {
|
|||
>
|
||||
下一月
|
||||
</button>
|
||||
|
||||
<!-- <div class="w-[40vw]">
|
||||
<p>
|
||||
1.公司机关值班人员(包括值班司机)都必须严格遵守值班管理要求,值班期间保持值班电话畅通。
|
||||
</p>
|
||||
<p>
|
||||
2.值班干部值班期间离岗外出、开会、现场指挥等特殊情况,应落实人员接替同时落实值班职责。
|
||||
</p>
|
||||
<p>
|
||||
3.值班司机值班地点为公司小车班休息室,值班车辆必须停放在公司机关院内,确保遇到突发事件值班领导能迅速赶赴现场协调处置。
|
||||
</p>
|
||||
<p>4.值班时间:当日10:00——次日10:00。</p>
|
||||
<p>5.市应急管理办公室信息科:6224327、6236233。</p>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
<div class="mb-8 flex-1 rounded-lg bg-white p-4 shadow-md">
|
||||
<div class="flex-1 rounded-lg bg-white p-4 shadow-md overflow-auto" style="flex-grow: 2;">
|
||||
<vxe-grid
|
||||
ref="xGridRef"
|
||||
v-bind="gridOptions"
|
||||
@cell-click="handleCellClick"
|
||||
style="min-height: 40vh; max-height: 60vh;"
|
||||
>
|
||||
<template #toolbar_buttons>
|
||||
<!-- 可添加工具栏按钮 -->
|
||||
|
@ -303,6 +297,20 @@ onMounted(() => {
|
|||
</template>
|
||||
</vxe-grid>
|
||||
</div>
|
||||
|
||||
<div class="mt-4" style="width: 100%; min-height: 120px;">
|
||||
<p>
|
||||
1.公司机关值班人员(包括值班司机)都必须严格遵守值班管理要求,值班期间保持值班电话畅通。
|
||||
</p>
|
||||
<p>
|
||||
2.值班干部值班期间离岗外出、开会、现场指挥等特殊情况,应落实人员接替同时落实值班职责。
|
||||
</p>
|
||||
<p>
|
||||
3.值班司机值班地点为公司小车班休息室,值班车辆必须停放在公司机关院内,确保遇到突发事件值班领导能迅速赶赴现场协调处置。
|
||||
</p>
|
||||
<p>4.值班时间:当日10:00——次日10:00。</p>
|
||||
<p>5.市应急管理办公室信息科:6224327、6236233。</p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
|
@ -264,9 +264,6 @@ importers:
|
|||
common-utils:
|
||||
specifier: workspace:*
|
||||
version: link:../../packages/common-utils
|
||||
common-utils2:
|
||||
specifier: workspace:*
|
||||
version: link:../../packages/common-utils2
|
||||
dayjs:
|
||||
specifier: ^1.11.13
|
||||
version: 1.11.13
|
||||
|
@ -1276,18 +1273,6 @@ importers:
|
|||
specifier: ^4.4.4
|
||||
version: 4.4.4(vue@3.5.4(typescript@5.6.2))
|
||||
|
||||
packages/common-utils2:
|
||||
dependencies:
|
||||
'@vben-core/shared':
|
||||
specifier: workspace:*
|
||||
version: link:../@core/base/shared
|
||||
'@vben-core/typings':
|
||||
specifier: workspace:*
|
||||
version: link:../@core/base/typings
|
||||
vue-router:
|
||||
specifier: ^4.4.4
|
||||
version: 4.4.4(vue@3.5.4(typescript@5.6.2))
|
||||
|
||||
packages/constants:
|
||||
dependencies:
|
||||
'@vben-core/shared':
|
||||
|
|
Loading…
Reference in New Issue