admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整了衢州版样式

Browse Source
This commit is contained in:
骆乐 2022-07-16 14:06:57 +08:00
parent d83bd2b5d3
commit 53eb10156b
6 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip Normal file
View File

Binary file not shown.

2
src/assets/js/http.js
View File

@ -39,7 +39,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789
axios.defaults.baseURL = 'http://192.168.34.125:6023/'
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
// tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.148:6023/' // 老大本地

5
src/router/index.js
View File

@ -2417,6 +2417,11 @@ const routes2 = [
name: '检验检测',
component: () => import('@/views/projectQu/noData.vue')
},
{
path: '/projectQu/markingRoom/realTime',
name: '标养室_实时数据',
component: () => import('@/views/projectFront/markingRoom/realTime.vue'),
}
]
},

11
src/views/projectFront/laborManage/EpidemicPrevention/index.vue
View File

@ -1,7 +1,7 @@
/* 防疫管理 */
<template>
<div class="epidemicPrevention">
<div class="query">
<div class="query" :class="styleType == 3 ? 'changeStyle' : ''">
<el-form ref="queryParams" :model="queryParams" :inline="true" label-width="120px">
<el-form-item label="人员类型" prop="personType">
<el-select v-model="queryParams.personType" placeholder="请选择人员类型" clearable
@ -311,6 +311,8 @@ import {
export default {
components: {},
data: () => ({
// 3 衢州版 2 星璇版 1 正常版本
styleType:'',
// 项目SN
projectSn: '',
// 是否禁用 部分下拉框
@ -437,6 +439,7 @@ export default {
created() {
this.projectSn = this.$store.state.projectSn;
this.uploadUrl = this.$store.state.UPLOADURL;
this.styleType = this.$store.state.userInfo.styleType
this.getList()
this.getEnterpriseList()
this.getTeamList()
@ -656,9 +659,13 @@ export default {
background-color: #fff;
border-bottom: 2px solid #f3f5fd;
}
.changeStyle{
height:200px;
}
.content {
flex: 1;
height: calc(100% - 155px);
// height: calc(100% - 155px);
height: calc(100% - 200px);
.cell-height {
height: 80px !important;
}

15
src/views/projectFront/laborManage/Payoff/index.vue
View File

@ -14,7 +14,7 @@
</el-col>
<el-col class="right-col" :span="19">
<el-row style="width: 100%;height: 100%">
<el-col class="top-col" :span="4">
<el-col class="top-col" :span="4" :class="styleType == 3 ? 'changeStyle' : ''">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
<el-form-item label="工资发放状态" prop="payStatus">
<el-select v-model="queryParams.payStatus" placeholder="请选择工资发放状态" clearable
@ -33,10 +33,6 @@
<el-option v-for="(item, index) in departmentOptions" :key="item.id" :label="item.departmentName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="月份" prop="payMonth">
<el-date-picker type="month" v-model="queryParams.payMonth" format="yyyy-MM" value-format="yyyy-MM"
:style="{width: '100%'}" placeholder="请选择月份" clearable></el-date-picker>
</el-form-item>
<el-form-item label="姓名" prop="workerName">
<el-input v-model="queryParams.workerName" placeholder="请输入姓名" clearable :style="{width: '100%'}">
</el-input>
@ -45,6 +41,10 @@
<el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="月份" prop="payMonth">
<el-date-picker type="month" v-model="queryParams.payMonth" format="yyyy-MM" value-format="yyyy-MM"
:style="{width: '100%'}" placeholder="请选择月份" clearable></el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">查询</el-button>
<el-button @click="handleExport">导出 PDF</el-button>
@ -68,7 +68,7 @@
</el-form-item>
</el-form>
</el-col>
<el-col class="bottom-col" :span="20">
<el-col class="bottom-col" :span="20" :class="styleType == 3 ? 'bottomTwo' : ''">
<vue-scroll>
<div class="scroll">
<el-table v-loading="loading" :data="userList">
@ -170,6 +170,8 @@ import { wageStatusOptions } from './data'
export default {
data: () => ({
// 3 衢州版 2 星璇版 1 正常版本
styleType:'',
// 项目SN
projectSn: '',
// 弹窗标题
@ -253,6 +255,7 @@ export default {
created() {
this.projectSn = this.$store.state.projectSn;
this.queryParams.payMonth = nowDate()
this.styleType = this.$store.state.userInfo.styleType
// 查询企业列表
this.getEnterpriseList()
},

3
src/views/projectThree/homePage.vue
View File

@ -267,8 +267,7 @@ export default {
background-color: #396df7;
border-radius: 14px;
color: #fff;
width: 210px;
margin-right:20px;
width: 230px;
height: 45px;
line-height: 45px;
margin-top:15px;