diff --git a/api/workPlan/monthPlan.js b/api/workPlan/monthPlan.js
new file mode 100644
index 0000000..acca168
--- /dev/null
+++ b/api/workPlan/monthPlan.js
@@ -0,0 +1,3 @@
+import request_yn from '@/utils/request_new_yn'
+
+// 获取
diff --git a/pages/realName/index/components/bar-charts-model.vue b/pages/realName/index/components/bar-charts-model.vue
index 520c338..347324a 100644
--- a/pages/realName/index/components/bar-charts-model.vue
+++ b/pages/realName/index/components/bar-charts-model.vue
@@ -147,7 +147,7 @@ export default {
res.data.proMsgBean
setTimeout(() => {
let data = {
- categories: ['基建线路', '基建变电', '生产线路', '生产变电', '配网', '其他'],
+ categories: ['基建线路', '基建变电', '生产线路', '生产变电', '配网', '其它'],
series: [
{
name: '',
diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue
index 5b3e1f6..4c60c85 100644
--- a/pages/realName/index/index.vue
+++ b/pages/realName/index/index.vue
@@ -8,8 +8,8 @@
leftIconColor="#fff"
bgColor="#00337A"
:titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
- />
-
+ >
+
@@ -594,10 +594,11 @@ export default {
},
//展示工程选择弹窗
leftClick() {
- console.log('返回')
- if (this.type.indexOf('4') > -1) {
- this.showPopup = true
- }
+ // console.log('返回')
+ // if (this.type.indexOf('4') > -1) {
+ // this.showPopup = true
+ // }
+ uni.navigateTo({ url: '/pages/gzt/index' })
},
//选择工程
chosenPro(item) {
@@ -832,6 +833,12 @@ export default {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?workerType=0` })
break
}
+ },
+ /* 刷新页面 */
+ onRefreshPages() {
+ uni.reLaunch({
+ url: '/pages/realName/index/index'
+ })
}
}
}
@@ -853,6 +860,19 @@ export default {
box-sizing: border-box;
padding: 0 10rpx;
+ .refresh-btn {
+ position: fixed;
+ top: 36rpx;
+ right: 26rpx;
+ background-color: #00337a;
+ color: #fff;
+ z-index: 999;
+ }
+
+ .refresh-btn::after {
+ border: none;
+ }
+
.search {
width: 100%;
margin: 0 auto;
diff --git a/pages/realName/index/pages/project.vue b/pages/realName/index/pages/project.vue
index 1ef7f39..bb5b5f8 100644
--- a/pages/realName/index/pages/project.vue
+++ b/pages/realName/index/pages/project.vue
@@ -27,13 +27,18 @@
-
-
- {{ index + 1 }}
- {{ item.proName }}
-
-
-
+
+ {{ index + 1 }}
+ {{ item.proName }}
+
+
+
{{ item.subComName }}
{{ item.voltageLevel }}
@@ -368,7 +373,7 @@ export default {
/* 收藏与取消收藏 */
onCollection(e, row) {
- console.log(row)
+ console.log(row)
const params = {
id: row.collectId,
userId: uni.getStorageSync('realNameUser').userId,
diff --git a/pages/realName/index/pages/subList.vue b/pages/realName/index/pages/subList.vue
index 98cf136..12d6c09 100644
--- a/pages/realName/index/pages/subList.vue
+++ b/pages/realName/index/pages/subList.vue
@@ -1,11 +1,18 @@
-
+
@@ -86,7 +125,8 @@
@@ -100,7 +140,8 @@
@@ -109,38 +150,38 @@
- 电压等级
-
-
-
-
- {{ item.name }}
-
-
-
-
- 工程类型
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
+ 电压等级
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ 工程类型
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
@@ -163,20 +204,43 @@ export default {
token: uni.getStorageSync('tjToken'),
// 查询参数
queryParams: {
- offset: "0",
- limit: "999999",
+ offset: '0',
+ limit: '999999',
params: {
- userId:uni.getStorageSync('realNameUser').userId+"",
- proId:"",
- subName:"",
- proName:"",
- subComName:""
+ userId: uni.getStorageSync('realNameUser').userId + '',
+ proId: '',
+ subName: '',
+ proName: '',
+ subComName: ''
}
},
companyList: [{ name: '全部', id: '' }],
- proStatusList: [{name:'全部', id:'' },{name:'在建', id:'1' },{name:'完工', id:'2' },{name:'筹建', id:'3' },{name:'停工', id:'4' },{name:'遗憾收尾', id:'5' }],
- levelList: [{name:'全部', id:'' },{name:'其他', id:'1' },{name:'110kV', id:'2' },{name:'220kV', id:'3' },{name:'500kV', id:'4' },{name:'±500kV', id:'5' },{name:'1000kV以上', id:'6' }],
- proTypeList: [{name:'全部', id:'' },{name:'其他', id:'1' },{name:'变电改扩建', id:'2' },{name:'基建变电', id:'3' },{name:'基建线路', id:'4' },{name:'生产变电', id:'5' },{name:'生产线路', id:'6' }],
+ proStatusList: [
+ { name: '全部', id: '' },
+ { name: '在建', id: '1' },
+ { name: '完工', id: '2' },
+ { name: '筹建', id: '3' },
+ { name: '停工', id: '4' },
+ { name: '遗憾收尾', id: '5' }
+ ],
+ levelList: [
+ { name: '全部', id: '' },
+ { name: '其他', id: '1' },
+ { name: '110kV', id: '2' },
+ { name: '220kV', id: '3' },
+ { name: '500kV', id: '4' },
+ { name: '±500kV', id: '5' },
+ { name: '1000kV以上', id: '6' }
+ ],
+ proTypeList: [
+ { name: '全部', id: '' },
+ { name: '其他', id: '1' },
+ { name: '变电改扩建', id: '2' },
+ { name: '基建变电', id: '3' },
+ { name: '基建线路', id: '4' },
+ { name: '生产变电', id: '5' },
+ { name: '生产线路', id: '6' }
+ ],
companyInfoList: []
}
},
@@ -184,14 +248,14 @@ export default {
// this.getHomePageSelectData()
},
onLoad(option) {
- console.log(option)
- this.queryParams.params.proId=option.proId||"";
- this.getListData()
+ console.log(option)
+ this.queryParams.params.proId = option.proId || ''
+ this.getListData()
},
methods: {
/* 获取列表 */
async getListData() {
- console.log(this.queryParams)
+ console.log(this.queryParams)
uni.request({
url: config.realBmwUrl + '/homeSubPage/getAppActiveSub',
method: 'POST',
@@ -214,7 +278,8 @@ export default {
this.companyList = this.companyList.concat(res.subList)
},
leftClick() {
- uni.navigateTo({ url: `/pages/realName/index/index` })
+ // uni.navigateTo({ url: `/pages/realName/index/index` })
+ uni.navigateBack()
},
onSearchFilter() {
// 打开底部弹框
@@ -229,7 +294,7 @@ export default {
this.queryParams.params.subComName = name
}
},
- onSelectStatus(index, name) {
+ onSelectStatus(index, name) {
this.activeIndex2 = index
if (index === 0) {
this.queryParams.params.proStatus = ''
@@ -237,7 +302,7 @@ export default {
this.queryParams.params.proStatus = name
}
},
- onSelectLevel(index, name) {
+ onSelectLevel(index, name) {
this.activeIndex3 = index
if (index === 0) {
this.queryParams.params.level = ''
@@ -245,7 +310,7 @@ export default {
this.queryParams.params.level = name
}
},
- onSelectType(index, name) {
+ onSelectType(index, name) {
this.activeIndex4 = index
if (index === 0) {
this.queryParams.params.type = ''
@@ -257,12 +322,12 @@ export default {
onReset() {
this.activeIndex = 0
this.queryParams.params.subComName = ''
- this.activeIndex2 = 0
+ this.activeIndex2 = 0
this.queryParams.params.proStatus = ''
- this.activeIndex3 = 0
- this.queryParams.params.level = ''
- this.activeIndex4 = 0
- this.queryParams.params.type = ''
+ this.activeIndex3 = 0
+ this.queryParams.params.level = ''
+ this.activeIndex4 = 0
+ this.queryParams.params.type = ''
this.onQuery()
},
/* 查询 */
@@ -271,34 +336,33 @@ export default {
this.$refs.popup.close()
})
},
-
-
- /* 点击跳转班组 */
- goTeamListPage(row) {
- uni.navigateTo({ url: `/pages/realName/index/pages/teamList?subId=${row.subId}` })
- },
- /* 点击跳转人员-已考勤 */
- goAttPersonListPage(row) {
- uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&isAtt=0` })
- },
- /* 点击跳转人员-在场（全部） */
- goAllPersonListPage(row) {
- uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}` })
- },
- /* 点击跳转人员-固定 */
- goWorkPersonListPage(row) {
- uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&workerType=1` })
- },
- /* 点击跳转人员-临时 */
- goTempPersonListPage(row) {
- uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&workerType=0` })
- },
- /* 点击跳转人员-灯 */
- goLightPersonListPage(row,type) {//绿2 黄1 红0
- uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&lightStatus=${type}` })
- },
-
-
+
+ /* 点击跳转班组 */
+ goTeamListPage(row) {
+ uni.navigateTo({ url: `/pages/realName/index/pages/teamList?subId=${row.subId}` })
+ },
+ /* 点击跳转人员-已考勤 */
+ goAttPersonListPage(row) {
+ uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&isAtt=0` })
+ },
+ /* 点击跳转人员-在场（全部） */
+ goAllPersonListPage(row) {
+ uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}` })
+ },
+ /* 点击跳转人员-固定 */
+ goWorkPersonListPage(row) {
+ uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&workerType=1` })
+ },
+ /* 点击跳转人员-临时 */
+ goTempPersonListPage(row) {
+ uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&workerType=0` })
+ },
+ /* 点击跳转人员-灯 */
+ goLightPersonListPage(row, type) {
+ //绿2 黄1 红0
+ uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&lightStatus=${type}` })
+ },
+
/* 收藏与取消收藏 */
onCollection(e, row) {
e.stopPropagation()
@@ -333,146 +397,145 @@ export default {