lizhichao
/
hitap-chat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

Browse Source
main
guanxiaohan 11 months ago
parent fa684b5513 9b360854f9
commit 6cbf685da9
6 changed files with 111 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      components/tabbar.vue
  2. 2
      pages/index/detail.vue
  3. 16
      pages/index/index.vue
  4. 67
      pages/investigation/index.vue
  5. 47
      pages/investigation/task.vue
  6. 3
      pages/knowledge/index.vue

7
components/tabbar.vue
Unescape View File

@ -77,6 +77,7 @@
methods: {
to(item, index) {
this.value = index
this.$.setData('pageType', 1)
uni.switchTab({
url: item.pagePath
})
@ -116,12 +117,12 @@
}
for (let i in this.list) {
if ('/pages/' + this.path + '/index' == this.list[i].pagePath) {
// console.log('/pages/' + this.path + '/index' == this.list[i].pagePath,this.list.length,i)
// this.value = Number(i)
// console.log('/pages/' + this.path + '/index' == this.list[i].pagePath,this.list.length,i)
// this.value = Number(i)
}
}
// console.log('/pages/'+this.path+'/index')
// console.log('/pages/' + this.path + '/index')
// console.log('/pages/' + this.path + '/index')
}
}
}

2
pages/index/detail.vue
Unescape View File

