elink-star
/
epmet-work-pc
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并dev分支代码

V1.0
SongZhen 3 years ago
parent
ab41a3755a e42f84dfe1
commit
6dcfa381fa
7 changed files with 88 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/assets/scss/dataBoard/overview/index.scss
  2. 2
      src/assets/scss/modules/index.scss
  3. 35
      src/views/dataBoard/overview/components/sq12345.vue
  4. 34
      src/views/dataBoard/overview/components/sqrfph.vue
  5. 21
      src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
  6. 10
      src/views/modules/satisfaction/communitySelfInsp/formList.vue
  7. 4
      src/views/modules/satisfaction/satisfactionProvince/formList.vue

26
src/assets/scss/dataBoard/overview/index.scss
View File

@ -44,19 +44,19 @@
overflow-y: hidden; overflow-y: hidden;
} }
.animation { // .animation {
animation: move 10s linear infinite; // animation: move 10s linear infinite;
} // }
@keyframes move { // @keyframes move {
0% { // 0% {
transform: translateY(0px); // transform: translateY(0px);
} // }
100% { // 100% {
transform: translateY(-320px); // transform: translateY(-320px);
} // }
} // }
.m-jdjs { .m-jdjs {
height: 318px; height: 318px;

2
src/assets/scss/modules/index.scss
View File

@ -299,7 +299,7 @@
} }
.item-per { .item-per {
width: 90px; min-width: 70px;
} }
.item-progress { .item-progress {

35
src/views/dataBoard/overview/components/sq12345.vue
View File

@ -9,7 +9,7 @@
<div class="th">已办结</div> <div class="th">已办结</div>
</div> </div>
<div style="overflow: hidden"> <div style="overflow: hidden">
<div class="animation"> <div ref="animation">
<div class="tr" v-for="(item, index) in pmList" :key="index"> <div class="tr" v-for="(item, index) in pmList" :key="index">
<div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'"> <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
{{ index - 0 + 1 }} {{ index - 0 + 1 }}
@ -20,14 +20,16 @@
<div class="td td-gr">{{ item.closedNum }}</div> <div class="td td-gr">{{ item.closedNum }}</div>
</div> </div>
<!-- 无缝滚动 --> <!-- 无缝滚动 -->
<div class="tr" v-for="(item, index) in pmList" :key="index"> <div v-if="pmList.length > 7">
<div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'"> <div class="tr" v-for="(item, index) in pmList" :key="index">
{{ index - 0 + 1 }} <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
{{ index - 0 + 1 }}
</div>
<div class="td">{{ item.orgName }}</div>
<div class="td">{{ item.sumNum }}</div>
<div class="td td-or">{{ item.processNum }}</div>
<div class="td td-gr">{{ item.closedNum }}</div>
</div> </div>
<div class="td">{{ item.orgName }}</div>
<div class="td">{{ item.sumNum }}</div>
<div class="td td-or">{{ item.processNum }}</div>
<div class="td td-gr">{{ item.closedNum }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -72,6 +74,23 @@ export default {
getList(item) { getList(item) {
this.$http.get("/actual/base/streetOverview/eventAgencyGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => { this.$http.get("/actual/base/streetOverview/eventAgencyGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => {
this.pmList = data; this.pmList = data;
if (this.pmList.length > 7) {
this.$nextTick(() => {
const aniHeight = this.$refs.animation.querySelector(".tr").offsetHeight * this.pmList.length;
console.log(aniHeight);
this.$refs.animation.style.animation = "move 10s linear infinite";
document.styleSheets[0].insertRule(
`@keyframes move{0% {
transform: translateY(0px);
}
100% {
transform: translateY(-${aniHeight}px);
}`,
0
);
});
}
}); });
}, },
}, },

34
src/views/dataBoard/overview/components/sqrfph.vue
View File

