+ v-if="item.componentFrontId==='resi-titleList-home-gridNameTitle'">
- ![]()
- 
+ ![]()
+
{{ item.demoData.title }}
- ![]()
- 
+ ![]()
+
+
{{ item.demoData.title }}
-
+
+ v-else-if="item.componentFrontId==='resi-topList-voice-hotNewsSwiper'">
- ![]()
- 
+ ![]()
+
+
{{ item.demoData.title }}
@@ -34,22 +44,28 @@
+ v-else-if="item.componentFrontId==='resi-floatingList-mine-newMessageButton'">
- ![]()
- 
+ ![]()
+
{{ item.demoData.text }}
+
{{ item.demoData.text }}
+ v-else-if="item.componentFrontId==='resi-functionList-voice-newsList'">
党建声音
-
- ![]()
- 
+
+
+ ![]()
+
@@ -61,17 +77,22 @@
+
{{ subitem.title }}
@@ -61,17 +77,22 @@
+ v-else-if="item.componentFrontId==='resi-functionList-hall-hotSubjectList'">
热点议题
-
-
+
+
{{ subitem.title }}
{{ subitem.content || '最热议题内容' }}
- ![]()
-
+ ![]()
+
来源：{{ subitem.author }}
{{ subitem.date }}
@@ -79,18 +100,22 @@
+
来源：{{ subitem.author }}
{{ subitem.date }}
+ v-else-if="item.componentFrontId==='resi-functionList-hall-latestIssueList'">
最新议题
-
-
+
+
{{ subitem.title }}
{{ subitem.content || '最新议题内容' }}
- ![]()
-
+ ![]()
+
来源：{{ subitem.author }}
{{ subitem.date }}
@@ -98,13 +123,15 @@
+
来源：{{ subitem.author }}
{{ subitem.date }}
+ v-else-if="item.componentFrontId==='resi-functionList-hall-closedProjectList'">
结案项目
-
+
{{ subitem.title }}
{{ subitem.content }}
@@ -119,15 +146,22 @@
+ v-else-if="item.componentFrontId==='resi-functionList-extend-moreFunctionIcons'">
-
- ![]()
- 
- 
- 
- 
+
@@ -136,19 +170,26 @@
-
-
-
+
+ ![]()
+
+
+
+
+
+
+
{{ subitem.text }}
+ v-else-if="item.componentFrontId==='resi-functionList-group-recommendGroupSlider'">
-
+
+
+
- ![]()
- 
- 
+ ![]()
+
+
{{ subitem.no }}
-
+
+
{{ subitem.no }}
- ![]()
- 
+ ![]()
+
+
{{ subitem.title }}
@@ -164,8 +205,148 @@
+
+
+
+
+
+
+ ![]()
+ 
+
+
+
+ 
+ {{ item.demoData.title }}
+
+
+
+ {{ item.demoData.title }}
+
+
+
+ 
+ {{'点击进入'}}
+
+
+ {{'点击进入'}}
+
+
+
+
+
+
+ 最新活动
+
+ 查看更多
+
+
+
+ ![]()
+
+
+
+ {{ subitem.title }}
+
+
+
+
+ 活动时间：
+
+
+ 活动时间：
+
+ {{ subitem.time1 }}
+ {{ subitem.time2 }}
+
+
+
+
+ 活动地点：{{ subitem.adress }}
+
+
+
+ 活动地点：{{ subitem.adress }}
+
+
+ 活动名额 12人
+ 已报名 9人
+
+
+
+
+
+
+
+
+
+ 历史回顾
+
+ 查看更多
+
+
+
+ ![]()
+
+
+
+ {{ subitem.title }}
+
+
+
+
+ 活动时间：
+
+
+ 活动时间：
+
+ {{ subitem.time1 }}
+ {{ subitem.time2 }}
+
+
+
+
+ 活动地点：{{ subitem.adress }}
+
+
+
+ 活动地点：{{ subitem.adress }}
+
+
+
+
-
+
+ 积分排行榜
+
+ 总排名
+ 本周排名
+ 本月排名
+
+
+
+
+
+
+ ![]()
+ 
+ 
+ 
+
+ {{ subitem.subindex }}
+
+
+
+
+
+
+ {{ subitem.subindex }}
+ {{ subitem.name }}
+ {{ subitem.score }}
+
+
+
{{ item.componentName }}
@@ -173,18 +354,23 @@
-
+ :class="{'z-small': item.region!=='functionList'}"
+ v-show="isFocused"
+ @click.stop>
+
-
上移
+
-
删除
+
diff --git a/epmet-oper-web/src/views/modules/code/CommitForm.vue b/epmet-oper-web/src/views/modules/code/CommitForm.vue
index 6f178c6..7bcda98 100644
--- a/epmet-oper-web/src/views/modules/code/CommitForm.vue
+++ b/epmet-oper-web/src/views/modules/code/CommitForm.vue
@@ -60,9 +60,9 @@ import CTable from '@c/CTableNoPage'
import CDialog from '@c/CDialog'
import CForm from '@c/CForm'
import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui'//引入Loading服务
+import { Loading } from 'element-ui' // 引入Loading服务
-let loading//加载动画
+let loading // 加载动画
export default {
data () {
return {
@@ -216,17 +216,17 @@ export default {
this.resetData()
this.diaVisible = false
},
- //开启加载动画
+ // 开启加载动画
startLoading () {
loading = Loading.service({
- lock: true, //是否锁定
- text: '正在加载……', //加载中需要显示的文字
- background: 'rgba(0,0,0,.7)' //背景颜色
+ lock: true, // 是否锁定
+ text: '正在加载……', // 加载中需要显示的文字
+ background: 'rgba(0,0,0,.7)' // 背景颜色
})
},
- //结束加载动画
+ // 结束加载动画
endLoading () {
- //clearTimeout(timer);
+ // clearTimeout(timer);
if (loading) {
loading.close()
}
diff --git a/epmet-oper-web/src/views/modules/code/CommitList.vue b/epmet-oper-web/src/views/modules/code/CommitList.vue
index 5b5ed25..b8b72a6 100644
--- a/epmet-oper-web/src/views/modules/code/CommitList.vue
+++ b/epmet-oper-web/src/views/modules/code/CommitList.vue
@@ -115,10 +115,13 @@ import SubmitForm from './SubmitForm'
import CommitForm from './CommitForm'
import OperHistory from './OperHistory'
import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading// 加载动画
+
export default {
data () {
return {
- loading: false,
// 查询相关
tableParams: {
@@ -366,15 +369,19 @@ export default {
const param = {
codeId: row.id
}
- window.app.ajax.exportFilePost(url, param,
+ this.startLoading()
+ window.app.ajax.post(url, param,
(data, rspMsg) => {
+ // // eslint-disable-next-line
+ // debugger
+ this.endLoading()
if (data) {
- // eslint-disable-next-line
- // debugger
- this.src = window.URL.createObjectURL(data.qrcode)
+ // console.log(data.qrcode)
+ this.src = data.qrcode
}
},
(rspMsg, data) => {
+ this.endLoading()
this.$message.error(rspMsg)
}, { headers: { 'Content-Type': 'image/jpeg' } })
},
@@ -421,13 +428,14 @@ export default {
const customerUrl = '/third/pacustomer/registerbyauth'
// const customerUrl = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/pacustomer/registerbyauth'
const param = {
- initState: 1,
- resiAuth: 1,
+ // initState: 1,
+ // resiAuth: 1,
workAuth: 1
}
-
+ this.startLoading()
await window.app.ajax.post(customerUrl, param,
(data, rspMsg) => {
+ this.endLoading()
if (data) {
let customerList = []
@@ -444,8 +452,24 @@ export default {
}
},
(rspMsg, data) => {
+ this.endLoading()
this.$message.error(rspMsg)
})
+ },
+ // 开启加载动画
+ startLoading () {
+ loading = Loading.service({
+ lock: true, // 是否锁定
+ text: '正在加载……', // 加载中需要显示的文字
+ background: 'rgba(0,0,0,.7)' // 背景颜色
+ })
+ },
+ // 结束加载动画
+ endLoading () {
+ // clearTimeout(timer);
+ if (loading) {
+ loading.close()
+ }
}
}
}
diff --git a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
index 72259c8..bdf98f0 100644
--- a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
+++ b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
@@ -38,10 +38,12 @@
下移