Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
This commit is contained in:
commit
fb82a56496
150
index.html
150
index.html
|
|
@ -25,157 +25,7 @@
|
|||
})();
|
||||
</script>
|
||||
<div id="app">
|
||||
<style>
|
||||
html[data-theme='dark'] .app-loading {
|
||||
background-color: #2c344a;
|
||||
}
|
||||
|
||||
html[data-theme='dark'] .app-loading .app-loading-title {
|
||||
color: rgba(255, 255, 255, 0.85);
|
||||
}
|
||||
|
||||
.app-loading {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
background-color: #f4f7f9;
|
||||
}
|
||||
|
||||
.app-loading .app-loading-wrap {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
display: flex;
|
||||
-webkit-transform: translate3d(-50%, -50%, 0);
|
||||
transform: translate3d(-50%, -50%, 0);
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.app-loading .dots {
|
||||
display: flex;
|
||||
padding: 98px;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.app-loading .app-loading-title {
|
||||
display: flex;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 20px;
|
||||
font-size: 30px;
|
||||
color: rgba(0, 0, 0, 0.85);
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.app-loading .app-loading-logo {
|
||||
display: block;
|
||||
width: 90px;
|
||||
margin: 0 auto;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.dot {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
margin-top: 30px;
|
||||
font-size: 32px;
|
||||
transform: rotate(45deg);
|
||||
box-sizing: border-box;
|
||||
animation: antRotate 1.2s infinite linear;
|
||||
}
|
||||
|
||||
.dot i {
|
||||
position: absolute;
|
||||
display: block;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
background-color: #0065cc;
|
||||
border-radius: 100%;
|
||||
opacity: 0.3;
|
||||
transform: scale(0.75);
|
||||
animation: antSpinMove 1s infinite linear alternate;
|
||||
transform-origin: 50% 50%;
|
||||
}
|
||||
|
||||
.dot i:nth-child(1) {
|
||||
top: 0;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.dot i:nth-child(2) {
|
||||
top: 0;
|
||||
right: 0;
|
||||
-webkit-animation-delay: 0.4s;
|
||||
animation-delay: 0.4s;
|
||||
}
|
||||
|
||||
.dot i:nth-child(3) {
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
-webkit-animation-delay: 0.8s;
|
||||
animation-delay: 0.8s;
|
||||
}
|
||||
|
||||
.dot i:nth-child(4) {
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
-webkit-animation-delay: 1.2s;
|
||||
animation-delay: 1.2s;
|
||||
}
|
||||
@keyframes antRotate {
|
||||
to {
|
||||
-webkit-transform: rotate(405deg);
|
||||
transform: rotate(405deg);
|
||||
}
|
||||
}
|
||||
@-webkit-keyframes antRotate {
|
||||
to {
|
||||
-webkit-transform: rotate(405deg);
|
||||
transform: rotate(405deg);
|
||||
}
|
||||
}
|
||||
@keyframes antSpinMove {
|
||||
to {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
@-webkit-keyframes antSpinMove {
|
||||
to {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<div class="app-loading">
|
||||
<div class="app-loading-wrap">
|
||||
<img src="<%= basePublicPath %>/resource/img/logo.png" class="app-loading-logo" alt="Logo" />
|
||||
<div class="app-loading-title"><%= title %></div>
|
||||
<div class="app-loading-dots">
|
||||
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="module" src="/src/main.ts"></script>
|
||||
<script src="/static/tums-player/tums-player.umd.min.js"></script>
|
||||
<!-- 百度统计 -->
|
||||
<script>
|
||||
var _hmt = _hmt || [];
|
||||
(function () {
|
||||
var hm = document.createElement('script');
|
||||
hm.src = 'https://hm.baidu.com/hm.js?0febd9e3cacb3f627ddac64d52caac39';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(hm, s);
|
||||
})();
|
||||
</script>
|
||||
<!-- 腾讯地图 -->
|
||||
<script src="https://map.qq.com/api/gljs?v=1.exp&key=2E6BZ-ZC3E3-BMX3D-OWFUI-FLY2F-MLFFJ"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* @Description: logo component
|
||||
-->
|
||||
<template>
|
||||
<div class="anticon" :class="getAppLogoClass" @click="goHome" style="background: #e3f6fc;text-align: center;">
|
||||
<div class="anticon" :class="getAppLogoClass" @click="goHome" style="background: #ceeef7;text-align: center;">
|
||||
<img src="../../../assets/images/logo.png" />
|
||||
<div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
|
||||
{{ shortTitle }}
|
||||
|
|
|
|||
|
|
@ -211,7 +211,6 @@
|
|||
height: calc(100% - @header-height);
|
||||
padding: 0;
|
||||
background-color: @component-background;
|
||||
background: url(../resource/img/modalback.png);
|
||||
|
||||
.scrollbar__wrap {
|
||||
padding: 16px !important;
|
||||
|
|
@ -250,7 +249,6 @@
|
|||
|
||||
.ant-drawer-body {
|
||||
height: calc(100% - @detail-header-height);
|
||||
background: url(../resource/img/modalback.png);
|
||||
}
|
||||
}
|
||||
.jeecg-basic-title[data-v-ddd32716] {
|
||||
|
|
|
|||
|
|
@ -255,10 +255,21 @@
|
|||
/**
|
||||
* 预览图片
|
||||
*/
|
||||
function handlePreview(file) {
|
||||
previewImage.value = file.url || file.thumbUrl;
|
||||
async function handlePreview(file) {
|
||||
if (!file.url && !file.preview) {
|
||||
file.preview = (await getBase64(file.originFileObj)) as string;
|
||||
}
|
||||
previewImage.value = file.url || file.preview;
|
||||
previewVisible.value = true;
|
||||
}
|
||||
function getBase64(file: File) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const reader = new FileReader();
|
||||
reader.readAsDataURL(file);
|
||||
reader.onload = () => resolve(reader.result);
|
||||
reader.onerror = error => reject(error);
|
||||
});
|
||||
}
|
||||
|
||||
function getAvatarView() {
|
||||
if (uploadFileList.length > 0) {
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
//每页条数
|
||||
const pageSize = ref<number>(140);
|
||||
//下拉分页显示
|
||||
const pageSizeOptions = ref<any>(['10', '20', '50', '100', '140']);
|
||||
const pageSizeOptions = ref<any>(['15', '50', '80', '100']);
|
||||
//下拉搜索值
|
||||
const searchIconValue = ref<string>('');
|
||||
const { clipboardRef, isSuccessRef } = useCopyToClipboard(props.value);
|
||||
|
|
|
|||
|
|
@ -27,6 +27,12 @@
|
|||
}
|
||||
}
|
||||
|
||||
.ant-drawer-body {
|
||||
// background: url(../resource/img/modalback.png);
|
||||
// background: linear-gradient(to bottom, #f6faff, #f1f7ff);
|
||||
background: linear-gradient(135deg, #f6faff 0%, #f1f7ff 100%);
|
||||
/* 如果需要支持旧版浏览器可以添加以下代码 */
|
||||
}
|
||||
.ant-modal {
|
||||
width: 520px;
|
||||
padding-bottom: 0;
|
||||
|
|
@ -47,9 +53,10 @@
|
|||
|
||||
.ant-modal-body {
|
||||
padding: 0;
|
||||
background: url(../resource/img/modalback.png);
|
||||
// background: url(../resource/img/modalback.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: cover;
|
||||
background: linear-gradient(135deg, #f6faff 0%, #f1f7ff 100%);
|
||||
|
||||
> .scrollbar > .scrollbar__bar.is-horizontal {
|
||||
display: none;
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@
|
|||
...unref(getProps),
|
||||
...unref(getHeaderProps),
|
||||
scroll: unref(getScrollRef),
|
||||
loading: unref(getLoading),
|
||||
loading: false,
|
||||
tableLayout: 'fixed',
|
||||
rowSelection: unref(getRowSelectionRef),
|
||||
rowKey: unref(getRowKey),
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
:theme="getHeaderTheme" :sider="false" />
|
||||
<LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
|
||||
<!-- 欢迎语 -->
|
||||
<span v-if="getShowContent && getShowBreadTitle && !getIsMobile" style="background: #e3f6fc !important;"
|
||||
<span v-if="getShowContent && getShowBreadTitle && !getIsMobile" style="background: #ceeef7 !important;"
|
||||
:class="[prefixCls, `${prefixCls}--${getHeaderTheme}`, 'headerIntroductionClass']">
|
||||
{{ t('layout.header.welcomeIn') }} {{ title }} </span>
|
||||
</div>
|
||||
|
|
@ -275,5 +275,6 @@ export default defineComponent({
|
|||
background-image: url('../resource/img/bj.png') !important;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% auto;
|
||||
background-color: #e5f5f9 !important;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
.ant-drawer-body {
|
||||
height: 100vh;
|
||||
padding: 0;
|
||||
background: url(../resource/img/modalback.png);
|
||||
}
|
||||
|
||||
.ant-drawer-header-no-title {
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ async function bootstrap(props?: MainAppProps) {
|
|||
registerGlobComp(app);
|
||||
|
||||
//CAS单点登录
|
||||
await useSso().ssoLogin();
|
||||
// await useSso().ssoLogin();
|
||||
|
||||
// 配置路由
|
||||
setupRouter(app);
|
||||
|
|
@ -83,10 +83,10 @@ async function bootstrap(props?: MainAppProps) {
|
|||
setupErrorHandle(app);
|
||||
|
||||
// 注册第三方组件
|
||||
await registerThirdComp(app);
|
||||
// await registerThirdComp(app);
|
||||
|
||||
// 当路由准备好时再执行挂载( https://next.router.vuejs.org/api/#isready)
|
||||
await router.isReady();
|
||||
// await router.isReady();
|
||||
|
||||
// 挂载应用
|
||||
app.mount(getMountContainer(props), true);
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ const pagination = reactive({
|
|||
total: 0,
|
||||
showSizeChanger: true,
|
||||
showQuickJumper: true,
|
||||
pageSizeOptions: ['10', '20', '30', '50'],
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
showTotal: total => `共 ${total} 条`
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
</div>
|
||||
<div>
|
||||
<div style="width:300px;float: left;">
|
||||
<div style="background: white; border-radius: 8px;padding: 8px;margin-right: 8px;min-height: 400px;">
|
||||
<div style="background: white; border-radius: 8px;padding: 8px;margin-right: 8px;height: 740px;overflow-y:auto;">
|
||||
<div style="text-align: right;">
|
||||
<a-radio-group v-model:value="treeParam.izEnabled" @change="getTreeData">
|
||||
<a-radio-button value="">全部</a-radio-button>
|
||||
|
|
@ -617,10 +617,4 @@ function getTreeData(){
|
|||
clip-path: polygon(100% 100%, 0 100%, 100% 0);
|
||||
z-index: 999;
|
||||
}
|
||||
</style>
|
||||
<style lang="less">
|
||||
.ant-drawer-body {
|
||||
background: url(../resource/img/modalback.png);
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
@ -4,17 +4,17 @@
|
|||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialInfoForm">
|
||||
<a-row>
|
||||
<a-col :span="8" >
|
||||
<a-col :span="8" hidden>
|
||||
<a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialInfoForm-categoryId" name="categoryId">
|
||||
<j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类" allow-clear @change="formData.typeId = null , formData.medicationId = null" disabled/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8" >
|
||||
<a-col :span="8" hidden>
|
||||
<a-form-item label="二级分类" v-bind="validateInfos.typeId" id="ConfigMaterialInfoForm-typeId" name="typeId">
|
||||
<j-dict-select-tag type='list' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,category_id = ${formData.categoryId || -1} and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择二级分类" @change="formData.medicationId = null" disabled allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8" >
|
||||
<a-col :span="8" hidden>
|
||||
<a-form-item label="三级分类" v-bind="validateInfos.medicationId" id="ConfigMaterialInfoForm-medicationId" name="medicationId">
|
||||
<j-dict-select-tag type='list' v-model:value="formData.medicationId" :dictCode="`nu_config_material_medication,medication_name,id,type_id = ${formData.typeId || -1} and iz_enabled = 0 and del_flag = 0`" placeholder="请选择三级分类" allow-clear disabled />
|
||||
</a-form-item>
|
||||
|
|
|
|||
|
|
@ -228,8 +228,7 @@
|
|||
</a-drawer>
|
||||
|
||||
<!-- 体型标签 -->
|
||||
<a-drawer title="体型标签" width="60vw" :open="bodyTagOpen" @close="onBodyTagClose"
|
||||
bodyStyle="background: url(../../resource/img/modalback.png);">
|
||||
<a-drawer title="体型标签" width="60vw" :open="bodyTagOpen" @close="onBodyTagClose" >
|
||||
<template #footer>
|
||||
<a-button type="primary" @click="onBodyTagClose" style="float: right;">关闭</a-button>
|
||||
</template>
|
||||
|
|
@ -237,8 +236,7 @@
|
|||
</a-drawer>
|
||||
|
||||
<!-- 情绪标签 -->
|
||||
<a-drawer title="情绪标签" width="60vw" :open="emotionTagOpen" @close="onEmotionTagClose"
|
||||
bodyStyle="background: url(../../resource/img/modalback.png);">
|
||||
<a-drawer title="情绪标签" width="60vw" :open="emotionTagOpen" @close="onEmotionTagClose" >
|
||||
<template #footer>
|
||||
<a-button type="primary" @click="onEmotionTagClose" style="float: right;">关闭</a-button>
|
||||
</template>
|
||||
|
|
@ -338,8 +336,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
scroll: { y: '58vh' },
|
||||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 10,
|
||||
pageSizeOptions: ['10', '20', '50', '100'],
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
},
|
||||
actionColumn: {
|
||||
width: 70,
|
||||
|
|
@ -1167,9 +1165,4 @@ audio::-webkit-media-controls-time-remaining-display {
|
|||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
||||
.backClass {
|
||||
|
||||
background: url(../../resource/img/modalback.png);
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -145,8 +145,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
scroll: { y: '58vh' },
|
||||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 10,
|
||||
pageSizeOptions: ['10', '20', '50', '100'],
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
},
|
||||
actionColumn: {
|
||||
width: 200,
|
||||
|
|
|
|||
Loading…
Reference in New Issue