diff --git a/src/pages/business/business.vue b/src/pages/business/business.vue
index 9a38cf6..0461a9e 100644
--- a/src/pages/business/business.vue
+++ b/src/pages/business/business.vue
@@ -166,7 +166,7 @@ const downCallback = async (mescroll) => {
setTimeout(async ()=>{
// getTaskCount();
getList();
- mescroll.resetUpScroll();
+ // mescroll.resetUpScroll();
},500);
} catch (error) {
mescroll.endErr();
diff --git a/src/pages/business/polling/index.vue b/src/pages/business/polling/index.vue
index 6dd0c88..2820070 100644
--- a/src/pages/business/polling/index.vue
+++ b/src/pages/business/polling/index.vue
@@ -31,8 +31,8 @@
- ![]()
- ![]()
+ ![]()
+ ![]()
![]()
![]()
@@ -43,7 +43,23 @@
- 开始时间{{ parseTime(item.planTime,'{h}:{i}') }}
+
+ 执行时间{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+ 开始时间{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+
+
+
+
+ 任务状态
+ 执行中
+ 待执行
+
+ {{formatTaskStatus(item.taskStatus) }}
+
任务时长{{ item.workHour }}小时
@@ -52,17 +68,8 @@
完成进度{{item.groupFinishNum}}/{{item.groupNum}}
- 完成比率{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}
-
-
-
-
- 任务状态
-
- 待执行
- 执行中
-
- {{formatTaskStatus(item.taskStatus) }}
+
+ 完成比率{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}
@@ -93,8 +100,26 @@
- 开始时间{{ parseTime(item.planTime,'{h}:{i}') }}
- 任务时长{{ item.workHour }}小时
+
+ 执行时间{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+ 开始时间{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+
+
+
+
+ 任务状态
+ 执行中
+ 待执行
+
+ {{formatTaskStatus(item.taskStatus) }}
+
+
+ 任务时长{{ item.workHour }}小时
+
@@ -102,17 +127,8 @@
完成进度{{item.groupFinishNum}}/{{item.groupNum}}
- 完成比率{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}
-
-
-
-
- 任务状态
-
- 待执行
- 执行中
-
- {{formatTaskStatus(item.taskStatus) }}
+
+ 完成比率{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}
@@ -138,7 +154,7 @@
跟踪次数{{ item.logNum }}
- 最近跟踪时间{{ parseTime(item.lastLogTime,'{m}-{d} {h}:{i}') }}
+ 最近跟踪时间{{ parseTime(item.lastLogTime,'{y}-{m}-{d} {h}:{i}') }}
@@ -201,7 +217,7 @@ const mescrollInit = (mescroll) => {
// 下拉刷新
const downCallback = async (mescroll) => {
try {
- console.log("下拉刷新")
+ // console.log("下拉刷新")
const res = await getList(1, upOption.value.page.size);
cssFlag.value = false;
list1.value = res.list1 || [];
@@ -337,6 +353,7 @@ const handleJump = (item)=>{
}
.report-list .r-list .r-left{
display: flex;
+ align-items: center;
}
.report-list .r-list .r-gray{
margin-left:10rpx;
@@ -352,7 +369,7 @@ const handleJump = (item)=>{
width:525rpx
}
.r-left .r-l-left{
- width:280rpx;
+ width:345rpx;
}
.r-left .r-l-right{
diff --git a/src/pages/business/polling/optionDetail.vue b/src/pages/business/polling/optionDetail.vue
index 2ae70ec..2b24685 100644
--- a/src/pages/business/polling/optionDetail.vue
+++ b/src/pages/business/polling/optionDetail.vue
@@ -56,7 +56,7 @@
-
+
{{String(index+1).padStart(2, '0')+'.'}}
@@ -141,7 +141,7 @@
{{ item.pointName }}
-
+
![]()
@@ -157,7 +157,7 @@
{{ item.pointName }}
-
+
@@ -166,6 +166,12 @@
+
+
+ {{String(index+1).padStart(2, '0')+'.'}}
+ {{ item.pointName }}
+
+
@@ -293,27 +299,28 @@ const getList = async() => {
let res = await taskGroupDetail(param);
let data = res||{};
data.pointList.forEach(item=>{
+ item['imgArr']=[];
+ item['imgArr2']=[];
+ item['videoArr']=[];
+ item['videoArr2']=[];
+ item['chooseList']=[];
if(item.resultContent){
if(item.pointType==2 ||item.pointType==1){
item['chooseList'] = item.resultContent.split(",") //JSON.parse(item.resultContent)
}else if(item.pointType==7){
- imgArr.value=[];
- imgArr2.value=[];
let imgList = item.resultContent?.split(",")||[];
imgList.forEach(imgUrl=>{
- imgArr.value.push(imgUrl);
- imgArr2.value.push({
+ item.imgArr.push(imgUrl);
+ item.imgArr2.push({
shortUrl:minioObj.minioThumbUrl +"/"+imgUrl,
url:minioObj.minioUrl +"/"+imgUrl,
})
})
}else if(item.pointType==8){
- videoArr.value=[];
- videoArr2.value=[]
let videoList = item.resultContent?.split(",")||[];
videoList.forEach(videoUrl=>{
- videoArr.value.push(videoUrl);
- videoArr2.value.push({
+ item.videoArr.push(videoUrl);
+ item.videoArr2.push({
shortUrl:minioObj.minioThumbUrl +"/"+videoUrl,
url:minioObj.minioUrl +"/"+videoUrl,
})
@@ -356,10 +363,10 @@ const changeCheck = (param,param2,item) => {
}
// 照片及拍照处理
-const imgArr = ref([]);
-const imgArr2=ref([]);
+// const imgArr = ref([]);
+// const imgArr2=ref([]);
const chooseImage = (item) => {
- console.log("item=>",item)
+ // console.log("item=>",item)
try {
uni.chooseImage({
// count: 1, // 默认是9，这里设置为1次只选1张
@@ -392,12 +399,12 @@ const chooseImage = (item) => {
let data = res.data;
// console.log("444图片上传成功=>",data)
// imgArr2.value.push(data.fileUrl)
- imgArr2.value.push({
+ item['imgArr2'].push({
shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
url:minioObj.minioUrl +"/"+data.fileName,
})
- imgArr.value.push(data.fileName)//传给后台的路径
- item.resultContent = imgArr.value.join(",")
+ item['imgArr'].push(data.fileName)//传给后台的路径
+ item.resultContent = item['imgArr'].join(",")
})
})
@@ -412,9 +419,9 @@ const chooseImage = (item) => {
};
// 视频处理
-const videoSrc = ref('');
-const videoArr = ref([]);
-const videoArr2 = ref([]);
+// const videoSrc = ref('');
+// const videoArr = ref([]);
+// const videoArr2 = ref([]);
const chooseVideo = (item) => {
uni.chooseVideo({
sourceType: ['album', 'camera'], // 来源：相册和相机
@@ -438,9 +445,9 @@ const chooseVideo = (item) => {
}
minioUpload(param).then(uploadRes=>{
let data = uploadRes.data;
- videoArr.value.push(data.fileName)//传给后台的路径
- videoArr2.value.push(data.fileUrl)
- item.resultContent = videoArr.value.join(",")
+ item['videoArr'].push(data.fileName)//传给后台的路径
+ item['videoArr2'].push(data.fileUrl)
+ item.resultContent = item['videoArr'].join(",")
}).finally(()=>{
})
diff --git a/src/pages/business/polling/problemList.vue b/src/pages/business/polling/problemList.vue
index 2fe4d3b..808ce54 100644
--- a/src/pages/business/polling/problemList.vue
+++ b/src/pages/business/polling/problemList.vue
@@ -46,7 +46,7 @@
跟踪次数{{ item.logNum }}
- 最近跟踪时间{{parseTime(item.lastLogTime,'{m}-{d} {h}:{i}') }}
+ 最近跟踪时间{{parseTime(item.lastLogTime,'{y}-{m}-{d} {h}:{i}') }}
@@ -152,7 +152,7 @@ const downCallback = async (mescroll) => {
const res = await getList(1, upOption.value.page.size);
cssFlag.value = false;
list.value = res.list;
- mescroll.resetUpScroll();
+ // mescroll.resetUpScroll();
} catch (error) {
mescroll.endErr();
} finally {
diff --git a/src/pages/business/polling/searchList.vue b/src/pages/business/polling/searchList.vue
index fb037c5..4664f72 100644
--- a/src/pages/business/polling/searchList.vue
+++ b/src/pages/business/polling/searchList.vue
@@ -79,8 +79,8 @@
- ![]()
- ![]()
+ ![]()
+ ![]()
![]()
![]()
@@ -91,8 +91,26 @@
- 开始时间{{ parseTime(item.planTime,'{h}:{i}') }}
- 任务时长{{ item.workHour }}小时
+
+ 执行时间{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+ 开始时间{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+
+
+
+
+ 任务状态
+ 执行中
+ 待执行
+
+ {{formatTaskStatus(item.taskStatus) }}
+
+
+ 任务时长{{ item.workHour }}小时
+
@@ -100,20 +118,12 @@
完成进度{{item.groupFinishNum}}/{{item.groupNum}}
- 完成比率{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}
-
-
-
-
- 任务状态
-
- 待执行
- 执行中
-
- {{formatTaskStatus(item.taskStatus) }}
+
+ 完成比率{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}
+
@@ -136,8 +146,8 @@
- ![]()
- ![]()
+ ![]()
+ ![]()
![]()
![]()
@@ -148,8 +158,26 @@
- 开始时间{{ parseTime(item.planTime,'{h}:{i}') }}
- 任务时长{{ item.workHour }}小时
+
+ 执行时间{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+ 开始时间{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+
+
+
+
+ 任务状态
+ 执行中
+ 待执行
+
+ {{formatTaskStatus(item.taskStatus) }}
+
+
+ 任务时长{{ item.workHour }}小时
+
@@ -157,17 +185,8 @@
完成进度{{item.groupFinishNum}}/{{item.groupNum}}
- 完成比率{{item.percentage}}
-
-
-
-
- 任务状态
-
- 待执行
- 执行中
-
- {{formatTaskStatus(item.taskStatus) }}
+
+ 完成比率{{item.percentage}}
@@ -200,7 +219,7 @@
跟踪次数{{ item.logNum }}
- 最近跟踪时间{{ parseTime(item.lastLogTime,'{m}-{d} {h}:{i}') }}
+ 最近跟踪时间{{ parseTime(item.lastLogTime,'{y}-{m}-{d} {h}:{i}') }}
@@ -337,12 +356,12 @@ const scrollToPosition = () => {
// 下拉刷新
const downCallback = async (mescroll) => {
try {
- console.log("下拉刷新")
+ // console.log("下拉刷新")
isMonth.value=true;
const res = await getList(1, upOption.value.page.size);
cssFlag.value = false;
list.value = res.list;
- mescroll.resetUpScroll();
+ // mescroll.resetUpScroll();
} catch (error) {
mescroll.endErr();
} finally {
@@ -354,7 +373,7 @@ const downCallback = async (mescroll) => {
// 上拉加载更多
const upCallback = async (mescroll) => {
try {
- console.log("上拉加载更多")
+ // console.log("上拉加载更多")
let res = await getList(mescroll.num, mescroll.size);
if (mescroll.num === 1) {
list.value = res.list;
@@ -633,6 +652,7 @@ const handleJump = (item)=>{
}
.report-list .r-list .r-left{
display: flex;
+ align-items:center;
}
.report-list .r-list .r-gray{
margin-left:10rpx;
diff --git a/src/pages/business/polling/taskDetail.vue b/src/pages/business/polling/taskDetail.vue
index f156cb6..22f6158 100644
--- a/src/pages/business/polling/taskDetail.vue
+++ b/src/pages/business/polling/taskDetail.vue
@@ -173,7 +173,7 @@ const downCallback = async (mescroll) => {
const res = await getList(1, upOption.value.page.size);
cssFlag.value = false;
taskObj.value = res;
- mescroll.resetUpScroll();
+ // mescroll.resetUpScroll();
} catch (error) {
mescroll.endErr();
} finally {
diff --git a/src/pages/business/polling/taskList.vue b/src/pages/business/polling/taskList.vue
index f9adc05..f7eaed4 100644
--- a/src/pages/business/polling/taskList.vue
+++ b/src/pages/business/polling/taskList.vue
@@ -37,8 +37,8 @@
- ![]()
- ![]()
+ ![]()
+ ![]()
![]()
![]()
@@ -52,8 +52,26 @@
- 开始时间{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}
- 任务时长{{ item.workHour }}小时
+
+ 执行时间{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+ 开始时间{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}
+
+
+
+
+
+
+ 任务状态
+ 执行中
+ 待执行
+
+ {{formatTaskStatus(item.taskStatus) }}
+
+
+ 任务时长{{ item.workHour }}小时
+
@@ -61,20 +79,12 @@
完成进度{{item.groupFinishNum}}/{{item.groupNum}}
- 完成比率{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}
-
-
-
-
- 任务状态
-
- 待执行
- 执行中
-
- {{formatTaskStatus(item.taskStatus) }}
+
+ 完成比率{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}
+
@@ -183,13 +193,12 @@ const mescrollInit = (mescroll) => {
// 下拉刷新
const downCallback = async (mescroll) => {
- console.log("mescroll=>",mescroll)
try {
console.log("下拉刷新");
const res = await getList(1, upOption.value.page.size,undefined);
cssFlag.value = false;
list.value = res.list;
- mescroll.resetUpScroll()
+ // mescroll.resetUpScroll()
} catch (error) {
mescroll.endErr();
} finally {
diff --git a/src/pages/notice/notice.vue b/src/pages/notice/notice.vue
index 7e4b582..cb769a2 100644
--- a/src/pages/notice/notice.vue
+++ b/src/pages/notice/notice.vue
@@ -162,7 +162,7 @@ const downCallback = async (mescroll) => {
const res = await getNoticeList(1, upOption.value.page.size);
cssFlag.value = false;
list.value = res.list;
- mescroll.resetUpScroll();
+ // mescroll.resetUpScroll();
} catch (error) {
mescroll.endErr();
} finally {
diff --git a/src/pages/notice/waitApprove.vue b/src/pages/notice/waitApprove.vue
index de0693f..0edd7c6 100644
--- a/src/pages/notice/waitApprove.vue
+++ b/src/pages/notice/waitApprove.vue
@@ -103,7 +103,7 @@ const downCallback = async (mescroll) => {
const res = await getFlowList(1, upOption.value.page.size);
cssFlag.value = false;
list.value = res.list;
- mescroll.resetUpScroll();
+ // mescroll.resetUpScroll();
} catch (error) {
mescroll.endErr();
} finally {