From 5aa74982251678279217fa67d5587a6a5150ec58 Mon Sep 17 00:00:00 2001
From: xuli <jswawa@qq.com>
Date: Fri, 16 Jan 2026 15:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=A2=9E=E5=8A=A0=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8A=E6=8A=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/chooseMedia.vue                |  20 +-
 src/pages.json                                |  24 +
 src/pages/business/polling/optionDetail.vue   |   4 +-
 .../business/polling/problemInitiative.vue    | 584 ++++++++++++++++++
 .../polling/problemInitiativeDetail.vue       | 402 ++++++++++++
 .../polling/problemInitiativeList.vue         | 328 ++++++++++
 .../business/polling/problemInitiativeLog.vue | 498 +++++++++++++++
 src/static/images/business/icon-xjwtsb.png    | Bin 0 -> 8500 bytes
 8 files changed, 1848 insertions(+), 12 deletions(-)
 create mode 100644 src/pages/business/polling/problemInitiative.vue
 create mode 100644 src/pages/business/polling/problemInitiativeDetail.vue
 create mode 100644 src/pages/business/polling/problemInitiativeList.vue
 create mode 100644 src/pages/business/polling/problemInitiativeLog.vue
 create mode 100644 src/static/images/business/icon-xjwtsb.png

diff --git a/src/components/chooseMedia.vue b/src/components/chooseMedia.vue
index 5ad7153..588bc12 100644
--- a/src/components/chooseMedia.vue
+++ b/src/components/chooseMedia.vue
@@ -5,15 +5,15 @@
         <view class="picker-item" @click="takePhoto">
             <text>拍照</text>
         </view>
-        <view class="picker-item" @click="choosePhoto">
+        <!-- <view class="picker-item" @click="choosePhoto">
             <text>选择照片</text>
-        </view>
+        </view> -->
         <view class="picker-item" @click="takeVideo">
             <text>拍摄视频</text>
         </view>
-        <view class="picker-item" @click="chooseVideoFromAlbum">
+        <!-- <view class="picker-item" @click="chooseVideoFromAlbum">
             <text>选择视频</text>
-        </view>
+        </view> -->
         <view class="picker-item" @click="closePicker">
             <text>取消</text>
         </view>
@@ -39,17 +39,17 @@ const takePhoto = () => {
     captureMedia("image", "camera");
 }
 
-const choosePhoto = () => {
-    captureMedia("image", "album");
-}
+// const choosePhoto = () => {
+//     captureMedia("image", "album");
+// }
 
 const takeVideo = () => {
     captureMedia("video", "camera");
 }
 