@ -525,6 +525,8 @@ console.log({
// 更新列表信息
changeMsgList(answerId, data, optionType, answerOptions) {
let id = 1;
data = data.replace("undefined", '')
data = data.replace("null", '')
if (this.msgList.length > 0) {
id = this.msgList[this.msgList.length - 1].id + 1;
}

16
pages/index/index.vue
Unescape View File

@ -27,13 +27,13 @@
</view>
</view>
<view class="right">
<view class="current_mouth Flex Flex_C_S-B blur">
<view class="current_mouth Flex Flex_C_S-B blur" @click="jump(2,'2')">
<image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/mouth.png'" class="video">
</image>
<text class="name">本月上报</text>
<text class="name">个人上报</text>
<text class="number">{{ totalData.MonthReport }}</text>
</view>
<view class="finish Flex Flex_C_S-B blur" @click="jump(2)">
<view class="finish Flex Flex_C_S-B blur" @click="jump(2,'1')">
<image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/finish.png'" class="video">
</image>
<text class="name">已完成</text>
@ -180,13 +180,13 @@
},
handleClick(row) {
if (row.pcType == 2) {
this.$.open("/pages/investigation/task" + "?id=" + row.businessId+ '&sectionId=' + row.sectionCode +
this.$.open("/pages/investigation/task" + "?id=" + row.businessId + '&sectionId=' + row.sectionCode +
'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
'&pcType' + row.pcType+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode);
'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode);
} else {
this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode +
'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
'&pcType' + row.pcType+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode)
'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode)
}
},
konw() {
@ -196,12 +196,14 @@
skipPage(even) {
// this.$.open(even)
},
jump(v) {
jump(v, type) {
if (v == 1) {
this.$.setData('pageStatus', 1)
this.$.setData('pageType', 1)
}
if (v == 2) {
this.$.setData('pageStatus', 3)
this.$.setData('pageType', type)
}
this.$.openTab('/pages/investigation/index')

67
pages/investigation/index.vue
Unescape View File

@ -11,7 +11,7 @@
</template> -->
</top-title>
</view>
<view class="query-form">
<view class="query-form" :class="tab==3?'query-form2':''">
<view class="search-box">
<u-search placeholder="请输入名称" v-model="search" actionText="" :showAction="false"
@search="searchData" @clear="searchData"></u-search>
@ -31,6 +31,20 @@
<text class="number">{{ totalData.InGovernance }}</text>
</view>
</view>
<view class="type-box" v-show="tab==3">
<view class="type-item" :class="queryType == 1 ? 'type-active' : ''" @click="queryType=1">
全部
</view>
<view class="type-item" :class="queryType == 2 ? 'type-active' : ''" @click="queryType=2">
人工上报
</view>
<view class="type-item" :class="queryType == 3 ? 'type-active' : ''" @click="queryType=3">
系统下发
</view>
</view>
</view>
@ -95,7 +109,9 @@
},
status: '10',
search: '',
tabbarShow: true
tabbarShow: true,
queryType: '1',
pageStatus: ''
}
},
@ -108,6 +124,8 @@
// tabFun.tabbar()
this.getData()
let pageStatus = this.$.getData('pageStatus')
this.pageStatus = pageStatus
this.queryType = this.$.getData('pageType')
if (pageStatus == 1) {
this.handleTabClick(1)
this.$.setData('pageStatus', '0')
@ -205,24 +223,28 @@
console.log(row)
if (this.tab === 1) {
if (row.pcType == 2) {
this.$.open("/pages/investigation/task" + "?id=" + row.businessId+ '&sectionId=' + row.sectionCode +
'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
'&pcType' + row.pcType+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode);
this.$.open("/pages/investigation/task" + "?id=" + row.businessId + '&sectionId=' + row
.sectionCode +
'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row
.sectionCode);
} else {
this.$.open('/pages/map/index?businessId=' + row.businessId +
'&operator=' + row.operator +
'&deptId=' + row.handleDept +
'&pcType=' + row.pcType +
'&type=' + (this.tab == 1 ? 'edit' : 'view')+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode)
'&type=' + (this.tab == 1 ? 'edit' : 'view') + '&sectionName=' + row.sectionName +
'&sectionCode=' + row.sectionCode)
// this.$.open('/pages/map/index?businessId=' + row.businessId)
}
} else {
// this.$.open('/pages/investigation/complete?id=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' :
// 'view'))
this.$.open("/pages/investigation/complete" + "?id=" + row.businessId+ '&sectionId=' + row.sectionCode +
'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
'&pcType' + row.pcType+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode);
this.$.open("/pages/investigation/complete" + "?id=" + row.businessId + '&sectionId=' + row
.sectionCode +
'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode);
}
},
@ -362,6 +384,33 @@
}
}
.query-form2 {
height: 146px;
.type-box {
display: flex;
align-items: center;
justify-content: space-between;
width: calc(100% - 100rpx);
padding: 0 50rpx;
height: 108rpx;
.type-item{
width: 28%;
border-radius: 200rpx;
height: 50rpx;
text-align: center;
line-height: 50rpx;
font-size: 26rpx;
border: #999999 solid 1rpx;
margin-top: 15rpx;
}
.type-active{
border: #3c6dc3 solid 1rpx;
color:#3c6dc3;
}
}
}
.Box {
padding-top: var(--status-bar-height);

47
pages/investigation/task.vue
Unescape View File

@ -65,13 +65,13 @@
<view class="label-box">
<view class="border"></view> {{sectionName}}
</view>
<uni-forms-item label="道路类型" name="roadType" required label-width="80">
<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
<!-- <input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
v-model="formData.roadType" placeholder="请输入道路类型" @focus="focus" /> -->
<view class="Height100" :class="formData.roadType?'':'gary'" v-if="isEdit"
@click="showdlPicker=true">{{ formData.roadType?formData.roadType:'请选择道路类型' }} </view>
<view class="Height100" :class="formData.roadType?'':'gary'" v-if="isEdit"
@click="showdlPicker=true">{{ formData.roadType?formData.roadType:'请选择道路类型' }} </view>
<view class="Height100" v-else>{{ formData.roadType }}</view>
<view class="Height100"></view>
</view>
@ -143,7 +143,8 @@
@confirm="pickerxqConfirm"></u-picker>
<u-picker :show="showjdPicker" :columns="columnsjdPicker" keyName="label" @cancel="pickerjdCancel"
@confirm="pickerjdConfirm"></u-picker>
<u-picker :show="showtimePicker" :columns="columnstimePicker" keyName="label" @cancel="pickertimeCancel"
@confirm="pickertimeConfirm"></u-picker>
<!-- <view class="echarts" v-if="active === 2">
<qiun-data-charts type="area" :opts="opts" :chartData="chartData" />
</view> -->
@ -171,8 +172,12 @@
</uni-forms-item>
<uni-forms-item label="高峰时段">
<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
v-model="formData.peakHours" placeholder="请输入高峰时段" @focus="focus2" />
<view v-if="isEditStep2" class="Height100" :class="formData.peakHours?'':'gary'"
@click="showtimePicker=true">
{{ formData.peakHours?formData.peakHours:'请选择高峰时段' }}
</view>
<!-- <input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
v-model="formData.peakHours" placeholder="请输入高峰时段" @focus="focus2" /> -->
<view class="Height100" v-else>{{ formData.peakHours }}</view>
<view class="Height100"></view>
</view>
@ -546,6 +551,16 @@
value: ""
},
],
columnstimePicker: [
['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时',
'15时', '16时', '17时',
'18时', '19时', '20时', '21时', '22时', '23时', '24'
],
['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时',
'15时', '16时', '17时',
'18时', '19时', '20时', '21时', '22时', '23时', '24时'
],
],
investigationDetailTitle: "title",
isEdit: false,
isEditStep2: false,
@ -732,7 +747,7 @@
series: []
},
chartData4: {
categories:["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22", "24"],
categories: ["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22", "24"],
series: [{
name: "总量",
legendShape: "line",
@ -797,6 +812,7 @@
],
showdlPicker: false,
showtimePicker: false,
columnsdlPicker: [
],
@ -957,13 +973,20 @@
// this.$set(this.formData, 'xqname', e.value[0].xqname)
},
pickerdlConfirm(e){
pickerdlConfirm(e) {
this.showdlPicker = false
this.$set(this.formData, 'roadType', e.value[0].label)
},
pickerdlCancel(e) {
this.showdlPicker = false
},
pickertimeConfirm(e) {
this.showtimePicker = false
this.$set(this.formData, 'peakHours', e.value[0] + ' - ' + e.value[1])
},
pickertimeCancel(e) {
this.showtimePicker = false
},
openPicker() {
this.showPicker = true
@ -1571,10 +1594,10 @@
let res = {
categories: ["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22", "24"],
series: [{
name: "总量",
legendShape: "line",
data: [],
}],
name: "总量",
legendShape: "line",
data: [],
}],
};
this.chartData2 = JSON.parse(JSON.stringify(res));
},

3
pages/knowledge/index.vue
Unescape View File

@ -218,6 +218,8 @@
},
// 更新列表信息
changeMsgList(answerId, data) {
data = data.replace("undefined", '')
data = data.replace("null", '')
let id = 1;
if (this.msgList.length > 0) {
id = this.msgList[this.msgList.length - 1].id + 1;
@ -273,6 +275,7 @@
this.scrollTop = this.scrollTop + 100;
});
}
},
handlePlus() {
this.isExpanded = !this.isExpanded;

Write Preview
Loading…
Cancel
Save