Browse Source

Merge branch 'master' into test

shibei_master
13176889840 3 years ago
parent
commit
47667d8a44
  1. 4
      src/i18n/zh-CN.js
  2. 8
      src/js/dai/request.js
  3. 8
      src/js/dai/request2.js
  4. 6
      src/js/store/modules/app.js
  5. 76
      src/router/index.js
  6. 30
      src/utils/index.js
  7. 2
      src/views/components/editResi.vue
  8. 55
      src/views/components/resiForm.vue
  9. 2
      src/views/components/resiSearch.vue
  10. 12
      src/views/modules/base/collect.vue
  11. 4
      src/views/modules/base/community/buildTable.vue
  12. 12
      src/views/modules/base/community/community.vue
  13. 10
      src/views/modules/base/community/communityTable.vue
  14. 12
      src/views/modules/base/community/roomForm.vue
  15. 41
      src/views/modules/base/community/roomTable.vue
  16. 18
      src/views/modules/base/resi.vue
  17. 14
      src/views/modules/communityParty/elegant/index.vue
  18. 8
      src/views/modules/communityParty/regionalParty/activitys.vue
  19. 8
      src/views/modules/communityParty/regionalParty/units.vue
  20. 256
      src/views/modules/communityService/dqfwzx/index.vue
  21. 13
      src/views/modules/communityService/measure/index.vue
  22. 8
      src/views/modules/communityService/ninePlaces/inspect/inspect.vue
  23. 8
      src/views/modules/communityService/ninePlaces/places/places.vue
  24. 8
      src/views/modules/communityService/ninePlaces/team/team.vue
  25. 219
      src/views/modules/communityService/sqzzz/index.vue
  26. 11
      src/views/modules/importRecord/index.vue
  27. 12
      src/views/modules/secretaryLog/difficulty/difficultyList.vue
  28. 12
      src/views/modules/secretaryLog/humanisticCare/careList.vue
  29. 7
      src/views/modules/secretaryLog/workLog/index.vue
  30. 12
      src/views/modules/systemManagement/serviceMatter/service.vue
  31. 10
      src/views/modules/visual/basicinfo/people.vue
  32. 11
      src/views/modules/workPc/guidance/categoryList.vue
  33. 6
      src/views/modules/workPc/guidance/guidanceList.vue
  34. 14
      src/views/modules/workSys/demandCate.vue
  35. 20
      src/views/modules/workSys/elegantCate.vue
  36. 14
      src/views/modules/workSys/resiCate.vue

4
src/i18n/zh-CN.js

@ -3,9 +3,9 @@ const t = {}
t.loading = '加载中...'
t.brand = {}
t.brand.lg = '数字社区工作平台'
t.brand.lg = '数字社区综合服务平台'
t.brand.mini = '数字'
t.brand.work = '数字社区工作平台'
t.brand.work = '数字社区综合服务平台'
t.brand.workMini = '工作端'
t.add = '新增'

8
src/js/dai/request.js

@ -38,6 +38,14 @@ const request = curry(
if (res.data.code > 8000 && res.data.code < 10000) {
// Message.error(res.data.msg);
}
if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
// 10005 token为空 10006登陆超时 10007别处登录
console.log("登录失效");
Message.error(res.data.msg);
return next({
name: "login",
});
}
reslove(retData);
};

8
src/js/dai/request2.js

@ -38,6 +38,14 @@ const request = curry(
if (res.data.code > 8000 && res.data.code < 10000) {
Message.error(res.data.msg);
}
if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
// 10005 token为空 10006登陆超时 10007别处登录
console.log("登录失效");
Message.error(res.data.msg);
return next({
name: "login",
});
}
reslove(retData);
};

6
src/js/store/modules/app.js

