From b8b868d3e92289ece7ffff16a749dee7ffe7b44f Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Fri, 7 Mar 2025 07:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9webBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/tableButton.ts                 | 21 +++++
 src/api/lowCode/form/type.ts                  |  1 +
 .../lowCode/assistant/videoUpAndPlay.vue      | 19 +++-
 src/components/lowCode/formItem.vue           |  9 +-
 src/views/formTable/myTask.vue                | 87 +++++++++++++------
 src/views/formTable/page/flowAndLog.vue       |  2 +-
 src/views/formTable/taskListPage.vue          |  4 +-
 7 files changed, 108 insertions(+), 35 deletions(-)
 create mode 100644 src/api/common/tableButton.ts

diff --git a/src/api/common/tableButton.ts b/src/api/common/tableButton.ts
new file mode 100644
index 0000000..f186fc9
--- /dev/null
+++ b/src/api/common/tableButton.ts
@@ -0,0 +1,21 @@
+export interface tableButton {
+	control: any;
+	id?: string;
+	name?: string;
+	field?: string;
+	type?: string;
+	attribute:string;
+	pattern?: string;
+	fieldClass?: string;
+	activeValue?: string;
+	inactiveValue?: string;
+	options?: optionsInfo[];
+	config?:any;
+	label?: string;
+}
+
+
+export interface optionsInfo {
+	label: string;
+	value: string;
+}
\ No newline at end of file
diff --git a/src/api/lowCode/form/type.ts b/src/api/lowCode/form/type.ts
index 40338af..1df198e 100644
--- a/src/api/lowCode/form/type.ts
+++ b/src/api/lowCode/form/type.ts
@@ -70,6 +70,7 @@ export interface tableFormStruct {
 	},
     dict: Object,
     refreshTable: boolean,