@ -9,7 +9,7 @@
<div class="th">人房更新总数</div> <div class="th">人房更新总数</div>
</div> </div>
<div style="overflow: hidden"> <div style="overflow: hidden">
<div class="animation"> <div ref="animation">
<div class="tr" v-for="(item, index) in pmList" :key="index"> <div class="tr" v-for="(item, index) in pmList" :key="index">
<div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'"> <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
{{ index - 0 + 1 }} {{ index - 0 + 1 }}
@ -20,14 +20,16 @@
<div class="td">{{ item.sumNum }}</div> <div class="td">{{ item.sumNum }}</div>
</div> </div>
<!-- 无缝滚动 --> <!-- 无缝滚动 -->
<div class="tr" v-for="(item, index) in pmList" :key="index"> <div v-if="pmList.length > 7">
<div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'"> <div class="tr" v-for="(item, index) in pmList" :key="index">
{{ index - 0 + 1 }} <div :class="index - 0 + 1 < 4 ? `td tdbg${index - 0 + 1}` : 'td'">
{{ index - 0 + 1 }}
</div>
<div class="td">{{ item.orgName }}</div>
<div class="td">{{ item.houseNum }}</div>
<div class="td">{{ item.residentNum }}</div>
<div class="td">{{ item.sumNum }}</div>
</div> </div>
<div class="td">{{ item.orgName }}</div>
<div class="td">{{ item.houseNum }}</div>
<div class="td">{{ item.residentNum }}</div>
<div class="td">{{ item.sumNum }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -72,6 +74,22 @@ export default {
getList(item) { getList(item) {
this.$http.get("/actual/base/streetOverview/residentHouseUpdateGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => { this.$http.get("/actual/base/streetOverview/residentHouseUpdateGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => {
this.pmList = data; this.pmList = data;
if (this.pmList.length > 7) {
this.$nextTick(() => {
const aniHeight = this.$refs.animation.querySelector(".tr").offsetHeight * this.pmList.length;
this.$refs.animation.style.animation = "move 10s linear infinite";
document.styleSheets[0].insertRule(
`@keyframes move{0% {
transform: translateY(0px);
}
100% {
transform: translateY(-${aniHeight}px);
}`,
0
);
});
}
}); });
}, },
}, },

21
src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
View File

