From 4c236ba83da7c69ac838b004d0a4b83c25fc9bea Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 16:41:02 +0800
Subject: [PATCH] mrshi
---
company/src/components/enterprise/additionSubtractionApplication.vue | 2
company/src/components/enterprise/factoryChange.vue | 5
company/src/api/business/notices.js | 10 +
company/src/components/business/OperaApplyChangeDetailWindow.vue | 4
company/src/components/business/OperaInsuranceApplyWindow.vue | 2
company/src/components/enterprise/reinsurance.vue | 149 ++++++++++++++++++++----
company/src/views/enterprise/myPolicy.vue | 55 +++++++++
company/src/components/enterprise/renewalInsurance.vue | 73 ++++++++++++
company/src/components/enterprise/directInsuranceDetails.vue | 16 +-
9 files changed, 275 insertions(+), 41 deletions(-)
diff --git a/company/src/api/business/notices.js b/company/src/api/business/notices.js
index 5d8928d..f2f2756 100644
--- a/company/src/api/business/notices.js
+++ b/company/src/api/business/notices.js
@@ -6,3 +6,13 @@
trim: true
})
}
+
+// 鏌ヨ鎶曚繚鍗曟彁閱掓暟閲�
+export function getCaptcha () {
+ return request.get('/business/notices/getApplyNotice')
+}
+
+// 鎶曚繚鍗曞叧闂彁閱�
+export function closeApplyNotice (type) {
+ return request.get(`/business/notices/closeApplyNotice?type=${type}`)
+}
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index fd3d992..47b2647 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -11,8 +11,8 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
- <span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
- <span v-if="model.status === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
+ <span v-if="model.status === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
+ <span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
<span v-if="model.status === 2">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
<span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >閫�鍥炵敵璇�</span></span>
<span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸查��鍥�</span></span>
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index fb97b81..6f49c15 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -371,7 +371,7 @@
<div style="display: flex; flex-direction: column;">
<span style="font-size: 16px; font-weight: 400; color: black;">
{{activity.title}}
- <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9].includes(activity.objType)">
+ <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9, 11, 22].includes(activity.objType)">
{{activity.content}}
</span>
</span>
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 466ab59..c807afd 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -496,7 +496,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.item.newVersionSolutionId })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
diff --git a/company/src/components/enterprise/directInsuranceDetails.vue b/company/src/components/enterprise/directInsuranceDetails.vue
index d6ac55c..8fe59ca 100644
--- a/company/src/components/enterprise/directInsuranceDetails.vue
+++ b/company/src/components/enterprise/directInsuranceDetails.vue
@@ -103,17 +103,17 @@
</el-table-column>
<el-table-column
align="center"
- prop="solutionsName"
+ prop="solutionName"
label="淇濋櫓鏂规">
</el-table-column>
<el-table-column
align="center"
- prop="downCode"
+ prop="taxDoneCode"
label="鍙戠エ鍙�">
</el-table-column>
<el-table-column
align="center"
- prop="createTime"
+ prop="createDate"
label="鐢宠寮�绁ㄦ椂闂�">
</el-table-column>
<el-table-column
@@ -202,7 +202,7 @@
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鍚堣'
- } else if (index == 4) {
+ } else if (index == 3) {
let price = 0
data.forEach(item => {
price += item.totalFee
@@ -218,7 +218,7 @@
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鍚堣'
- } else if (index == 5) {
+ } else if (index == 4) {
let price = 0
data.forEach(item => {
price += item.totalFee
@@ -237,6 +237,9 @@
cursor: pointer;
text-align: center;
&:nth-child(5) {
+ color:rgba(249, 86, 1, 0.996078431372549);
+ }
+ &:nth-child(4) {
color:rgba(249, 86, 1, 0.996078431372549);
}
}
@@ -260,7 +263,8 @@
.info_list {
width: 100%;
display: flex;
- align-items: left;
+ /*align-items: left;*/
+ align-items: flex-start;
flex-wrap: wrap;
.list::v-deep {
width: 100%;
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index f2e2196..31c896f 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -181,6 +181,7 @@
applyEndTime: '',
factory: []
},
+ newVersionSolutionId: '',
pickerOptions: {},
price: '',
endTime: '', // 瀹為檯淇濋櫓鐢熸晥姝㈡湡
@@ -253,9 +254,11 @@
})
getDetail(this.form.id)
.then(res => {
+ console.log(res)
this.list.push(res)
this.endTime = res.endTime
this.form.solutionId = res.solutionId
+ this.newVersionSolutionId = res.newVersionSolutionId
this.form.solutionsName = res.solutionsName
this.pickerOptions = {
disabledDate(time) {
@@ -381,7 +384,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
diff --git a/company/src/components/enterprise/reinsurance.vue b/company/src/components/enterprise/reinsurance.vue
index f7e1068..3faec31 100644
--- a/company/src/components/enterprise/reinsurance.vue
+++ b/company/src/components/enterprise/reinsurance.vue
@@ -15,13 +15,13 @@
<el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="applyStartTime">
<div style="display: flex; flex-direction: column;">
<el-date-picker
- @change="changeApplyStartTime"
- v-model="form.applyStartTime"
- type="date"
- :picker-options="pickerOptions"
- value-format="yyyy-MM-dd"
- format="yyyy 骞� MM 鏈� dd 鏃�"
- placeholder="閫夋嫨鏃ユ湡">
+ @change="changeApplyStartTime"
+ v-model="form.applyStartTime"
+ type="date"
+ :picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
<span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
@@ -105,13 +105,14 @@
</div>
</div>
<el-table
- :data="activeName === '0' ? form.addDetailList : form.delDetailList"
- border
- show-summary
- :summary-method="getSummaries"
- ref="multipleTable"
- @selection-change="handleSelectionChange"
- style="width: 100%;margin-bottom: 15px;">
+ v-if="activeName === '0'"
+ :data="form.addDetailList"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ ref="multipleTable"
+ @selection-change="handleSelectionChange"
+ style="width: 100%;margin-bottom: 15px;">
<el-table-column
type="selection"
width="55">
@@ -122,14 +123,17 @@
</template>
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="memberName"
label="濮撳悕">
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="idCard"
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ :key="Math.random()"
label="骞撮緞">
<template slot-scope="{row}">
<template v-if="item">
@@ -139,21 +143,83 @@
</template>
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="duName"
label="娲鹃仯鍗曚綅">
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="workTypeName"
label="鎵�灞炲伐绉�">
</el-table-column>
<el-table-column
+ :key="Math.random()"
+ prop="fee"
label="璐圭敤">
- <template slot-scope="{row}">
- <span v-if="activeName === '0'">{{row.fee}}</span>
- <span v-else>-{{row.fee}}</span>
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-table
+ v-if="activeName === '1'"
+ :data="form.delDetailList"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ ref="multipleTable"
+ @selection-change="handleSelectionChange"
+ style="width: 100%;margin-bottom: 15px;">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column label="搴忓彿" width="80px">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column
+ :key="Math.random()"
+ prop="memberName"
+ label="濮撳悕">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="idCard"
+ label="韬唤璇佸彿">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ label="骞撮緞">
+ <template slot-scope="{row}">
+ <template v-if="item">
+ <span style="color: red;" v-if="(getAgeByIdCard(row.idCard) < item.minAge) || (getAgeByIdCard(row.idCard) > item.maxAge)">{{getAgeByIdCard(row.idCard)}}</span>
+ <span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
+ </template>
+ </template>
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="duName"
+ label="娲鹃仯鍗曚綅">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="workTypeName"
+ label="鎵�灞炲伐绉�">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="fee"
+ label="璐圭敤">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
label="鎿嶄綔">
<template slot-scope="scope">
<el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
@@ -185,6 +251,7 @@
import confirmJobType from '@/components/enterprise/confirmJobType'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
+ import { getDate, compareDates, getTomorrow } from '@/utils/util'
import { update, getChangeCountCyclePriceVO, applyChagneDetailList } from '@/api/business/applyChange'
export default {
name: 'reinsurance',
@@ -202,6 +269,7 @@
addDetailList: [],
delDetailList: [],
},
+ newVersionSolutionId: '',
activeName: '0',
pickerOptions: {},
price: '',
@@ -263,7 +331,7 @@
item.fee = res.cyclePrice
})
this.form.delDetailList.forEach(item => {
- item.fee = res.cyclePrice
+ item.fee = -res.cyclePrice
})
})
},
@@ -273,7 +341,7 @@
// 鑾峰彇鎶曚繚璇︽儏
getDetails() {
applyChagneDetailList({
- applyChangId: this.form.applyChangId,
+ applyChangeId: this.form.applyChangId,
types: [0]
}).then(res => {
res.forEach(item => {
@@ -287,32 +355,51 @@
this.form.addDetailList = res
})
applyChagneDetailList({
- applyChangId: this.form.applyChangId,
+ applyChangeId: this.form.applyChangId,
types: [1]
}).then(res => {
res.forEach(item => {
- item.fee = ''
+ // item.fee = ''
item.idCard = item.memberIdcardNo
- item.workTypeName = ''
- item.worktypeId = ''
- item.duName = ''
- item.duId = ''
+ // item.workTypeName = ''
+ // item.worktypeId = ''
+ // item.duName = ''
+ // item.duId = ''
})
this.form.delDetailList = res
})
getDetail(this.form.id)
.then(res => {
+ console.log(res)
this.list.push(res)
+ this.item = res
this.endTime = res.endTime
this.form.solutionId = res.solutionId
+ this.newVersionSolutionId = res.newVersionSolutionId
this.form.solutionsName = res.solutionsName
this.pickerOptions = {
disabledDate(time) {
+ // 褰撳墠鏃ユ湡澶т簬绛変簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ if ([1,3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃ユ湡灏忎簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
+ // 鏈�鍚庝竴娆℃搷浣滄椂闂存湁鍊�
+ } else if (res.lastChangeDate) {
+ // 褰撳墠鏃ユ湡澶т簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ if ([1,3].includes(compareDates(getDate(), res.lastChangeDate))) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃堕棿灏忎簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
+ }
+ }
// - 8.64e7
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
+ // return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
}
};
- this.changeSolution1(res.solutionId)
+ // this.changeSolution1(res.solutionId)
})
},
getSummaries(param) {
@@ -334,7 +421,11 @@
this.form.delDetailList.forEach(item => {
total += item.fee
})
- sums[index] = '-' + total
+ // if (total < 0) {
+ sums[index] = total
+ // } else {
+ // sums[index] = '-' + total
+ // }
return
}
sums[index] = ''
@@ -500,7 +591,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
diff --git a/company/src/components/enterprise/renewalInsurance.vue b/company/src/components/enterprise/renewalInsurance.vue
new file mode 100644
index 0000000..7021e02
--- /dev/null
+++ b/company/src/components/enterprise/renewalInsurance.vue
@@ -0,0 +1,73 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="100%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-table
+ :data="tableData"
+ border
+ style="width: 100%">
+ <el-table-column label="搴忓彿" width="80px">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="statusInfo" label="鐘舵��">
+ <template slot-scope="{row}">
+ <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="solutionsName" label="淇濋櫓鏂规"></el-table-column>
+ <el-table-column label="淇濆崟鍙�">
+ <template slot-scope="{row}">
+ <span>{{row.code ? row.code : '-'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
+ <el-table-column prop="serviceDays" label="鎶曚繚鏃堕暱锛堝ぉ锛�"></el-table-column>
+ <el-table-column prop="currentFee" label="浜х敓璐圭敤"></el-table-column>
+ <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
+ <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
+ <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
+ <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
+ <el-table-column
+ prop="address"
+ label="鎿嶄綔">
+ </el-table-column>
+ </el-table>
+ </GlobalWindow>
+</template>
+
+<script>
+ import BaseOpera from '@/components/base/BaseOpera'
+ import GlobalWindow from '@/components/common/GlobalWindow'
+ export default {
+ name: 'renewalInsurance',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ form: {
+ id: null
+ },
+ tableData: []
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 4b875c3..87c499e 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -56,6 +56,18 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <div style="margin-bottom: 30px;" v-if="obj.waitSignNum > 0 && obj.renewalNum > 0">
+ <el-alert type="warning" show-icon :closable="false" style="margin-bottom: 15px;" v-if="obj.renewalNum > 0">
+ <span style="margin-right: 15px;">缁繚鎻愰啋: 鎮ㄦ湁鍗冲皢鍒版湡淇濋櫓</span>
+ <el-button type="text" @click="$refs.renewalInsurance.open('缁繚鎻愰啋')">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="closeRemind(1)">鍏抽棴鎻愰啋</el-button>
+ </el-alert>
+ <el-alert type="warning" :closable="false" show-icon v-if="obj.waitSignNum > 0">
+ <span style="margin-right: 15px;">鎶曚繚鎻愰啋: 鎮ㄦ湁鎶曚繚鐢宠寰呯缃�</span>
+ <el-button type="text" @click="see">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="closeRemind(2)">鍏抽棴鎻愰啋</el-button>
+ </el-alert>
+ </div>
<ul class="toolbar" v-permissions="['business:dispatchunit:create']">
<li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠')">鎶曚繚鐢宠</el-button></li>
</ul>
@@ -114,6 +126,8 @@
<OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="handlePageChange" />
+ <!-- 缁繚寮圭獥 -->
+ <renewalInsurance ref="renewalInsurance" @success="handlePageChange" />
</TableLayout>
</template>
@@ -124,12 +138,21 @@
import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
+ import renewalInsurance from '@/components/enterprise/renewalInsurance'
import { all as solutionAll} from '@/api/business/solutions'
+ import { getCaptcha, closeApplyNotice } from '@/api/business/notices'
export default {
name: 'myPolicy',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaInsuranceApplyWindow, OperaInsuranceApplyDetails, additionSubtractionApplication },
+ components: {
+ TableLayout,
+ Pagination,
+ OperaInsuranceApplyWindow,
+ OperaInsuranceApplyDetails,
+ renewalInsurance,
+ additionSubtractionApplication
+ },
data () {
return {
// 鎼滅储
@@ -141,6 +164,10 @@
startTimeS: '',
baseSolutionId: '',
statusCollect: '2'
+ },
+ obj: {
+ renewalNum: 0,
+ waitSignNum: 0
},
time1: [],
time2: [],
@@ -156,8 +183,34 @@
})
this.search()
this.loadSelectList()
+ this.getNum()
},
methods:{
+ see() {
+ this.searchForm.statusCollect = '7'
+ this.search()
+ },
+ closeRemind(type) {
+ this.$confirm('纭畾鍏抽棴姝ゆ彁绀哄悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ closeApplyNotice(type)
+ .then(res => {
+ this.getNum()
+ })
+ }).catch(() => {
+
+ });
+ },
+ getNum() {
+ getCaptcha()
+ .then(res => {
+ this.obj.renewalNum = res.renewalNum
+ this.obj.waitSignNum = res.waitSignNum
+ })
+ },
reset() {
this.time1 = []
this.time2 = []
--
Gitblit v1.9.3