jingbowen
/
Jinan_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://121.36.37.70:3000/jingbowen/Jinan_app

master
邵佳豪 2 years ago
parent
4ccf06cdf3 53b7561d19
commit
ab8c49d794
5 changed files with 139 additions and 257 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. 163
      pages/rescue/index.vue
  2. 24
      pages/rescue/task_implement/details.vue
  3. 78
      pages/rescue/taskapply.vue
  4. 76
      pages/rescue/taskreceive.vue
  5. 13
      pages/tabbar/three.vue

163
pages/rescue/index.vue
Unescape View File

@ -37,7 +37,8 @@
<view class="left">
<img src="@/static/4412.png" alt="">
<view class="" style="display: flex; font-weight: 600;">
<view class="top_name">{{item.name}}</view><view style="flex: 1;">任务总数: {{nub}}/{{week}}</view>
<view class="top_name">{{item.name}}</view>
<view style="flex: 1;">任务总数: {{nub}}/{{week}}</view>
</view>
</view>
<view class="right">
@ -113,16 +114,14 @@
{{item.approvalStatus}}
</view>
</view>
<view style="display: flex;">
<view style="flex:1">
<view style="width: 60%;">
<view class="staffbox">
<view class="staff">
<view class="staff2">
<view>协助人员:</view>
<view v-for="(i,k) in item.supervisors" :key="k"
style="display: flex;justify-content: center;align-items: center;">
<img v-if="i.posts && i.posts[0] == '主查人员'" src="../../static/447.png" alt="">
<img v-if="i.posts && i.posts[0] == '协查人员'" src="../../static/446.png" alt="">
{{i.name}}
<view class="staff_namebox">
<text v-for="(i,k) in item.supervisors" :key="k">{{i.name}}</text>
</view>
</view>
@ -141,7 +140,8 @@
<view v-else class="staff">
<view>预定时间:</view>
<picker :value="tasktiem" mode="date" @change="scheduledTime($event,item)">
<text :class="tasktiem=='检查时间'?'tiem':''" style="margin-right: 12rpx;">{{tasktiem}}</text>
<text :class="tasktiem=='检查时间'?'tiem':''"
style="margin-right: 12rpx;">{{tasktiem}}</text>
</picker>
<image v-if="tasktiem=='检查时间'" src="../../static/down.png" mode=""></image>
</view>
@ -286,79 +286,17 @@
this.today.year = date.getFullYear()
this.dates.day = date.getDate()
let a = this.month % 2
let b = 0
if (this.dates.year % 4 == 0 && year % 100 != 0 || this.dates.year % 400 == 0) {
b = 1
}
if (this.month < 8 && this.month != 2 && a == 0) {
for (let i = 0; i < 30; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month < 8 && this.month != 2 && a != 0) {
for (let i = 0; i < 31; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month >= 8 && a == 0) {
for (let i = 0; i < 31; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month >= 8 && a != 0) {
for (let i = 0; i < 30; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month == 2 && !b) {
for (let i = 0; i < 28; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else {
for (let i = 0; i < 29; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
}
this.getOrganizations()
},
onReady() {
this.getTargetCount()
this.getOrganizations()
},
methods: {
getTargetCount(){
let selectedTime = this.dates.year + '-' + this.dates.month + '-' + '01'
this.$request.get('/api/TaskTargets/GetTargetCount/'+selectedTime,null,(data,res)=>{
console.log(res);
this.week=res
})
},
getOrganizations() {
const that = this
let selectedTime = this.dates.year + '-' + this.dates.month + '-' + '01'
@ -512,12 +450,12 @@
},
start(item) {
if (!item.checkTime) {
return 请选择检查时间
return this.$alert.showError("请填写检查时间")
}
console.log(item);
// return
uni.navigateTo({
url: '/pages/rescue/task_implement/details?id=' + item.company.id + '&uid=' + item.id,
url: '/pages/rescue/task_implement/details?id=' + item.company.id + '&user=' + item.id,
})
}
}
@ -729,6 +667,7 @@
margin-top: 20rpx;
height: 60rpx;
display: flex;
.top_name {
width: 180rpx;
white-space: nowrap;
@ -740,6 +679,7 @@
text-overflow: ellipsis;
/*文字超出部分以省略号显示*/
}
.left {
display: flex;
flex: 1;
@ -944,26 +884,66 @@
}
.staffbox {
display: flex;
margin: 6rpx 0;
font-size: 30rpx;
white-space: nowrap;
/*内容超宽后禁止换行显示*/
overflow: hidden;
/*超出部分隐藏*/
text-overflow: ellipsis;
.staff {
display: flex;
color: rgba(16, 15, 25, 0.48);
image {
margin-top: 8rpx;
width: 26rpx;
height: 26rpx;
.zhu {
color: #100F19;
}
view {
margin-right: 20rpx;
}
.tiem {
color: #317AFF;
img {
width: 40rpx;
height: 40rpx;
min-width: 40rpx;
min-height: 40rpx;
}
}
.staff2 {
display: flex;
color: rgba(16, 15, 25, 0.48);
// width: 70%;
white-space: nowrap;
/*内容超宽后禁止换行显示*/
overflow: hidden;
/*超出部分隐藏*/
text-overflow: ellipsis;
.staff_namebox {
white-space: nowrap;
/*内容超宽后禁止换行显示*/
overflow: hidden;
/*超出部分隐藏*/
text-overflow: ellipsis;
}
.zhu {
color: #100109;
color: #100F19;
}
view {
margin-right: 20rpx;
}
@ -985,17 +965,18 @@
}
.implement {
text-align: right;
margin-bottom: 10rpx;
width: 100%;
.buttons {
margin-top: 20rpx;
margin-top: 10rpx;
width: 100%;
height: 100%;
padding-top: 20rpx;
}
img {
// float: right;
width: 100rpx;
height: 100rpx;
}

24
pages/rescue/task_implement/details.vue
Unescape View File

@ -192,7 +192,8 @@
onLoad(e) {
console.log(e);
this.id=e.id
this.uid=e.uid
this.uid=e.user
this.getCompanies()
},
onReady() {
@ -212,14 +213,18 @@
}
})
},
bbb(){
let params={
approvalStatus:'已检查',
inspectionResult:'未发现违法违规情况'
}
this.$request.patch('/api/PlanTasks/' + this.uid, params, (data, res) => {
console.log(res);
})
// let params={
// approvalStatus:'已检查',
// inspectionResult:'未发现违法违规情况'
// }
// this.$request.patch('/api/PlanTasks/' + this.uid, params, (data, res) => {
// console.log(res);
// })
// uni.redirectTo({
// url:"/pages/rescue/task_implement/implement?id="+
// })
},
danweif(e){
console.log(e);
@ -233,7 +238,10 @@
<style lang="scss">
.button{
margin: 0 auto;
margin-top: 40rpx;
width: 100%;
button {
width: 200rpx;
// height: 140rpx;

78
pages/rescue/taskapply.vue
Unescape View File

@ -280,7 +280,7 @@
months: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
}
},
mounted() {
created() {
let date = new Date()
this.dates.month = date.getMonth() + 1
@ -289,80 +289,22 @@
this.dates.year = date.getFullYear()
this.today.year = date.getFullYear()
this.dates.day = date.getDate()
let a = this.month % 2
let b = 0
if (this.dates.year % 4 == 0 && year % 100 != 0 || this.dates.year % 400 == 0) {
b = 1
}
if (this.month < 8 && this.month != 2 && a == 0) {
for (let i = 0; i < 30; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month < 8 && this.month != 2 && a != 0) {
for (let i = 0; i < 31; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month >= 8 && a == 0) {
for (let i = 0; i < 31; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month >= 8 && a != 0) {
for (let i = 0; i < 30; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month == 2 && !b) {
for (let i = 0; i < 28; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else {
for (let i = 0; i < 29; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
}
this.getTargetCount()
this.getOrganizations()
},
onReady() {
this.getOrganizations()
},
methods: {
getTargetCount(){
let selectedTime = this.dates.year + '-' + this.dates.month + '-' + '01'
this.$request.get('/api/TaskTargets/GetTargetCount/'+selectedTime,null,(data,res)=>{
console.log(res);
this.week=res
})
},
getOrganizations() {
const that = this
let selectedTime = this.dates.year + '-' + this.dates.month + '-' + '01'

76
pages/rescue/taskreceive.vue
Unescape View File

@ -282,7 +282,7 @@
months: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
}
},
mounted() {
created() {
let date = new Date()
this.dates.month = date.getMonth() + 1
this.today.month = date.getMonth() + 1
@ -290,72 +290,7 @@
this.dates.year = date.getFullYear()
this.today.year = date.getFullYear()
this.dates.day = date.getDate()
let a = this.month % 2
let b = 0
if (this.dates.year % 4 == 0 && year % 100 != 0 || this.dates.year % 400 == 0) {
b = 1
}
if (this.month < 8 && this.month != 2 && a == 0) {
for (let i = 0; i < 30; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month < 8 && this.month != 2 && a != 0) {
for (let i = 0; i < 31; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month >= 8 && a == 0) {
for (let i = 0; i < 31; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month >= 8 && a != 0) {
for (let i = 0; i < 30; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else if (this.month == 2 && !b) {
for (let i = 0; i < 28; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
} else {
for (let i = 0; i < 29; i++) {
var dt2 = new Date(Date.parse(JSON.stringify(this.dates.month) + " " + "1 " + JSON.stringify(this.dates
.year)) + i * 24 * 3600 * 1000);
var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
var week = weekDay[dt2.getDay()]
if (week == "周二" || week == "周四") {
this.week++
}
}
}
this.getTargetCount()
this.getOrganizations()
this.OrganizationId = uni.getStorageSync("user").organizationId
this.userId = uni.getStorageSync("user").id
@ -366,6 +301,13 @@
},
methods: {
getTargetCount(){
let selectedTime = this.dates.year + '-' + this.dates.month + '-' + '01'
this.$request.get('/api/TaskTargets/GetTargetCount/'+selectedTime,null,(data,res)=>{
console.log(res);
this.week=res
})
},
getOrganizations() {
const that = this
let selectedTime = this.dates.year + '-' + this.dates.month + '-' + '01'

13
pages/tabbar/three.vue
Unescape View File

@ -1,7 +1,16 @@
<template>
<view class="">
<view class="">
<Dtask v-if="shenfen=='battalion'&&!isSupervisor"></Dtask>
<Ztask v-else-if="shenfen=='brigade'"></Ztask>
<Jtask v-else></Jtask>
</view>
<view class="">
<Ztask v-if="shenfen=='brigade'"></Ztask>
</view>
<view class="">
<Jtask v-if="shenfen=='squadron'||isSupervisor"></Jtask>
</view>
</view>
</template>

Write Preview
Loading…
Cancel
Save