@ -5,13 +5,15 @@ export default {
clientHeight: document.documentElement.clientHeight,
size: 'medium',
resolution: 'medium',
env: 'dev'
env: 'dev',
iframeHeight:120
},
getters: {
clientHeight: (state) => state.clientHeight,
size: (state) => state.size,
resolution: (state) => state.resolution,
env: (state) => state.env
env: (state) => state.env,
iframeHeight: (state) => state.iframeHeight
},
mutations: {
[type.client_height](state, payload) {

76
src/router/index.js

@ -179,7 +179,7 @@ const router = new Router({
router.beforeEach((to, from, next) => {
// 添加动态(菜单)路由
// 已添加或者当前路由为页面路由, 可直接访问
if(to.name==='caiji'){
if (to.name === "caiji") {
return next();
}
if (
@ -237,6 +237,29 @@ router.beforeEach((to, from, next) => {
name: "人员预警",
url: "visual/warning/index",
},
{
icon: "icon-setting",
id: "2221321001",
name: "社区党建",
// url: "visual/basicinfo/basicInfoMain",
children: [
{
url: "/visual/communityParty/party",
name: "党员信息统计",
id: "5feawfwaefwa578",
},
{
url: "/visual/communityParty/community",
name: "区域化党建",
id: "5fwaefwaefawef588",
},
{
url: "/visual/communityParty/elegant",
name: "党员风采榜",
id: "5fwaefwaefawef589",
},
],
},
{
icon: "icon-setting",
id: "6",
@ -244,63 +267,40 @@ router.beforeEach((to, from, next) => {
children: [
{
url: "visual/communityGovern/processAnalyze",
name: "项目处理分析",
name: "事件处置分析",
id: "processAnalyze",
},
{
url: "/visual/communityGovern/typeAnalyze",
name: "项目分类分析",
name: "事件分类分析",
id: "typeAnalyze",
},
{
url: "/visual/communityGovern/resibuzz",
name: "居民热议",
name: "居民热议分析",
id: "resibuzz",
},
{
url: "/visual/communityGovern/distributionAnalyze",
name: "项目分布分析",
name: "事件分布分析",
id: "distributionAnalyze",
},
],
},
{
icon: "icon-setting",
id: "2221321001",
name: "社区党建",
// url: "visual/basicinfo/basicInfoMain",
children: [
{
url: "/visual/communityParty/party",
name: "党员信息统计",
id: "5feawfwaefwa578",
},
{
url: "/visual/communityParty/community",
name: "区域化党建",
id: "5fwaefwaefawef588",
},
{
url: "/visual/communityParty/elegant",
name: "党员风采",
id: "5fwaefwaefawef589",
},
],
},
{
icon: "icon-setting",
id: "2221321123",
name: "措施清单",
name: "社区服务",
// url: "visual/basicinfo/basicInfoMain",
children: [
{
url: "/visual/measure/service",
name: "服务措施分析",
name: "需求服务分析",
id: "5feawfwaefwa57",
},
{
url: "/visual/measure/volunteer",
name: "志愿服务分析",
name: "志愿服务分析",
id: "5fwaefwaefawef58",
},
],
@ -315,7 +315,7 @@ router.beforeEach((to, from, next) => {
{
icon: "icon-setting",
id: "44rq22222q2222",
name: "AI安防",
name: "智慧安防",
// url: "visual/basicinfo/basicInfoMain",
children: [
{
@ -359,11 +359,13 @@ router.beforeEach((to, from, next) => {
http
.get("/gov/access/menu/nav")
.then(({ data: res }) => {
if (res.code !== 0) {
// Vue.prototype.$message.error(res.msg)
// return next({
// name: "login",
// });
if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
// 10005 token为空 10006登陆超时 10007别处登录
console.log("登录失效");
Vue.prototype.$message.error(res.msg);
return next({
name: "login",
});
}
window.SITE_CONFIG["menuList"] = res.data;
fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]);

30
src/utils/index.js

@ -115,3 +115,33 @@ export function dateFormats(fmt, date) {
}
return fmt
}
// 根据身份证计算出生日期,性别,年龄
export function computedCard(idCard) {
let sex = null;
let birth = null;
let myDate = new Date();
let month = myDate.getMonth() + 1;
let day = myDate.getDate();
let age = 0;
if(idCard.length===18){
age = myDate.getFullYear() - idCard.substring(6, 10) - 1;
sex = idCard.substring(16,17);
birth = idCard.substring(6,10)+"-"+idCard.substring(10,12)+"-"+idCard.substring(12,14);
if (idCard.substring(10, 12) < month || idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day) age++;
}
if(idCard.length===15){
age = myDate.getFullYear() - idCard.substring(6, 8) - 1901;
sex = idCard.substring(13,14);
birth = "19"+idCard.substring(6,8)+"-"+idCard.substring(8,10)+"-"+idCard.substring(10,12);
if (idCard.substring(8, 10) < month || idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day) age++;
}
if(sex%2 === 0)
sex = '0'; // 性别代码 1代表男,0代表女,暂时不涉及其他类型性别
else
sex = '1';
return {age , sex, birth}
}

2
src/views/components/editResi.vue

@ -33,7 +33,7 @@
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="所属家庭" required>
<el-form-item label="所属房屋" required>
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="VILLAGE_ID">

55
src/views/components/resiForm.vue

@ -32,7 +32,7 @@
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="所属家庭" required>
<el-form-item label="所属房屋" required>
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="VILLAGE_ID">
@ -99,48 +99,7 @@
</div>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item :prop="form.BUILD_ID" label="所属楼宇">
<div class="resi-cell-value">
<el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
clearable class="resi-cell-select" @change="handleChangeB"
>
<el-option
v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :prop="form.HOME_ID" label="所属家庭">
<div class="resi-cell-value">
<el-select v-model.trim="form.HOME_ID" placeholder="请选择" size="small"
clearable class="resi-cell-select resi-cell-select-small"
>
<el-option
v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.HOME_ID" placeholder="请选择" size="small"
clearable class="resi-cell-select-small"
>
<el-option
v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col> -->
</el-row>
<el-row v-for="(item, index) in sliceList(formList, columns)" :key="index" class="resi-row">
<!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
@ -158,6 +117,7 @@
size="small"
clearable
placeholder="请输入内容"
@blur="handleValidBlur(n)"
>
</el-input>
<el-input
@ -267,6 +227,7 @@
<script>
import { isCard, isMobile } from '@/utils/validate'
import { computedCard } from '@/utils/index'
export default {
name: 'resiForm',
@ -525,6 +486,14 @@ export default {
// }
})
},
handleValidBlur(n) {
console.log('n---', n)
if (n.columnName !== 'ID_CARD') return
if (!isCard(this.form.ID_CARD)) return
const { sex, birth } = computedCard(this.form.ID_CARD)
this.form.BIRTHDAY = birth
this.form.GENDER = sex == 1 ? '1' : '2'
},
handleOpenSearch () {
this.openSearch = !this.openSearch
},

2
src/views/components/resiSearch.vue

@ -28,7 +28,7 @@
</el-col>
<el-col :span="18">
<div class="resi-cell">
<div class="resi-cell-label">所属小区</div>
<div class="resi-cell-label">所属房屋</div>
<div class="resi-cell-value">
<el-select
v-model.trim="form.VILLAGE_ID"

12
src/views/modules/base/collect.vue

@ -61,7 +61,7 @@
border
style="width: 100%"
class="resi-table"
:height="maxTableHeight"
:height="tableHeight"
:span-method="arraySpanMethod"
>
<el-table-column label="序号" prop="desc" align="center" width="50" />
@ -189,10 +189,12 @@ export default {
};
},
computed: {
maxTableHeight() {
return this.clientHeight - 360;
},
...mapGetters(["clientHeight"]),
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - 360 + this.iframeHeigh
const _h = this.clientHeight - 360
return this.$store.state.inIframe ? h : _h
}
},
watch: {
timeRange(val) {

4
src/views/modules/base/community/buildTable.vue

@ -235,11 +235,11 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 300)
return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
//

12
src/views/modules/base/community/community.vue

@ -98,12 +98,16 @@ export default {
},
computed: {
rowHeight () {
return (this.clientHeight - 120) + 'px'
return this.$store.state.inIframe ? this.clientHeight - 120 + this.iframeHeight + 'px' : this.clientHeight - 120 + 'px'
},
treeHeight () {
return (this.clientHeight - 200) + 'px'
return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
async loadTree (isRefresh) {
@ -307,7 +311,7 @@ export default {
.div_table {
margin-left: 15px;
// flex: 1;
width: calc(100vw - 550px);
width: calc(100% - 300px);
background-color: #ffffff;
border-radius: 5px;
padding: 10px;

10
src/views/modules/base/community/communityTable.vue

@ -285,13 +285,13 @@ export default {
},
computed: {
tableHeight () {
return (this.clientHeight - 300)
return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
},
rowHeight () {
return (this.clientHeight - 200) + 'px'
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
//

12
src/views/modules/base/community/roomForm.vue

@ -11,7 +11,7 @@
<el-form-item label="所属楼栋"
label-width="150px"
style="display: block">
<span>{{ agencyObj.communityName }}{{agencyObj.label}}</span>
<span>{{ agencyObj.neighborHoodName }}{{agencyObj.label}}</span>
</el-form-item>
<el-form-item label="单元号"
@ -231,7 +231,7 @@ export default {
async addRoom () {
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //1518151817X
if (regCard.test(this.dataForm.ownerIdCard) === false) {
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
@ -240,7 +240,7 @@ export default {
return false;
}
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
if (regPhone.test(this.dataForm.ownerPhone) === false) {
if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
@ -335,13 +335,13 @@ export default {
{ required: true, message: '是否出租不能为空', trigger: 'blur' }
],
ownerPhone: [
{ required: true, message: '房主电话不能为空', trigger: 'blur' }
{ required: false }
],
ownerName: [
{ required: true, message: '房主姓名不能为空', trigger: 'blur' }
{ required: false }
],
ownerIdCard: [
{ required: true, message: '房主身份证号不能为空', trigger: 'blur' }
{ required: false }
],
}
},

41
src/views/modules/base/community/roomTable.vue

@ -80,34 +80,41 @@
:selectable="checkSelect"
width="55">
</el-table-column>
<el-table-column prop="houseName"
<el-table-column prop="houseNameShow"
label="房屋名称"
width="120">
min-width="160">
</el-table-column>
<el-table-column prop="neighborHoodName"
label="所属小区"
width="160">
min-width="150">
</el-table-column>
<el-table-column prop="buildingName"
label="所属楼栋">
label="所属楼栋"
width="80">
</el-table-column>
<el-table-column prop="unitNum"
label="单元号">
<el-table-column prop="unitNumShow"
label="单元号"
width="70">
</el-table-column>
<el-table-column prop="doorName"
label="门牌号">
label="门牌号"
width="70">
</el-table-column>
<el-table-column prop="houseType"
label="类型">
label="类型"
width="50">
</el-table-column>
<el-table-column prop="purpose"
label="用途">
label="用途"
width="50">
</el-table-column>
<el-table-column prop="rentFlag"
label="是否出租">
label="是否出租"
width="80">
</el-table-column>
<el-table-column prop="ownerName"
label="房主姓名">
label="房主姓名"
width="90">
</el-table-column>
<el-table-column prop="ownerPhone"
label="房主电话"
@ -131,7 +138,7 @@
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
class="div-table-button--edit"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
@ -214,6 +221,8 @@ export default {
selection: [],
showDeletBtn: false,
tableData: [],
//form
formShow: false,
formTitle: '新增房屋',
@ -229,12 +238,11 @@ export default {
},
computed: {
tableHeight () {
return (this.clientHeight - 300)
return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
//
@ -298,6 +306,8 @@ export default {
this.total = data.total
this.validTableDataNum = 0
data.list.forEach(item => {
item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName
item.unitNumShow = item.unitNum + '单元'
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
this.validTableDataNum++
@ -327,6 +337,7 @@ export default {
},
handleAdd () {
this.formTitle = '新增房屋'
this.formShow = true
this.$nextTick(() => {

18
src/views/modules/base/resi.vue

@ -297,7 +297,7 @@ export default {
currentPage: 1,
pageSize: 20,
total: null,
tableHeight: 0,
searchH: 0,
conditions: [],
activeName: '',
tableData: [],
@ -336,6 +336,14 @@ export default {
}
},
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
const _h = this.clientHeight - 280 - this.searchH
return this.$store.state.inIframe ? h : _h
}
},
async created () {
if (this.$route.query) {
let query = this.$route.query
@ -352,12 +360,16 @@ export default {
// this.handleSearch()
// this.getTableData()
this.pageLoading = true
this.searchH = this.$refs.resiSearch.$el.offsetHeight
console.log('storeoooo----0000', this.$store)
console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight)
this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
},
mounted () {
// this.$nextTick(() => {
// this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
// })
console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
},
methods: {

14
src/views/modules/communityParty/elegant/index.vue

@ -235,6 +235,7 @@
<script>
import axios from 'axios'
import { mapGetters } from 'vuex'
export default {
data() {
return {
@ -253,7 +254,7 @@ export default {
pageSize: 20,
total: null,
tableData: [],
tableHeight: 400,
searchH: 0,
unloadPencent: 0,
addLevel: '1',
addType: 'add',
@ -321,6 +322,14 @@ export default {
mainDeed: [{ required: true, message: '主要事迹不能为空', trigger: 'blur' }],
}
}
},
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
const _h = this.clientHeight - 280 - this.searchH
return this.$store.state.inIframe ? h : _h
}
},
async created() {
this.customerId = localStorage.getItem('customerId')
@ -340,10 +349,11 @@ export default {
// this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
},
mounted() {
this.$nextTick(() => {
this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
this.searchH = this.$refs.searchCard.$el.offsetHeight
console.log('tableHeight', this.tableHeight)
})

8
src/views/modules/communityParty/regionalParty/activitys.vue

@ -634,13 +634,11 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 430)
return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
},
rowHeight () {
return (this.clientHeight - 200) + 'px'
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {

8
src/views/modules/communityParty/regionalParty/units.vue

@ -675,13 +675,11 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 430)
return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
},
rowHeight () {
return (this.clientHeight - 200) + 'px'
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {

256
src/views/modules/communityService/dqfwzx/index.vue

@ -2,25 +2,26 @@
<div>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button>
<el-button class="diy-button--add" size="small" @click="handleAdd"
>新增</el-button
>
</div>
<div class="m-center"
v-if="tableData.length > 0">
<div class="m-center" v-if="tableData.length > 0">
<div class="center-left">
<div class="list">
<div @click="currentIndex = index"
class="item"
:class="{ 'z-on': currentIndex == index }"
:key="'ct' + index"
v-for="(item, index) in tableData">
<div class="item-btn"
v-if="currentIndex == index"
@click="handleEdit">
修改
<div class="list" :class="{ 'z-iframe': $store.state.inIframe }">
<div
@click="currentIndex = index"
class="item"
:class="{ 'z-on': currentIndex == index }"
:key="'ct' + index"
v-for="(item, index) in tableData"
>
<div class="item-btns">
<a v-if="currentIndex == index" @click="handleEdit">修改</a>
<a v-if="currentIndex == index" @click="handleDel">删除</a>
</div>
<div class="item-name">{{ item.centerName }}</div>
<div class="item-prop">
<div class="prop-field">社区地址</div>
@ -48,95 +49,114 @@
>
</div> -->
<div id="centerIndexApp"
class="div_map"></div>
<el-table :data="tableData[currentIndex].matterList"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50" />
<el-table-column prop="matterName"
label="事项名称">
<div id="centerIndexApp" class="div_map"></div>
<el-table
:data="tableData[currentIndex].matterList"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="matterName" label="事项名称">
</el-table-column>
<el-table-column prop="allowTime"
label="可预约时间 ">
<el-table-column prop="allowTime" label="可预约时间 ">
</el-table-column>
<el-table-column fixed="right"
label="操作"
align="center"
width="120">
<el-table-column
fixed="right"
label="操作"
align="center"
width="120"
>
<template slot-scope="scope">
<el-button @click="handleOrder(scope.$index)"
type="text"
size="small"
style="color: #1c6afd">预约</el-button>
<el-button @click="handleOrderList(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #1c6afd">预约记录</el-button>
<el-button
@click="handleOrder(scope.$index)"
type="text"
size="small"
style="color: #1c6afd"
>预约</el-button
>
<el-button
@click="handleOrderList(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #1c6afd"
>预约记录</el-button
>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div class="m-hint"
v-else>
<el-empty description="暂无内容"
:image-size="200"></el-empty>
<div class="m-hint" v-else>
<el-empty description="暂无内容" :image-size="200"></el-empty>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleClose">
<edit-form ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"></edit-form>
<el-dialog
:visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleClose"
>
<edit-form
ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog :visible.sync="form2Show"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseForm2">
<order-form ref="eleOrderForm"
@dialogCancle="handleCloseForm2"
@dialogOk="handleOrderSuccess"></order-form>
<el-dialog
:visible.sync="form2Show"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseForm2"
>
<order-form
ref="eleOrderForm"
@dialogCancle="handleCloseForm2"
@dialogOk="handleOrderSuccess"
></order-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog :visible.sync="orderListShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约记录"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseOrderList">
<order-list ref="eleOrderList"
@dialogCancle="handleCloseOrderList"></order-list>
<el-dialog
:visible.sync="orderListShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约记录"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseOrderList"
>
<order-list
ref="eleOrderList"
@dialogCancle="handleCloseOrderList"
></order-list>
</el-dialog>
</div>
</template>
<script>
import { requestPost } from "@/js/dai/request";
import { requestPost } from "@/js/dai/request2";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import editForm from "./cpts/edit";
@ -151,7 +171,7 @@ let loading; // 加载动画
export default {
components: { editForm, orderForm, orderList },
data () {
data() {
return {
openSearch: false,
@ -168,23 +188,25 @@ export default {
};
},
computed: {
maxTableHeight () {
return this.clientHeight - 520;
maxTableHeight() {
return this.$store.state.inIframe
? this.clientHeight - 520 + 120
: this.clientHeight - 520;
},
...mapGetters(["clientHeight"]),
},
watch: {
currentIndex () {
currentIndex() {
this.setMap();
},
},
async mounted () {
async mounted() {
await this.loadAgency();
await this.getTableData();
},
methods: {
// init
initMap () {
initMap() {
//
var center = new window.TMap.LatLng(36.0722275, 120.38945519);
// map TMap.Map()
@ -204,7 +226,7 @@ export default {
infoWindowList = Array(10);
},
setMarker (lat, lng, centerName) {
setMarker(lat, lng, centerName) {
markers.setGeometries([]);
markers.add([
{
@ -218,11 +240,11 @@ export default {
]);
},
setCenter (lat, lng) {
setCenter(lat, lng) {
map.setCenter(new window.TMap.LatLng(lat, lng));
},
setMap () {
setMap() {
const { tableData, currentIndex } = this;
let item = tableData[currentIndex];
if (item) {
@ -231,24 +253,24 @@ export default {
}
},
handleClose () {
handleClose() {
this.formShow = false;
},
handleCloseForm2 () {
handleCloseForm2() {
this.form2Show = false;
},
handleCloseOrderList () {
handleCloseOrderList() {
this.orderListShow = false;
},
async handleAdd () {
async handleAdd() {
this.formShow = true;
await nextTick();
console.log(this.$refs);
this.$refs.eleEditForm.initForm("add");
},
async handleWatch () {
async handleWatch() {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm(
@ -257,7 +279,7 @@ export default {
);
},
async handleEdit () {
async handleEdit() {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm(
@ -266,12 +288,12 @@ export default {
);
},
handleEditSuccess () {
handleEditSuccess() {
this.handleClose();
this.getTableData();
},
async handleOrder (index) {
async handleOrder(index) {
this.form2Show = true;
await nextTick();
this.$refs.eleOrderForm.initForm(
@ -281,36 +303,34 @@ export default {
);
},
handleOrderSuccess () {
handleOrderSuccess() {
this.handleCloseForm2();
},
async handleOrderList (index) {
async handleOrderList(index) {
this.orderListShow = true;
await nextTick(0);
console.log(this.$refs);
this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
},
async handleDel (rowData, rowIndex) {
console.log(rowData, rowIndex);
const url =
"/heart/iccommunityselforganization/delcommunityselforganization";
const { tableData } = this;
async handleDel() {
if (!confirm("删除后不可恢复,确定删除?")) return;
const { data, code, msg } = await requestPost(url, {
orgId: tableData[rowIndex].orgId,
});
const item = this.tableData[this.currentIndex];
const url = "/gov/org/icpartyservicecenter/del";
const { data, code, msg } = await requestPost(url, [
item.partyServiceCenterId,
]);
if (code === 0) {
this.$message.success("删除成功!");
this.getTableData();
} else {
this.$message.success("操作失败!");
}
},
async getTableData () {
async getTableData() {
const oldLen = this.tableData.length;
const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
const { data, code, msg } = await requestPost(url, {
@ -331,7 +351,7 @@ export default {
},
//
async loadAgency () {
async loadAgency() {
const url = "/epmetuser/customerstaff/staffbasicinfo";
let params = {};
@ -339,8 +359,6 @@ export default {
if (code === 0) {
this.agencyId = data.agencyId;
} else {
this.$message.error(msg);
}
},
},
@ -362,6 +380,11 @@ export default {
padding-right: 10px;
height: calc(100vh - 210px);
overflow-y: auto;
&.z-iframe {
height: calc(100vh - 210px + 120px);
}
&::-webkit-scrollbar {
/*滚动条整体样式*/
width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
@ -394,7 +417,8 @@ export default {
background-color: #ffffff;
box-shadow: 0 0 10px #6aa;
}
.item-btn {
.item-btns {
position: absolute;
top: 5px;
right: 5px;
@ -423,10 +447,12 @@ export default {
}
}
}
.item-name {
font-size: 16px;
font-weight: bold;
margin-bottom: 10px;
width: calc(100% - 70px);
}
.item-prop {
display: flex;

13
src/views/modules/communityService/measure/index.vue

@ -589,6 +589,7 @@
</template>
<script>
import { mapGetters } from 'vuex'
export default {
data() {
return {
@ -601,7 +602,7 @@ export default {
pageSize: 20,
total: null,
tableData: [],
tableHeight: 400,
searchH: 0,
addLevel: "1",
addType: "add",
value: "",
@ -846,6 +847,14 @@ export default {
},
};
},
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
const _h = this.clientHeight - 280 - this.searchH
return this.$store.state.inIframe ? h : _h
}
},
async created() {
this.customerId = localStorage.getItem("customerId");
@ -860,7 +869,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
this.searchH = this.$refs.searchCard.$el.offsetHeight
console.log('tableHeight', this.tableHeight)
})
},

8
src/views/modules/communityService/ninePlaces/inspect/inspect.vue

@ -529,13 +529,11 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 420)
return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420
},
rowHeight () {
return (this.clientHeight - 200) + 'px'
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {

8
src/views/modules/communityService/ninePlaces/places/places.vue

@ -464,13 +464,11 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 420)
return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
},
rowHeight () {
return (this.clientHeight - 200) + 'px'
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {

8
src/views/modules/communityService/ninePlaces/team/team.vue

@ -441,13 +441,11 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 370)
return this.$store.state.inIframe ? this.clientHeight - 370 + this.iframeHeight : this.clientHeight - 370
},
rowHeight () {
return (this.clientHeight - 200) + 'px'
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {

219
src/views/modules/communityService/sqzzz/index.vue

@ -1,44 +1,60 @@
<template>
<div class="resi-container">
<el-card ref="searchCard" class="search-card">
<el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
<el-form-item label="组织名称" prop="organizationName">
<el-input
v-model="fmData.organizationName"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
</el-input>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="fmData.createTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
<el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-form
ref="searchForm"
:inline="true"
:model="fmData"
class="demo-form-inline"
>
<el-form-item label="组织名称" prop="organizationName">
<el-input
v-model="fmData.organizationName"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
</el-input>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="fmData.createTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
class="diy-button--search"
size="small"
@click="handleSearch"
>查询</el-button
>
<el-button
class="diy-button--reset"
size="small"
@click="resetForm('searchForm')"
>重置</el-button
>
</el-form-item>
</el-form>
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd"
>新增</el-button
>
<el-button
class="diy-button--export"
size="small"
@click="handleExportModule('room')">下载模板</el-button>
class="diy-button--export"
size="small"
@click="handleExportModule('room')"
>下载模板</el-button
>
<el-upload
ref="upload"
class="upload-btn"
@ -53,9 +69,12 @@
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"
>
<el-button size="small" class="diy-button--delete" :loading="importLoading">{{
importBtnTitle
}}</el-button>
<el-button
size="small"
class="diy-button--delete"
:loading="importLoading"
>{{ importBtnTitle }}</el-button
>
</el-upload>
<el-button @click="handleChu" class="diy-button--reset" size="small"
@ -70,22 +89,41 @@
:height="maxTableHeight"
>
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="organizationName" label="组织名称" align="center">
<el-table-column
prop="organizationName"
label="组织名称"
align="center"
>
<template slot-scope="scope">
<a class="name-a" @click="handleWatch(scope.row)">
<a class="name-a" @click="handleWatch(scope.row)">
{{ scope.row.organizationName }}
</a>
</template>
</el-table-column>
<el-table-column prop="organizationPersonCount" align="center" label="组织人数">
<el-table-column
prop="organizationPersonCount"
align="center"
label="组织人数"
>
</el-table-column>
<el-table-column
prop="serviceItem"
label="服务事项"
align="center"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column prop="serviceItem" label="服务事项" align="center" :show-overflow-tooltip="true"> </el-table-column>
<el-table-column prop="score" width="100" align="center" label="积分">
</el-table-column>
<el-table-column prop="principalName" align="center" label="负责人"> </el-table-column>
<el-table-column prop="principalName" align="center" label="负责人">
</el-table-column>
<el-table-column prop="principalPhone" align="center" label="联系电话">
</el-table-column>
<el-table-column prop="organizationCreatedTime" align="center" label="创建时间">
<el-table-column
prop="organizationCreatedTime"
align="center"
label="创建时间"
>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="160">
<template slot-scope="scope">
@ -121,7 +159,7 @@
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px;"
style="margin-left: 10px"
>删除</el-button
>
</el-popconfirm>
@ -218,9 +256,11 @@ export default {
},
computed: {
maxTableHeight() {
return this.clientHeight - 360;
return this.$store.state.inIframe
? this.clientHeight - 360 + this.iframeHeigh
: this.clientHeight - 360;
},
...mapGetters(["clientHeight"]),
...mapGetters(['clientHeight', 'iframeHeight']),
},
watch: {
"fmData.createTime": function (val) {
@ -237,38 +277,41 @@ export default {
this.getTableData();
},
methods: {
async handleExportModule () {
let url = "/heart/iccommunityselforganization/import-template-download"
async handleExportModule() {
let url = "/heart/iccommunityselforganization/import-template-download";
let params = {}
let params = {};
await this.$http({
method: 'POST',
method: "POST",
url,
responseType: 'blob',
data: params
responseType: "blob",
data: params,
})
.then(res => {
.then((res) => {
// this.download(res.data, title + '.xls')
if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName)
let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
var url = window.URL.createObjectURL(blob)
var aLink = document.createElement('a')
aLink.style.display = 'none'
aLink.href = url
aLink.setAttribute('download', fileName)
document.body.appendChild(aLink)
aLink.click()
document.body.removeChild(aLink) //
window.URL.revokeObjectURL(url) //blob
} else this.$message.error('下载失败')
})
.catch(err => {
console.log('err', err)
return this.$message.error('网络错误')
let fileName = window.decodeURI(
res.headers["content-disposition"].split(";")[1].split("=")[1]
);
console.log("filename", fileName);
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel",
});
var url = window.URL.createObjectURL(blob);
var aLink = document.createElement("a");
aLink.style.display = "none";
aLink.href = url;
aLink.setAttribute("download", fileName);
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink); //
window.URL.revokeObjectURL(url); //blob
} else this.$message.error("下载失败");
})
.catch((err) => {
console.log("err", err);
return this.$message.error("网络错误");
});
},
//
handleExcelSuccess(res, file) {
@ -304,23 +347,28 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
})
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
});
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //
await this.$http
.post('/heart/iccommunityselforganization/importcommunityselforganization', formData).then(res => {
console.log('res-up', res)
if (res.data.code == 0 && res.data.msg == 'success') {
.post(
"/heart/iccommunityselforganization/importcommunityselforganization",
formData
)
.then((res) => {
console.log("res-up", res);
if (res.data.code == 0 && res.data.msg == "success") {
// this.$message.success('')
this.getTableData()
} else this.$message.error(res.data.msg)
}).catch(err => {
console.log('失败', err)
file.onError() //
// this.$message.error('')
this.getTableData();
} else this.$message.error(res.data.msg);
})
.catch((err) => {
console.log("失败", err);
file.onError(); //
// this.$message.error('')
});
// axios({
// url:
// window.SITE_CONFIG["apiURL"] +
@ -344,8 +392,8 @@ export default {
// .catch((err) => {
// console.log("", err);
// });
this.importLoading = false
this.importBtnTitle = '导入'
this.importLoading = false;
this.importBtnTitle = "导入";
this.$refs.upload.clearFiles();
},
@ -370,8 +418,8 @@ export default {
this.getTableData();
},
resetForm(formName) {
this.$refs[formName].resetFields()
this.handleSearch()
this.$refs[formName].resetFields();
this.handleSearch();
},
async handleAdd() {
this.formShow = true;
@ -521,5 +569,4 @@ export default {
position: relative;
overflow: visible;
}
</style>

11
src/views/modules/importRecord/index.vue

@ -6,7 +6,7 @@
:data="tableData"
border
style="width: 100%"
:height="maxTableHeight"
:height="tableHeight"
class="resi-table"
>
<el-table-column label="序号" type="index" align="center" width="50" />
@ -82,10 +82,13 @@ export default {
};
},
computed: {
maxTableHeight() {
return this.clientHeight - 280;
tableHeight () {
const h = this.clientHeight - 240 + this.iframeHeigh
const _h = this.clientHeight - 240
return this.$store.state.inIframe ? h : _h
},
...mapGetters(["clientHeight"]),
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {},
mounted() {

12
src/views/modules/secretaryLog/difficulty/difficultyList.vue

@ -1,6 +1,6 @@
<template>
<div class="div_main">
<div class="div_search">
<div ref="div_search" class="div_search">
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
@ -218,7 +218,7 @@ export default {
scheduledStartTime: '',//yyyy-mm-dd
scheduledEndTime: '',// yyyy-mm-dd
},
sHeight: 0,
tableData: [],
//form
@ -239,6 +239,7 @@ export default {
//
await this.loadTable()
this.sHeight = this.$refs.div_search.offsetHeight + 270
},
methods: {
@ -473,12 +474,13 @@ export default {
},
computed: {
tableHeight () {
return (this.clientHeight - 380)
const h = this.clientHeight - this.sHeight + this.iframeHeigh
const _h = this.clientHeight - this.sHeight
return this.$store.state.inIframe ? h : _h
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight']),
},
watch: {

12
src/views/modules/secretaryLog/humanisticCare/careList.vue

@ -1,6 +1,6 @@
<template>
<div class="div_main">
<div class="div_search">
<div ref="div_search" class="div_search">
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
@ -288,7 +288,7 @@ export default {
scheduledStartTime: '',//怀 yyyy-mm-dd
scheduledEndTime: '',//怀 yyyy-mm-dd
},
sHeight: 0,
tableData: [],
//form
@ -308,6 +308,7 @@ export default {
//
await this.loadTable()
this.sHeight = this.$refs.div_search.offsetHeight + 270
},
methods: {
@ -546,12 +547,13 @@ export default {
},
computed: {
tableHeight () {
return (this.clientHeight - 430)
const h = this.clientHeight - this.sHeight + this.iframeHeigh
const _h = this.clientHeight - this.sHeight
return this.$store.state.inIframe ? h : _h
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight']),
},
watch: {

7
src/views/modules/secretaryLog/workLog/index.vue

@ -414,12 +414,13 @@ export default {
},
computed: {
tableHeight () {
return (this.clientHeight - this.sHeight)
const h = this.clientHeight - this.sHeight + this.iframeHeigh
const _h = this.clientHeight - this.sHeight
return this.$store.state.inIframe ? h : _h
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight']),
},
watch: {

12
src/views/modules/systemManagement/serviceMatter/service.vue

@ -256,14 +256,12 @@ export default {
},
computed: {
tableHeight () {
return (this.clientHeight - 210)
const h = this.clientHeight - 210 + this.iframeHeigh
const _h = this.clientHeight - 210
return this.$store.state.inIframe ? h : _h
},
rowHeight () {
return (this.clientHeight - 200) + 'px'
},
...mapGetters(['clientHeight'])
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {

10
src/views/modules/visual/basicinfo/people.vue

@ -126,7 +126,7 @@
src="@/assets/img/shuju/people/huzhu.png" />
<img class="huzhu-ico"
src="@/assets/img/shuju/people/huzhu-home.png" />
<div class="huzhu-name">{{ houseInfo.ownerName }}</div>
<div class="huzhu-name">{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}</div>
<p>户主</p>
</div>
@ -139,12 +139,12 @@
src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
<div class="rel-text"
:class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''">
<div class="rel-call">岳父母或公婆</div>
<div class="rel-name">吉克隽逸</div>
<!-- <span class="rel-call">{{
<!-- <div class="rel-call">岳父母或公婆</div>
<div class="rel-name">吉克隽逸</div> -->
<span class="rel-call">{{
houseInfo.userList[0].relation
}}</span>
<span class="rel-name">{{ houseInfo.userList[0].userName }}</span> -->
<span class="rel-name">{{ houseInfo.userList[0].userName }}</span>
</div>
</div>

11
src/views/modules/workPc/guidance/categoryList.vue

@ -123,6 +123,7 @@
<script>
import Sortable from 'sortablejs'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
export default {
name: 'RoleList',
@ -164,9 +165,13 @@ export default {
},
computed: {
tableHeight() {
return document.documentElement.clientHeight - 220;
}
tableHeight () {
const h = this.clientHeight - 220 + this.iframeHeigh
const _h = this.clientHeight - 220
return this.$store.state.inIframe ? h : _h
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {

6
src/views/modules/workPc/guidance/guidanceList.vue

@ -201,10 +201,12 @@ export default {
},
computed: {
tableHeight () {
return this.clientHeight - 360
const h = this.clientHeight - 360 + this.iframeHeigh
const _h = this.clientHeight - 360
return this.$store.state.inIframe ? h : _h
},
...mapGetters(['clientHeight', 'env'])
...mapGetters(['clientHeight', 'iframeHeight', 'env'])
},
methods: {
//

14
src/views/modules/workSys/demandCate.vue

@ -136,6 +136,7 @@
</template>
<script>
import { mapGetters } from 'vuex'
export default {
data () {
return {
@ -148,7 +149,7 @@ export default {
pageSize: 20,
total: null,
tableData: [],
tableHeight: 500,
sHeight: 0,
addLevel: '1',
addType: 'add',
value: '',
@ -192,6 +193,15 @@ export default {
}
}
},
computed: {
tableHeight () {
const h = this.clientHeight - this.sHeight + this.iframeHeigh
const _h = this.clientHeight - this.sHeight
return this.$store.state.inIframe ? h : _h
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
async created () {
this.customerId = localStorage.getItem('customerId')
this.getTableData()
@ -200,7 +210,7 @@ export default {
},
mounted () {
this.$nextTick(() => {
this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
this.sHeight = this.$refs.searchCard.$el.offsetHeight + 280
console.log('tableHeight', this.tableHeight)
})
},

20
src/views/modules/workSys/elegantCate.vue

@ -69,6 +69,7 @@
import { requestPost } from '@/js/dai/request'
import elegantEdit from './elegantEdit.vue'
import { mapGetters } from 'vuex'
export default {
data () {
@ -79,7 +80,7 @@ export default {
tableParams: {
customerId: ''
},
tableHeight: 500,
// tableHeight: 500,
search: '',
dataList: [],
@ -101,7 +102,14 @@ export default {
}
console.log('this.dataList', this.dataList)
return this.dataList
}
},
tableHeight () {
const h = this.clientHeight - 220 + this.iframeHeigh
const _h = this.clientHeight - 220
return this.$store.state.inIframe ? h : _h
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
components: {
elegantEdit
@ -112,10 +120,10 @@ export default {
this.initData(user.customerId, user.customerName)
},
mounted() {
this.$nextTick(() => {
this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
console.log('tableHeight', this.tableHeight)
})
// this.$nextTick(() => {
// this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
// console.log('tableHeight', this.tableHeight)
// })
},
methods: {
cellStyle ({ row, column, rowIndex, columnIndex }) {

14
src/views/modules/workSys/resiCate.vue

@ -192,6 +192,7 @@
<script>
import axios from 'axios'
import Sortable from 'sortablejs'
import { mapGetters } from 'vuex'
export default {
data() {
return {
@ -206,7 +207,7 @@ export default {
total: null,
conditions: [],
tableData: [],
tableHeight: 500,
sHeight: 0,
isWarn: null,
level: null,
options: [
@ -286,6 +287,15 @@ export default {
}
}
},
computed: {
tableHeight () {
const h = this.clientHeight - this.sHeight + this.iframeHeigh
const _h = this.clientHeight - this.sHeight
return this.$store.state.inIframe ? h : _h
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
async created() {
this.customerId = localStorage.getItem('customerId')
this.getTableData()
@ -294,7 +304,7 @@ export default {
mounted() {
this.rowDrop()
this.$nextTick(() => {
this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 230 + 'px'
this.sHeight = this.$refs.searchCard.$el.offsetHeight + 230
console.log('tableHeight', this.tableHeight)
})
},

Loading…
Cancel
Save