-const chooseVideoFromAlbum = () => {
-    captureMedia("video", "album");
-}
+// const chooseVideoFromAlbum = () => {
+//     captureMedia("video", "album");
+// }
 
 const captureMedia = async (type, source) => {
     showPicker.value = false;
diff --git a/src/pages.json b/src/pages.json
index a4b2f1a..704032b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -663,6 +663,30 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/business/polling/problemInitiativeList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemInitiative",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemInitiativeDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemInitiativeLog",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/business/polling/nfcTest/index",
 			"style": {
diff --git a/src/pages/business/polling/optionDetail.vue b/src/pages/business/polling/optionDetail.vue
index 9f48e2c..b1b45f3 100644
--- a/src/pages/business/polling/optionDetail.vue
+++ b/src/pages/business/polling/optionDetail.vue
@@ -400,7 +400,7 @@ const chooseImage = (item,index) => {
         uni.chooseImage({
             // count: 1, // 默认是9，这里设置为1次只选1张
             // sizeType: ['compressed'], // 可以指定是原图还是压缩图，可选 'original' 或 'compressed'
-            sourceType: ['album', 'camera'], // 指定来源是相册还是相机，默认二者都有
+            sourceType: ['camera'], // 指定来源是相册还是相机，默认二者都有//'album',
             // quality:80,
             // width:'1920px',
             // height:'1920px',
@@ -455,7 +455,7 @@ const chooseImage = (item,index) => {
 // 视频处理
 const chooseVideo = (item,index) => {
     uni.chooseVideo({
-        sourceType: ['album', 'camera'], // 来源：相册和相机
+        sourceType: ['camera'], // 来源：相册和相机//'album', 
         maxDuration: 60, // 最大时长（秒）
         camera: 'back', // 使用后置摄像头
         compressed: true, // 压缩视频
diff --git a/src/pages/business/polling/problemInitiative.vue b/src/pages/business/polling/problemInitiative.vue
new file mode 100644
index 0000000..eb6a3a0
--- /dev/null
+++ b/src/pages/business/polling/problemInitiative.vue
@@ -0,0 +1,584 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="新增问题上报" 
+            :leftFlag="true" :rightFlag="false"
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">
+                    问题名称
+                    <view class="report-list">
+                        <input class="r-input uni-input" v-model="optionObj.problemName" placeholder="请输入问题" placeholder-class="place-input" />
+                    </view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view class="report-pro">提交人</view>
+                    <view class="report-right">{{optionObj.createUserName?optionObj.createUserName:realname}}</view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    问题描述
+                    <textarea class="r-input textarea" v-model="optionObj.problemDesc" auto-height 
+                        placeholder="请输入问题项描述" placeholder-class="place-input"
+                    ></textarea>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    <view class="r-title">问题点位照片或视频 <text>*</text></view>
+                    <view class="img-flex">
+                        <view class="img-show" v-for="(item2,index2) in imgArr" :key="index2"  @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(imgArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <!-- <img :src="item2.shortUrl" /> -->
+                            <image :src="item2.shortUrl" mode="aspectFill" /> 
+                        </view>
+                        <view class="img-show" v-for="(item2,index2) in videoArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(videoArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <view class="img-icon">
+                                <img :src="'static/images/polling/icon-play.png'" />
+                            </view>
+                            <!-- <video :src="item.url" controls></video> -->
+                            <DomVideoPlayer :src="item2.url" objectFit="cover" />
+                        </view>
+                       
+                        <!-- loading -->
+                        <view class="img-con" v-if="imgLoading">
+                            <view class="upload-loading">
+                                <uni-icons type="refreshempty" size="30" color="#C9C9C9"></uni-icons>
+                                <view>上传中....</view>
+                            </view>
+                        </view>
+                        <view class="img-con" @click="chooseMedia" v-else>
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view>
+                        <!-- #ifdef APP-PLUS -->
+                        <!-- #endif -->
+                        <!-- #ifndef APP-PLUS -->
+                        <!-- <view class="img-con">
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view> -->
+                        <!-- #endif -->
+                    </view>
+                </view>
+                <view class="btn-submit">
+                    <button type="primary" @click="handleSubmit">提交</button>
+                </view>
+            </view>
+        </mescroll-uni>
+    </view>
+
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+
+    <!-- 选择图片或者视频 -->
+    <chooseMediaVue ref="chooseMediaRef" @getMediaArr="getMediaArr" @closeMedia="closeMedia"></chooseMediaVue>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive, watch,getCurrentInstance } from 'vue'
+import { onLoad,onShow,onHide} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import chooseMediaVue from '@/components/chooseMedia.vue'
+import mediaPreview from "@/components/mediaPreview.vue"
+import DomVideoPlayer from 'uniapp-video-player'
+import { getUserInfo } from '@/api/auth.js'
+import { problemDetail,problemAdd,problemEdit,minioUpload } from '@/api/polling.js'
+import {compressImageUni,getFileType} from '@/utils/common.js'
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+const { proxy } = getCurrentInstance();
+
+let taskId = ref('');//任务id
+let groupId = ref('');//组id
+let problemId = ref('');//问题id
+let realname = ref('');
+let desc = ref('');//描述
+let minioObj = {};
+onLoad(async option => {
+    // console.log(option)
+    taskId.value = option.taskId;
+    groupId.value = option.groupId;
+    problemId.value = option.problemId;
+
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+    
+    let userinfo = await getUserInfo({});
+    realname.value = userinfo.realname;
+    getList();
+})
+
+onShow(()=>{
+    imgLoading.value=false;
+})
+
+// 查询列表
+let list = ref([]);
+let optionObj = ref({})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    use:false,
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+// 获取数据列表
+const getList = async () => {
+    let param = {
+        taskId:problemId.value?undefined:taskId.value,
+        groupId:problemId.value?undefined:groupId.value,
+        problemId:problemId.value
+    }
+    let res = await problemDetail(param);
+    let data = res||{};
+
+    let pointIds = data.pointId?.split(",") || [];
+    data.pointList.forEach(item2=>{
+        item2.active=false;
+        for (let i = 0; i < pointIds.length; i++) {
+            if(item2.pointId == pointIds[i]){
+                item2.active=true;
+                break;
+            }
+        }
+    })
+
+    // 视频回显
+    imgArr.value = [];
+    mediaArr.value=[];
+    videoArr.value=[];
+    let fileList =data.problemVedio?.split(",") || [];
+    fileList.forEach(item=>{
+        mediaArr.value.push(item)
+        if(getFileType(item)=='image'){
+            imgArr.value.push({
+                shortUrl:minioObj.minioThumbUrl +"/"+item,
+                url:minioObj.minioUrl +"/"+item,
+                name:item
+            })
+        }else if(getFileType(item)=='video'){
+            videoArr.value.push({
+                shortUrl:minioObj.minioThumbUrl +"/"+item,
+                url:minioObj.minioUrl +"/"+item,
+                name:item
+            })
+        }
+    })
+    optionObj.value = data;
+}
+
+// 图片或视频
+let mediaArr = ref([]);//传给后台的地址
+let imgArr=ref([]);//图片 后台返回的
+let videoArr = ref([]);//视频 后台返回的
+let imgLoading = ref(false)
+const chooseMedia = () => {
+    // console.log("chooseMedia=>") 
+    proxy.$refs["chooseMediaRef"].openPicker();
+    imgLoading.value=true; 
+    // uni.chooseMedia({
+    //     count: 9,
+    //     mediaType: ['image', 'video'], // 指定可选择图片和视频
+    //     sourceType: ['album', 'camera'],
+    //     maxDuration: 60, // 拍摄视频最长拍摄时间
+    //     camera: 'back',
+    //     success: (res) => {
+    //         // console.log("chooseMedia=>",res)
+    //         res.tempFiles.forEach(async file => {
+    //             // console.log(`文件类型: ${file.fileType}, 文件路径: ${file.tempFilePath}`);
+    //             let compressImg = file.tempFilePath;
+    //             // 图片进行压缩
+    //             if (file.fileType === 'image') {
+    //                 // #ifdef APP-PLUS
+    //                 // 压缩图片
+    //                 compressImg = await compressImageUni(file.tempFilePath);
+    //                 // #endif
+    //             }
+
+    //             // 执行上传
+    //             let param = {
+    //                 filePath: compressImg,
+    //                 name: 'file',
+    //                 formData: {
+    //                     directory:'polling'
+    //                 },
+    //             }
+    //             imgLoading.value=true;        
+    //             minioUpload(param).then(res=>{
+    //                 let data = res.data;//console.log("上传成功后=>",res)
+    //                 mediaArr.value.push(data.fileName);
+    //                 if (file.fileType === 'image') {// 图片
+    //                     imgArr.value.push({
+    //                         shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+    //                         url:minioObj.minioUrl +"/"+data.fileName,
+    //                         name:data.fileName
+    //                     })
+    //                 } else if (file.fileType === 'video') {// 视频
+    //                     videoArr.value.push({
+    //                         shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+    //                         url:minioObj.minioUrl +"/"+data.fileName,
+    //                         name:data.fileName
+    //                     })
+    //                 }
+    //             }).finally(()=>{
+    //                 imgLoading.value=false;
+    //             })
+                
+    //         });
+    //     }
+    // });
+}
+const closeMedia = ()=>{
+    imgLoading.value=false; 
+}
+
+// 插件回调
+const getMediaArr=(arr)=>{
+    // console.log("插件回调=>",arr)
+    try {
+        arr.forEach(data=>{
+            mediaArr.value.push(data.fileName);
+            if(data.fileType=="image"){
+                imgArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }else if(data.fileType == "video"){
+                videoArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }
+        })
+        // console.log(imgArr.value,videoArr.value)
+        imgLoading.value=false; 
+    } catch (error) {
+        console.error(error)
+        imgLoading.value=false; 
+    }
+    
+}
+
+// 视频或图片删除 根据数组下标删除数组里的某个图片或视频
+const handleDelete=(arr,index2)=>{
+    let item = arr[index2];
+    arr.splice(index2, 1);
+    mediaArr.value = mediaArr.value.filter(item2=>item2!=item.name);
+    console.log("删除后=>",mediaArr.value)
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(item)=>{
+    // console.log("调用放大视频==>",item)
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = item.url
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+
+// 红点点击
+const handleRound=(item)=>{
+    item.active=!item.active
+}
+
+// 提交
+const handleSubmit=()=>{
+    let pointIds = [];
+    optionObj.value.pointList.forEach(item => {
+        if(item.active){
+            pointIds.push(item.pointId)
+        }
+    });
+
+    showLoading("加载中...")
+    if(problemId.value){
+        let param = {
+            problemId:problemId.value,
+            pointId:pointIds.join(","),
+            problemVedio:mediaArr.value.join(","),
+            problemDesc:optionObj.value.problemDesc
+        }
+        // console.log("problemEdit=>",param)
+        problemEdit(param).then(res=>{
+            // showAlert = (content, title = '提示',showCancel=false,succFun)
+            showAlert("修改问题上报成功！","提示",false,()=>{
+                uni.navigateBack()
+            })
+        }).finally(()=>{
+            hideLoading();
+        })
+    }else{
+        let param = {
+            taskId:taskId.value,
+            groupId:groupId.value,
+            pointId:pointIds.join(","),
+            problemVedio:mediaArr.value.join(","),
+            problemDesc:optionObj.value.problemDesc
+        }
+        // console.log("problemAdd=>",param)
+        problemAdd(param).then(res=>{
+            showAlert("新建问题上报成功！","提示",false,()=>{
+                problemId.value = res;
+                uni.navigateBack()
+            })
+        }).finally(()=>{
+            hideLoading();
+        })
+    }
+    
+}
+</script>
+
+<style scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+.white-bg .red-title .uni-input{
+    color:#333;
+    font-weight: normal;
+}
+
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:30rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .r-input{
+    border:1px solid #E7E7E7;
+    border-radius: 10rpx;
+    width:620rpx;
+    padding:15rpx 25rpx;
+    margin:20rpx 0 0rpx;
+}
+.report-list .place-input{
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+.report-list .textarea{
+    min-height: 120rpx;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    align-items: center;
+    width:90%;
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+.report-list .r-r-round{
+    width:35rpx;
+    height:35rpx;
+    border:1px solid #BDBDBD;
+    border-radius: 50%;
+}
+.report-list .r-r-round.active{
+    border:1px solid #FF2B44;
+    background-color: #FF2B44;
+    position: relative;
+}
+.report-list .r-r-round.active::after{
+    content:"!";
+    position: absolute;
+    top:0;
+    left:0;
+    color:#fff;
+    text-align: center;
+    width:35rpx;
+    height:35rpx;
+    /* #ifndef APP-PLUS */
+    line-height: 30rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    height:33rpx;
+    padding-top:2rpx;
+    /* #endif */
+}
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-show img,
+.report-list .img-show image,
+.report-list .img-show video,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 20rpx 0 0;
+}
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-delete{
+    position: absolute;
+    /* #ifndef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    top:8rpx;
+    width:34rpx;
+    height:34rpx;
+    line-height:34rpx;
+    border-radius:3rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    text-align: center;
+    z-index:1;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+
+.btn-submit{
+    width:400rpx;
+    margin:90rpx auto;
+}
+.btn-submit uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.2;   
+}
+.btn-submit uni-button:after{
+    border-color:#05A3F4;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/polling/problemInitiativeDetail.vue b/src/pages/business/polling/problemInitiativeDetail.vue
new file mode 100644
index 0000000..630db0b
--- /dev/null
+++ b/src/pages/business/polling/problemInitiativeDetail.vue
@@ -0,0 +1,402 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="问题上报" 
+            :leftFlag="true" :rightFlag="true"
+        >
+            <template #right>
+                <view class="head-right" @click="handleQuestion" v-if="problemObj.problemStatus==1">
+                    <view class="btn-yellow">
+                        <uni-icons type="plus" size="20" color="#4C2D11"></uni-icons> 新增跟踪信息
+                    </view>
+                </view>
+            </template>
+        </customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">问题：{{problemObj.groupName}}</view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view style="width:45%;display:flex;">
+                        <view class="report-pro report-w" style="margin-right:20rpx;">提交人</view>
+                        <view class="report-right report-w">{{problemObj.createUserName}}</view>
+                    </view>
+                    <view style="width:55%;display:flex;">
+                        <view class="report-pro report-w" style="margin-right:20rpx;">提交时间</view>
+                        <view class="report-right report-w">{{parseTime(problemObj.createTime,'{y}-{m}-{d} {h}:{i}')}}</view>
+                    </view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list">问题描述</view>
+                <view class="report-list report-gray">{{problemObj.problemDesc}}</view>
+                <view class="report-border"></view>
+                <view class="report-list">问题点位照片或视频</view>
+                <view class="report-list">
+                    <view class="img-flex">
+                        <block v-for="(item2,index2) in problemObj.listFile" :key="index2">
+                            <view class="img-show" v-if="getFileType(item2)=='image'" @click="showMediaPreview(item2)">
+                                <image :src="minioObj.minioThumbUrl+'/'+item2" mode="aspectFill" /> 
+                            </view>
+                            <view class="img-show" v-else-if="getFileType(item2)=='video'" @click="showMediaPreview(item2)">
+                                <view class="img-icon">
+                                    <img :src="'static/images/polling/icon-play.png'" />
+                                </view>
+                                <!-- <video :src="minioObj.minioUrl+'/'+item" controls  v-show="videoShow"></video> -->
+                                <DomVideoPlayer :src="minioObj.minioUrl+'/'+item2"  objectFit="cover"  v-show="videoShow" />
+                            </view>
+                        </block>
+                    </view>
+                </view>
+
+                <!-- 当天提的 增加按钮 修改和删除 -->
+                <view class="btn-con" v-if="isToday && problemObj.problemStatus==1">
+                    <button type="primary" @click="handleUpdate" size="mini" style="margin-right:50rpx;" class="btn-primary">修改</button>
+                    <button type="primary" @click="handleDelete" size="mini">删除</button>
+                </view>
+
+                <!-- 追踪列表 -->
+                <block v-if="problemObj.logList">
+                <block v-if="problemObj.logList.length>0">
+                    <view class="bg-border"></view>
+                    <view v-for="(item,index) in problemObj.logList" :key="index" class="log-con">
+                        <view class="blue-title">
+                            {{parseTime(item.createTime,'{y}-{m}-{d} {h}:{i}')}}
+                            <text style="margin-left:20rpx;">巡检人：{{item.modifyUserName}}</text>
+                        </view>
+                        <view class="report-list">检查点跟踪情况描述</view>
+                        <view class="report-list report-gray">{{item.logDesc}}</view>
+                        <view class="report-border"></view>
+                        <view class="report-list">检查点位照片或视频</view>
+                        <view class="report-list">
+                            <view class="img-flex">
+                                <block v-for="(item2,index2) in item.listFile" :key="index2">
+                                    <view class="img-show" v-if="getFileType(item2)=='image'" @click="showMediaPreview(item2)">
+                                        <image :src="minioObj.minioThumbUrl+'/'+item2" mode="aspectFill" /> 
+                                    </view>
+                                    <view class="img-show" v-else-if="getFileType(item2)=='video'" @click="showMediaPreview(item2)">
+                                        <view class="img-icon">
+                                            <img :src="'static/images/polling/icon-play.png'" />
+                                        </view>
+                                        <!-- <video :src="minioObj.minioUrl+'/'+item" controls v-show="videoShow"></video> -->
+                                        <DomVideoPlayer :src="minioObj.minioUrl+'/'+item2"  objectFit="cover"  v-show="videoShow" />
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                </block>
+            </view>
+        </mescroll-uni>
+    </view>
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive } from 'vue'
+import { onLoad,onShow,onHide} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import mediaPreview from "@/components/mediaPreview.vue"
+import DomVideoPlayer from 'uniapp-video-player'
+import { parseTime } from '@/utils/datetime.js';
+import {getFileType} from '@/utils/common.js';
+import { problemDetail,problemDel } from '@/api/polling.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+
+let problemId=ref('');
+let problemObj = ref({});
+let isToday = ref(false);
+let minioObj = {};
+onLoad(option => {
+    // console.log(option)
+    problemId.value = option.problemId;
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+})
+
+onShow(()=>{
+    getList();
+})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+
+// 获取数据列表
+const getList = async() => {
+    isToday.value = false;
+    let data = await problemDetail({problemId:problemId.value});
+    data.list = data.pointName?.split(",") || [];
+    data.listFile=data.problemVedio?.split(",") || [];
+    data.logList.forEach(item => {
+        item.listFile = item.logVedio?.split(",")||[]
+    });
+    // 判断是否当天创建的，显示按钮
+    let createTime = parseTime(data.createTime,'{y}-{m}-{d}');
+    let dateNow = parseTime(new Date().getTime(),'{y}-{m}-{d}');
+    if(createTime == dateNow){
+        isToday.value = true;
+    }
+    problemObj.value = data;
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(url)=>{
+    url = minioObj.minioUrl+'/'+url;
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = url;
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+// 跳转问题上报页面
+const handleQuestion=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemInitiativeLog?problemId='+problemId.value
+    });
+}
+
+// 修改
+const handleUpdate=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemInitiative?problemId='+problemId.value
+    });
+}
+
+// 删除
+const handleDelete=()=>{
+    showLoading("加载中...")
+    problemDel({problemId:problemId.value}).then(res=>{
+        // content, title = '提示',showCancel=false,succFun
+        showAlert("删除成功！",'提示',false,()=>{
+            uni.navigateBack()
+        })
+    }).finally(()=>{
+        hideLoading();
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.head-right{}
+.head-right .btn-yellow{
+    background-color: #FCC123;
+    color: #4C2D11;
+    font-size: 28rpx;
+    font-weight: bold;
+    border-radius: 10rpx;
+    padding:10rpx 25rpx;
+    display: flex;
+    align-items: center;
+}
+.head-right .btn-yellow .img-repair{
+    width: 30rpx;
+    height: 30rpx;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 50rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:30rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list.report-gray{
+    color:#919191;
+    padding:20rpx 0 0;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .report-w{
+    width:auto;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    /* align-items: center; */
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+
+
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 20rpx 0 0;
+}
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+.report-list .img-show img,
+.report-list .img-show video,
+.report-list .img-show image,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.btn-con{
+    text-align: center;
+    padding-top:50rpx;
+}
+uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.5;
+    padding:0 80rpx;
+}
+uni-button:after{
+    display: none;
+}
+
+.bg-border{
+    width:750rpx;
+    height:20rpx;
+    background-color: #F5F5F5;
+    margin-left:-40rpx;
+    margin-top:40rpx;
+}
+
+.log-con{
+    padding-top:10rpx;
+}
+.log-con .blue-title{
+    font-size:32rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/polling/problemInitiativeList.vue b/src/pages/business/polling/problemInitiativeList.vue
new file mode 100644
index 0000000..712c491
--- /dev/null
+++ b/src/pages/business/polling/problemInitiativeList.vue
@@ -0,0 +1,328 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="!searchShow?'巡检问题上报':'搜索'" 
+                :leftFlag="true" 
+                :rightFlag="true"  
+                @back="handleBack" :searchType="searchShow?1:undefined"
+            >
+                <template #right>
+                    <view class="head-right" @click="handleQuestion">
+                        <view class="btn-yellow">
+                            <uni-icons type="plus" size="20" color="#4C2D11"></uni-icons> 新建问题上报
+                        </view>
+                    </view>
+                </template>
+            </customHeader>
+            
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+          
+            <!-- 搜索处理 -->
+            <customSearch v-if="searchShow"   
+                :searchKeywords="searchText" 
+                :searchType="searchTypeObj" 
+                :checkTypeObj="notictTypeCheck"
+                :searchTypeList="noticeTypeList" 
+                @confirm="handleSearchConfirm"
+            ></customSearch>
+            <view class="search" v-else  @click="handleSearchFocus">
+                <view class="search-bg">
+                    <view class="search-left">{{ notictTypeCheck.name?notictTypeCheck.name:'全部' }}</view>
+                    <view class="search-right">
+                        <uni-icons type="search" size="20" color="#ffffff"></uni-icons>
+                        <input class="uni-input" v-model="searchText" placeholder="搜索" placeholder-class="search-color" />
+                    </view>
+                </view>
+            </view>
+
+            <!-- 列表 -->
+            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                :up="upOption" :down="downOption" :fixed="false" class="scroll-h" :class="{'loading-scroll':cssFlag}">
+                <view class="white-bg" :class="{'bg-height':list.length<8}">
+                    <block v-if="list.length>0">
+                        <view class="report-list" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+                            <view class="r-list" style="padding-bottom:0">
+                                <view class="r-name">{{ item.groupName }}</view>
+                                <view class="r-right">
+                                    <!-- 问题状态 1=追踪、2=关闭 -->
+                                    <view v-if="item.problemStatus==1" class="btn-red">进行中</view>
+                                    <view v-if="item.problemStatus==2" class="btn-green">已解决</view>
+                                </view>
+                            </view>
+                            <view class="r-list">
+                                <view class="r-left">
+                                    <view class="r-l-left" style="width:220rpx">跟踪次数<span class="r-gray">{{ item.logNum }}</span></view>
+                                    <view class="r-l-right">最近跟踪时间<span class="r-gray">{{parseTime(item.lastLogTime,'{y}-{m}-{d} {h}:{i}') }}</span></view>
+                                </view>
+                            </view>
+                            <view class="report-border" v-if="index<list.length-1"></view>
+                        </view>
+                    </block>
+                    <view v-else class="no-data">
+                        <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                    </view>
+                </view>
+            </mescroll-uni>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted,computed } from 'vue'
+import { onLoad,onHide } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
+import customSearch from '@/components/customSearch.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { parseTime } from '@/utils/datetime.js'
+import { problemList } from '@/api/polling.js'
+
+onLoad(async(opt) => {
+    uni.setStorageSync('page_cache',true);
+})
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 搜索处理
+let searchShow = ref(false);
+let searchText = ref(undefined);
+let searchTypeObj = ref({typeId:3,typeName:'巡检类型'});
+let noticeTypeList=ref([
+    {id:1,name:'日常巡检'}, 
+    {id:2,name:'临时巡检'}, 
+]);
+let notictTypeCheck = ref({});//选中类型
+
+onHide(()=>{
+    searchShow.value=false;
+})
+
+// 搜索返回操作
+const handleBack=()=>{
+    searchShow.value=false;
+}
+// 获取input 焦点跳转
+const handleSearchFocus=()=>{
+    searchShow.value = true;
+}
+
+// 搜索完返回处理
+const handleSearchConfirm = (param1,param2)=>{
+    // console.log(param1,param2)
+    notictTypeCheck.value=param1.value;
+    searchText.value=param2.value;;
+    searchShow.value=false;
+}
+
+// 清除未读
+const handleRead = () => {
+    list.value.forEach(item => {
+        item.isRead = false;
+    })
+}
+// 查询通知列表
+let list = ref([]);
+const mescrollRef = ref(null);
+const upOption = ref({
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../../static/images/mescroll-empty.png"
+    },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let cssFlag=ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        console.log("下拉刷新")
+        const res = await getList(1, upOption.value.page.size);
+        cssFlag.value = false;
+        list.value = res.list;
+        // mescroll.resetUpScroll();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        console.log("上拉加载更多")
+        let res = await getList(mescroll.num, mescroll.size);
+        if (mescroll.num === 1) {
+            list.value = res.list;
+        } else {
+            list.value.push(...res.list);
+        }
+        mescroll.endBySize(res.list.length, res.total);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+    return new Promise(async (resolve) => {
+        let param = {
+            pageIndex,
+            pageSize,
+            key:searchText.value?searchText.value:undefined,
+            taskType:notictTypeCheck.value.id
+        }
+        let res = await problemList(param);
+        let list = res.list || [];
+        resolve({
+            list,
+            // total: res.recordCount || 0
+        });
+    });
+
+}
+
+// 跳转问题上报页面
+const handleQuestion=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemInitiative'
+    });
+}
+
+// 查看详情
+const handleDetail = (item) =>{
+    let url= '/pages/business/polling/problemInitiativeDetail?problemId='+item.problemId;
+    uni.navigateTo({
+        url
+    });
+}
+</script>
+
+<style scoped>
+.all-body{
+    position: absolute;
+    /* #ifdef APP-PLUS */
+    top:150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top:120rpx;
+    height: calc(100vh - 64px);
+    /* #endif */
+    overflow: hidden;
+}
+
+:deep(.mescroll-downwarp .downwarp-progress){
+    border-color:#fff !important;
+}
+
+:deep(.mescroll-downwarp .downwarp-tip){
+    color:#fff;
+}
+
+.head-right{}
+.head-right .btn-yellow{
+    background-color: #FCC123;
+    color: #4C2D11;
+    font-size: 28rpx;
+    font-weight: bold;
+    border-radius: 10rpx;
+    padding:10rpx 25rpx;
+    display: flex;
+    align-items: center;
+}
+.head-right .btn-yellow .img-repair{
+    width: 30rpx;
+    height: 30rpx;
+}
+
+.white-bg {
+    width: 670rpx;
+    padding: 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+    position: relative;
+}
+.white-bg.bg-height{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 150px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 140px);
+    /* #endif */
+}
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 130px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 105px);
+    /* #endif */
+}
+
+.report-list{
+    position: relative;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+.report-list .r-list{
+    padding: 5rpx 0;
+}
+.report-list .r-list .r-left{
+    display: flex;
+}
+.report-list .r-list .r-gray{
+    margin-left:10rpx;
+}
+.report-list .r-list .r-blue{
+    margin-left:10rpx;
+    font-weight: bold;
+}
+.report-list .r-list .r-red{
+    font-weight: bold;
+}
+.report-list .r-list .r-name{
+    width:525rpx
+}
+.r-left .r-l-left{
+    width:280rpx;
+}
+.r-left .r-l-right{
+   
+}
+.no-data .no-pic{
+    display: block;
+    width:440rpx;
+    height:210rpx;
+    margin:40rpx auto;
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/polling/problemInitiativeLog.vue b/src/pages/business/polling/problemInitiativeLog.vue
new file mode 100644
index 0000000..bb4be5d
--- /dev/null
+++ b/src/pages/business/polling/problemInitiativeLog.vue
@@ -0,0 +1,498 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="新增跟踪信息" 
+            :leftFlag="true" :rightFlag="false"
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">问题：{{optionObj.groupName}}</view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view class="report-pro">提交人</view>
+                    <view class="report-right">{{optionObj.createUserName}}</view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    检查点跟踪情况描述
+                    <textarea class="r-input textarea" v-model="desc" auto-height 
+                        placeholder="请输入跟踪情况描述" placeholder-class="place-input"
+                    ></textarea>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    <view class="r-title">问题点位照片或视频 <text>*</text></view>
+                    <view class="img-flex">
+                        <view class="img-show" v-for="(item2,index2) in imgArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(imgArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <image :src="item2.shortUrl" mode="aspectFill" /> 
+                        </view>
+                        <view class="img-show" v-for="(item2,index2) in videoArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(videoArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <view class="img-icon">
+                                <img :src="'static/images/polling/icon-play.png'" />
+                            </view>
+                            <!-- <video :src="item" controls></video> -->
+                            <DomVideoPlayer :src="item2.url" objectFit="cover" />
+                        </view>
+
+                        <!-- loading -->
+                        <view class="img-con" v-if="imgLoading">
+                            <view class="upload-loading">
+                                <uni-icons type="refreshempty" size="30" color="#C9C9C9"></uni-icons>
+                                <view>上传中....</view>
+                            </view>
+                        </view>
+                        <view class="img-con" @click="chooseMedia" v-else>
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view>
+
+                        <!-- #ifdef APP-PLUS -->
+                        <!-- #endif -->
+                        <!-- #ifndef APP-PLUS -->
+                        <!-- <view class="img-con">
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view> -->
+                        <!-- #endif -->
+                    </view>
+                </view>
+                <view class="btn-submit">
+                    <button type="primary" @click="handleSubmit">提交</button>
+                </view>
+            </view>
+        </mescroll-uni>
+    </view>
+
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+
+    <!-- 选择图片或者视频 -->
+    <chooseMediaVue ref="chooseMediaRef" @getMediaArr="getMediaArr" @closeMedia="closeMedia"></chooseMediaVue>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive,getCurrentInstance } from 'vue'
+import { onLoad,onHide, onShow} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import mediaPreview from "@/components/mediaPreview.vue"
+import chooseMediaVue from '@/components/chooseMedia.vue'
+import DomVideoPlayer from 'uniapp-video-player'
+import { getUserInfo } from '@/api/auth.js'
+import { problemDetail,problemAddLog,minioUpload } from '@/api/polling.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+import {compressImageUni} from '@/utils/common.js'
+const { proxy } = getCurrentInstance();
+
+let problemId = ref('');
+let realname = ref('');
+let desc = ref('');//描述
+let minioObj = {};
+onLoad(async option => {
+    // console.log(option)
+    problemId.value = option.problemId;
+
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+    let userinfo = await getUserInfo({});
+    realname.value = userinfo.realname
+
+    getList();
+})
+onShow(()=>{
+    imgLoading.value=false;
+})
+
+// 查询列表
+let list = ref([]);
+let optionObj = ref({})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    use:false,
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+// 获取数据列表
+const getList = async () => {
+    let res = await problemDetail({problemId:problemId.value});
+    let data = res || {};
+    data.list = data.pointName.split(",") || [];
+    optionObj.value = data;
+}
+
+// 图片或视频
+let mediaArr = ref([]);//传给后台的地址
+let imgArr=ref([]);//图片 后台返回的
+let videoArr = ref([]);//视频 后台返回的
+let imgLoading = ref(false)
+const chooseMedia = () => {
+    proxy.$refs["chooseMediaRef"].openPicker();
+    imgLoading.value=true; 
+   /* uni.chooseMedia({
+        count: 9,
+        mediaType: ['image', 'video'], // 指定可选择图片和视频
+        sourceType: ['album', 'camera'],
+        maxDuration: 60, // 拍摄视频最长拍摄时间
+        camera: 'back',
+        success: (res) => {
+            console.log("问题跟踪chooseMedia=>",res)
+            res.tempFiles.forEach(async file => {
+                console.log(`文件类型: ${file.type}, 文件路径: ${file.tempFilePath}`);
+                let compressImg = file.tempFilePath;
+                // 图片进行压缩
+                if (file.fileType === 'image') {
+                    // #ifdef APP-PLUS
+                    // 压缩图片
+                    compressImg = await compressImageUni(file.tempFilePath);
+                    // #endif
+                }
+                // 执行上传
+                let param = {
+                    filePath: compressImg,
+                    name: 'file',
+                    formData: {
+                        directory:'polling'
+                    },
+                }
+                imgLoading.value=true;         
+                minioUpload(param).then(res=>{
+                    let data = res.data;
+                    mediaArr.value.push(data.fileName);
+                    if (file.fileType === 'image') {// 图片
+                        imgArr.value.push({
+                            shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                            url:minioObj.minioUrl +"/"+data.fileName,
+                            name:data.fileName
+                        })
+                    } else if (file.fileType === 'video') {// 视频
+                         videoArr.value.push({
+                            shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                            url:minioObj.minioUrl +"/"+data.fileName,
+                            name:data.fileName
+                        })
+                    }
+                }).finally(()=>{
+                    imgLoading.value=false;
+                })
+            });
+        }
+    });*/
+}
+
+const closeMedia = ()=>{
+    imgLoading.value=false; 
+}
+
+// 插件回调
+const getMediaArr=(arr)=>{
+    // console.log("插件回调=>",arr)
+    try {
+        arr.forEach(data=>{
+            mediaArr.value.push(data.fileName);
+            if(data.fileType=="image"){
+                imgArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }else if(data.fileType == "video"){
+                videoArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }
+        })
+        // console.log(imgArr.value,videoArr.value)
+        imgLoading.value=false; 
+    } catch (error) {
+        console.error(error)
+        imgLoading.value=false; 
+    }
+    
+}
+
+// 视频或图片删除 根据数组下标删除数组里的某个图片或视频
+const handleDelete=(arr,index2)=>{
+    arr.splice(index2, 1);
+    let item = arr[index2];
+    mediaArr.value = mediaArr.value.filter(item2=>item2!=item.name);
+    // console.log("删除后=>",mediaArr.value)
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(item)=>{
+    // console.log("调用放大视频==>",item)
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = item.url
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+// 提交
+const handleSubmit=()=>{
+    let param = {
+        problemId:problemId.value,
+        logVedio:mediaArr.value.join(","),
+        logDesc:desc.value
+    }
+    // console.log("problemAddLog=>",param)
+    problemAddLog(param).then(res=>{
+        showAlert("新建问题跟踪成功！");
+        uni.navigateBack();
+    }).finally(()=>{
+        hideLoading();
+    })
+}
+</script>
+
+<style scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .r-input{
+    border:1px solid #E7E7E7;
+    border-radius: 10rpx;
+    width:620rpx;
+    padding:15rpx 25rpx;
+    margin:20rpx 0 30rpx;
+}
+.report-list .place-input{
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+.report-list .textarea{
+    min-height: 120rpx;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+.report-list .r-r-round{
+    width:35rpx;
+    height:35rpx;
+    border:1px solid #BDBDBD;
+    border-radius: 50%;
+}
+.report-list .r-r-round.active{
+    border:1px solid #FF2B44;
+    background-color: #FF2B44;
+    position: relative;
+}
+.report-list .r-r-round.active::after{
+    content:"!";
+    position: absolute;
+    top:0;
+    left:0;
+    color:#fff;
+    text-align: center;
+    width:35rpx;
+    height:35rpx;
+    /* #ifndef APP-PLUS */
+    line-height: 30rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    height:30rpx;
+    padding-top:5rpx;
+    /* #endif */
+}
+
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-show img,
+.report-list .img-show image,
+.report-list .img-show video,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 10rpx 0;
+}
+
+.report-list .img-show:first-child,
+.report-list .img-con:first-child{
+    margin-left:0;
+}
+
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-delete{
+    position: absolute;
+    /* #ifndef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    top:8rpx;
+    width:34rpx;
+    height:34rpx;
+    line-height:34rpx;
+    border-radius:3rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    text-align: center;
+    z-index:1;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+.btn-submit{
+    width:400rpx;
+    margin:90rpx auto;
+}
+.btn-submit uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.2;   
+}
+.btn-submit uni-button:after{
+    border-color:#05A3F4;
+}
+</style>
\ No newline at end of file
diff --git a/src/static/images/business/icon-xjwtsb.png b/src/static/images/business/icon-xjwtsb.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d696ec223f386d03afbbcc04f929fbd5a629f84
GIT binary patch
literal 8500
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

literal 0
HcmV?d00001