Revert "取消无感登录"

This reverts commit 5facd34b08.

# Conflicts:
#	src/views/login/index.vue

src/api/common/tableButton.ts

@@ -1,21 +0,0 @@
-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;
-}

src/api/lowCode/form/type.ts

@@ -70,7 +70,6 @@ export interface tableFormStruct {
 	},
     dict: Object,
     refreshTable: boolean,
-	isOpen:boolean,
 	view:{
 		list:{
 			status:boolean,

src/components/lowCode/assistant/videoUpAndPlay.vue

@@ -41,33 +41,18 @@ 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>

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'
@@ -553,7 +553,6 @@ const currentComponent = computed(() => {
     }
     return `el-${props.data.type}`
 })
-
 </script>
 <template>
     <div>{{data.type}}
@@ -564,7 +563,6 @@ const currentComponent = computed(() => {
         <template v-if="data.type=='index'">
         </template>
         <template class="form-value" v-else>
-        
             <el-form-item
                 v-bind="data.item"
                 :prop="tProp || data.name"

src/views/formTable/myTask.vue

@@ -61,12 +61,10 @@ const gainAppTaskList = () => {
                     if(data.data.list){
                         appTaskList.value.push(...data.data.list)
                     }
-                    let allPageCount = data.data.total
+                    
-                    console.log("获取任务列表内容=====111======>",allPageCount,logCount.value)
+                    if(data.total > 0){
-                    if(allPageCount > 0){
+                        if(logCount.value < data.total){
-                        if(logCount.value < allPageCount){
+                            let pagenum = searchInfo.pagesize - data.count
-                            let pagenum = searchInfo.pagesize - data.data.count
-                            console.log("获取任务列表内容====pagenum=======>",pagenum)
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -75,15 +73,8 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            loadText.value = ""
-                            if (pagenum < 0) {
+                            loadingList.value = true
-                                loadText.value = ""
-                                loadingList.value = true
-                            }else{
-                                loadText.value = "此选项没有数据！"
-                                loadingList.value = true
-                            }
-                            
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
@@ -101,9 +92,9 @@ const gainAppTaskList = () => {
                         appTaskList.value.push(...data.data.list)
                     }
                     
-                    if(data.data.total > 0){
+                    if(data.total > 0){
-                        if(logCount.value < data.data.total){
+                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            let pagenum = searchInfo.pagesize - data.count
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -112,14 +103,8 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            loadText.value = ""
-                            if (pagenum < 0) {
+                            loadingList.value = true
-                                loadText.value = ""
-                                loadingList.value = true
-                            }else{
-                                loadText.value = "此选项没有数据！"
-                                loadingList.value = true
-                            }
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
@@ -137,9 +122,9 @@ const gainAppTaskList = () => {
                         appTaskList.value.push(...data.data.list)
                     }
                     
-                    if(data.data.total > 0){
+                    if(data.total > 0){
-                        if(logCount.value < data.data.total){
+                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            let pagenum = searchInfo.pagesize - data.count
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -148,14 +133,8 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            loadText.value = ""
-                            if (pagenum < 0) {
+                            loadingList.value = true
-                                loadText.value = ""
-                                loadingList.value = true
-                            }else{
-                                loadText.value = "此选项没有数据！"
-                                loadingList.value = true
-                            }
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
@@ -174,9 +153,9 @@ const gainAppTaskList = () => {
                         appTaskList.value.push(...data.data.list)
                     }
                     
-                    if(data.data.total > 0){
+                    if(data.total > 0){
-                        if(logCount.value < data.data.total){
+                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            let pagenum = searchInfo.pagesize - data.count
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -185,14 +164,8 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            loadText.value = ""
-                            if (pagenum < 0) {
+                            loadingList.value = true
-                                loadText.value = ""
-                                loadingList.value = true
-                            }else{
-                                loadText.value = "此选项没有数据！"
-                                loadingList.value = true
-                            }
                         }
                     }else{
                         loadText.value = "此选项没有数据！"
@@ -205,11 +178,11 @@ const gainAppTaskList = () => {
             gainAppAllTaskList(searchInfo)
                 .then(({data}) => {
                     console.log("获取列表内容",data)
-                    logCount.value = logCount.value + data.data.count
+                    logCount.value = logCount.value + data.count
                     appTaskList.value.push(...data.list)
-                    if(data.data.total > 0){
+                    if(data.total > 0){
-                        if(logCount.value < data.data.total){
+                        if(logCount.value < data.total){
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            let pagenum = searchInfo.pagesize - data.count
                             if (pagenum > 0) {
                                 loadText.value = ""
                                 loadingList.value = true
@@ -218,14 +191,8 @@ const gainAppTaskList = () => {
                                 loadingList.value = false
                             }
                         }else{
-                            let pagenum = searchInfo.pagesize - data.data.count
+                            loadText.value = ""
-                            if (pagenum < 0) {
+                            loadingList.value = true
-                                loadText.value = ""
-                                loadingList.value = true
-                            }else{
-                                loadText.value = "此选项没有数据！"
-                                loadingList.value = true
-                            }
                         }
                     }else{
                         loadText.value = "此选项没有数据！"

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.runFlowId})
+            gainRunTaskFlow({id:props.appPageInfo.runFlowIdStr})
                 .then(({data})=>{
                     console.log("获取流程==2==>",data)
                     flowMap.value = data.flowList

src/views/formTable/taskListPage.vue

@@ -451,10 +451,10 @@ const setUpClick = (val:string,id:string) => {
                         message: data.mag,
                         type: "success",
                     });
-                    cardPageRef.value.requeryList();
+                    cardPageRef.value.getPageData();
                 });
             }).catch(() => {
-                cardPageRef.value.requeryList();
+                cardPageRef.value.getPageData();
             });
         }else{
             ElMessage.error("你还未选中要删除的项目！");

src/views/login/index.vue

@@ -50,16 +50,11 @@ onBeforeMount(() => {
         }
 
     }else{
-        console.log("=======levere=======>",route.query.userkey,route.query.token)
+        console.log("=======3=======>",route.query.userkey,route.query.token)
         userPinia.getInfo()
-        nextTick(() => {
+        router.push('/')
-            router.push('/')
-        })
     }
     
-
-    // xingzhi.value = 1
-    // getSignCode()
 })
 const loginForm = ref(ElForm);  //表单实例化