+	isOpen:boolean,
 	view:{
 		list:{
 			status:boolean,
diff --git a/src/components/lowCode/assistant/videoUpAndPlay.vue b/src/components/lowCode/assistant/videoUpAndPlay.vue
index 6e7084c..04076d4 100644
--- a/src/components/lowCode/assistant/videoUpAndPlay.vue
+++ b/src/components/lowCode/assistant/videoUpAndPlay.vue
@@ -41,18 +41,33 @@ const getFormItemInputStyle = (ele: any,sty:number) => {
       return AnalysisInputCss(ele?.inputStyle,sty)
     }
 }
+const openVideo = () => {
+  console.log("单机播放")
+}
 </script>
 <template>
+  <div class="butBox" @click="openVideo">按钮</div>
+  <div>
     <video  
-        :src="data?.control.videoMsg[0].url"
+      
         :loop="data?.control.videoMsg[0].loop"
         :autoplay="data?.control.videoMsg[0].videoAutoPlay"
 
             :style="getFormItemInputStyle(configStyle,2)"
             controls
         >
+        <source :src="data?.control.videoMsg[0].url" type="video/mp4">
+
+        您的浏览器不支持 HTML5 标签
     </video>
+    
+  </div>
 </template>
 <style  lang='scss' scoped>
-
+.butBox{
+  width:150px;
+  height: 50px;
+  background-color: #FB041A;
+  display:none;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/lowCode/formItem.vue b/src/components/lowCode/formItem.vue
index b4e3c70..0da2691 100644
--- a/src/components/lowCode/formItem.vue
+++ b/src/components/lowCode/formItem.vue
@@ -20,7 +20,7 @@ import wx from 'weixin-js-sdk'
 import request from '@/utils/axios/index'
 import { Md5 } from 'ts-md5'
 import { debounce } from '@/utils/lowCode/item/index'
-
+import { uploadUrl } from '@/api/lowCode/form/fieldUnit'
 //辅助控件
 import OrgCitys from '@/components/lowCode/assistant/orgCitys.vue'
 import UploadPage from '@/components/lowCode/assistant/uploadPage.vue'
@@ -549,15 +549,18 @@ const currentComponent = computed(() => {
     }
     return `el-${props.data.type}`
 })
+
 </script>
 <template>
-    <div>
+    <div>{{data.type}}
+        
         <template class="form-value" v-if="type === 15">
             2
         </template>
         <template v-if="data.type=='index'">
         </template>
         <template class="form-value" v-else>
+        
             <el-form-item
                 v-bind="data.item"
                 :prop="tProp || data.name"
@@ -969,7 +972,7 @@ const currentComponent = computed(() => {
 
 
 
-
+                
 
 
 
diff --git a/src/views/formTable/myTask.vue b/src/views/formTable/myTask.vue
index fe33d01..8570253 100644
--- a/src/views/formTable/myTask.vue
+++ b/src/views/formTable/myTask.vue
@@ -61,10 +61,12 @@ const gainAppTaskList = () => {
                     if(data.data.list){
                         appTaskList.value.push(...data.data.list)
                     }
-                    
-                    if(data.total > 0){
-                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.count
+                    let allPageCount = data.data.total
+                    console.log("获取任务列表内容=====111======>",allPageCount,logCount.value)
+                    if(allPageCount > 0){
+                        if(logCount.value < allPageCount){
+                            let pagenum = searchInfo.pagesize - data.data.count
+                            console.log("获取任务列表内容====pagenum=======>",pagenum)
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -73,8 +75,15 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            loadText.value = ""
-                            loadingList.value = true
+                            let pagenum = searchInfo.pagesize - data.data.count
+                            if (pagenum < 0) {
+                                loadText.value = ""
+                                loadingList.value = true
+                            }else{
+                                loadText.value = "此选项没有数据！"
+                                loadingList.value = true
+                            }
+                            
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
@@ -92,9 +101,9 @@ const gainAppTaskList = () => {
                         appTaskList.value.push(...data.data.list)
                     }
                     
-                    if(data.total > 0){
-                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.count
+                    if(data.data.total > 0){
+                        if(logCount.value < data.data.total){
+                            let pagenum = searchInfo.pagesize - data.data.count
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -103,8 +112,14 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            loadText.value = ""
-                            loadingList.value = true
+                            let pagenum = searchInfo.pagesize - data.data.count
+                            if (pagenum < 0) {
+                                loadText.value = ""
+                                loadingList.value = true
+                            }else{
+                                loadText.value = "此选项没有数据！"
+                                loadingList.value = true
+                            }
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
@@ -122,9 +137,9 @@ const gainAppTaskList = () => {
                         appTaskList.value.push(...data.data.list)
                     }
                     
-                    if(data.total > 0){
-                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.count
+                    if(data.data.total > 0){
+                        if(logCount.value < data.data.total){
+                            let pagenum = searchInfo.pagesize - data.data.count
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -133,8 +148,14 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            loadText.value = ""
-                            loadingList.value = true
+                            let pagenum = searchInfo.pagesize - data.data.count
+                            if (pagenum < 0) {
+                                loadText.value = ""
+                                loadingList.value = true
+                            }else{
+                                loadText.value = "此选项没有数据！"
+                                loadingList.value = true
+                            }
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
@@ -153,9 +174,9 @@ const gainAppTaskList = () => {
                         appTaskList.value.push(...data.data.list)
                     }
                     
-                    if(data.total > 0){
-                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.count
+                    if(data.data.total > 0){
+                        if(logCount.value < data.data.total){
+                            let pagenum = searchInfo.pagesize - data.data.count
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -164,8 +185,14 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            loadText.value = ""
-                            loadingList.value = true
+                            let pagenum = searchInfo.pagesize - data.data.count
+                            if (pagenum < 0) {
+                                loadText.value = ""
+                                loadingList.value = true
+                            }else{
+                                loadText.value = "此选项没有数据！"
+                                loadingList.value = true
+                            }
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
@@ -178,11 +205,11 @@ const gainAppTaskList = () => {
             gainAppAllTaskList(searchInfo)
                 .then(({data}) => {
                     console.log("获取列表内容",data)
-                    logCount.value = logCount.value + data.count
+                    logCount.value = logCount.value + data.data.count
                     appTaskList.value.push(...data.list)
-                    if(data.total > 0){
-                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.count
+                    if(data.data.total > 0){
+                        if(logCount.value < data.data.total){
+                            let pagenum = searchInfo.pagesize - data.data.count
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -191,8 +218,14 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            loadText.value = ""
-                            loadingList.value = true
+                            let pagenum = searchInfo.pagesize - data.data.count
+                            if (pagenum < 0) {
+                                loadText.value = ""
+                                loadingList.value = true
+                            }else{
+                                loadText.value = "此选项没有数据！"
+                                loadingList.value = true
+                            }
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
diff --git a/src/views/formTable/page/flowAndLog.vue b/src/views/formTable/page/flowAndLog.vue
index 58708ed..d3705d6 100644
--- a/src/views/formTable/page/flowAndLog.vue
+++ b/src/views/formTable/page/flowAndLog.vue
@@ -116,7 +116,7 @@ const newAddPageData = () => {
     }else{
         console.log("获取流程==2=1=>",props.appPageInfo)
         if(props.appPageInfo && props.appPageInfo.runFlowId && props.appPageInfo.runFlowId != "0" && props.appPageInfo.runFlowId != ""){
-            gainRunTaskFlow({id:props.appPageInfo.runFlowIdStr})
+            gainRunTaskFlow({id:props.appPageInfo.runFlowId})
                 .then(({data})=>{
                     console.log("获取流程==2==>",data)
                     flowMap.value = data.flowList
diff --git a/src/views/formTable/taskListPage.vue b/src/views/formTable/taskListPage.vue
index 720b9a0..6153403 100644
--- a/src/views/formTable/taskListPage.vue
+++ b/src/views/formTable/taskListPage.vue
@@ -451,10 +451,10 @@ const setUpClick = (val:string,id:string) => {
                         message: data.mag,
                         type: "success",
                     });
-                    cardPageRef.value.getPageData();
+                    cardPageRef.value.requeryList();
                 });
             }).catch(() => {
-                cardPageRef.value.getPageData();
+                cardPageRef.value.requeryList();
             });
         }else{
             ElMessage.error("你还未选中要删除的项目！");