@ -105,7 +105,7 @@
<el-form-item label-width="100px" label="证件类型" prop="idType" v-else> <el-form-item label-width="100px" label="证件类型" prop="idType" v-else>
<el-select v-model="formData.idType" clearable> <el-select v-model="formData.idType" clearable>
<el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label" <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label"
:value="item.value"> :A="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -152,7 +152,7 @@
<el-col :span="12"> <el-col :span="12">
<div class="info-prop" v-if="formType == 'detail'"> <div class="info-prop" v-if="formType == 'detail'">
<span class="info-title-2">岗位类型: </span> <span class="info-title-2">岗位类型: </span>
<span>{{ formData.postTypes }}</span> <span>{{ formData.postTypeNames || '--' }}</span>
</div> </div>
<el-form-item label-width="100px" label="岗位类型" prop="postTypes" v-else> <el-form-item label-width="100px" label="岗位类型" prop="postTypes" v-else>
<el-select v-model="formData.postTypes" multiple collapse-tags clearable> <el-select v-model="formData.postTypes" multiple collapse-tags clearable>
@ -193,7 +193,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="info-prop" v-if="formType == 'detail'"> <div class="info-prop" v-if="formType == 'detail'">
<span class="info-title-2">兴趣特长: </span> <span class="info-title-2">兴趣特长: </span>
<span>{{ formData.hobbyCodes || "--" }}</span> <span>{{ formData.hobbyNames || "--" }}</span>
</div> </div>
<el-form-item label-width="100px" label="兴趣特长" v-else class="wd-wr"> <el-form-item label-width="100px" label="兴趣特长" v-else class="wd-wr">
@ -235,11 +235,11 @@
<el-col :span="24"> <el-col :span="24">
<div class="info-prop" v-if="formType == 'detail'"> <div class="info-prop" v-if="formType == 'detail'">
<span class="info-title-2">管理范围: </span> <span class="info-title-2">管理范围: </span>
<span>{{ formData.manageScopes || "--" }}</span> <span>{{ formData.manageScopesName || "--" }}</span>
</div> </div>
<el-form-item label="管理范围" prop="agencyId" label-width="100px" v-else> <el-form-item label="管理范围" prop="agencyId" label-width="100px" v-else>
<el-cascader class="u-item-width-normal" ref="myCascader" v-model="formData.manageScopes" <el-cascader class="u-item-width-normal" ref="myCascader" v-model="formData.manageScopes"
:options="orgOptions" :props="orgOptionProps" :show-all-levels="false" clearable> :options="orgOptions" :props="orgOptionProps" :show-all-levels="false" @change="handleChangeManageScopes" clearable>
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -334,6 +334,7 @@ export default {
SPECIAL_SKILL: [], SPECIAL_SKILL: [],
idCard_type: [] idCard_type: []
}, },
selArr:[],
}; };
}, },
@ -356,10 +357,11 @@ export default {
await this.getDetail(this.scopeId); await this.getDetail(this.scopeId);
}, },
async getDetail(categorizedResiId) { async getDetail(categorizedResiId) {
const url = `/actual/base/publicWelfarePost/detail/${categorizedResiId}`; const url = `/actual/base/resiCategorized/publicWelfarePost/detail/${categorizedResiId}`;
const { data, code, msg } = await requestGet(url); const { data, code, msg } = await requestGet(url);
if (code === 0) { if (code === 0) {
this.formData = { ...data }; this.formData = { ...data };
this.formData.manageScopes = data.manageScopes[0].scopeId
await this.setAgencyIdFromLastLayerId(data.agencyId) await this.setAgencyIdFromLastLayerId(data.agencyId)
console.log(this.agencyIdTemp); console.log(this.agencyIdTemp);
} else { } else {
@ -375,7 +377,7 @@ export default {
this.formType === "edit" this.formType === "edit"
? "/actual/base/resiCategorized/publicWelfarePost/update" ? "/actual/base/resiCategorized/publicWelfarePost/update"
: "/actual/base/resiCategorized/publicWelfarePost/create"; : "/actual/base/resiCategorized/publicWelfarePost/create";
this.formData.manageScopes = this.selArr
const { data, code, msg } = await requestPost(url, this.formData); const { data, code, msg } = await requestPost(url, this.formData);
if (code === 0) { if (code === 0) {
this.$message.success(this.formType == 'add' ? "添加成功" : '修改成功'); this.$message.success(this.formType == 'add' ? "添加成功" : '修改成功');
@ -386,6 +388,11 @@ export default {
} }
}); });
}, },
handleChangeManageScopes(val){
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
console.log(obj);
this.selArr = [{scopeType:obj.level,scopeId:obj.agencyId}]
},
async getDicts() { async getDicts() {
try { try {
const requests = [ const requests = [

10
src/views/modules/satisfaction/communitySelfInsp/formList.vue
View File

@ -3,22 +3,22 @@
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'"> <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<el-form-item label="不满意类目" prop="startTime"> <el-form-item label="不满意类目" prop="startTime">
<el-select v-model="formData.satisfactionCategory" placeholder="请输入" size="small" <el-select v-model="formData.satisfactionCategory" placeholder="请输入" size="small"
class="u-item-width-normal" clearable> class="u-item-width-normal" @change="handleSearch" clearable>
<el-option v-for="item in dicts.satisfaction_category" :key="item.value" :label="item.label" <el-option v-for="item in dicts.satisfaction_category" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value" >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="不满意等级" prop="startTime"> <el-form-item label="不满意等级" prop="startTime">
<el-select v-model="formData.satisfactionLevel" placeholder="请输入" size="small" class="u-item-width-normal" <el-select v-model="formData.satisfactionLevel" placeholder="请输入" size="small" class="u-item-width-normal"
clearable> clearable @change="handleSearch">
<el-option v-for="item in dicts.satisfaction_level" :key="item.value" :label="item.label" <el-option v-for="item in dicts.satisfaction_level" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-button size="small" type="primary " <!-- <el-button size="small" type="primary "
@click="handleSearch">查询</el-button> @click="handleSearch">查询</el-button> -->
</el-form> </el-form>

4
src/views/modules/satisfaction/satisfactionProvince/formList.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div style="margin-top:10px"> <div style="margin-top:10px">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'"> <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<el-form-item label="不满意类目" prop="startTime"> <el-form-item label="不满意类目" prop="startTime" >
<el-select v-model="formData.scopeId" placeholder="请输入" size="small" class="u-item-width-normal" clearable> <el-select v-model="formData.scopeId" placeholder="请输入" size="small" class="u-item-width-normal" @change="getTableData" clearable>
<el-option v-for="item in dicts.satisfaction_category" :key="item.value" :label="item.label" <el-option v-for="item in dicts.satisfaction_category" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>

Write Preview
Loading…
Cancel
Save