add

.hbuilderx/launch.json

@@ -2,8 +2,15 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
-        }
+        },
+	{
+		"app-plus" : 
+		{
+			"launchtype" : "local"
+		},
+		"type" : "uniCloud"
+	}
     ]
 }

.idea/workspace.xml

@@ -2,19 +2,20 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
+      <change beforePath="$PROJECT_DIR$/.hbuilderx/launch.json" beforeDir="false" afterPath="$PROJECT_DIR$/.hbuilderx/launch.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/http/baseApi.js" beforeDir="false" afterPath="$PROJECT_DIR$/http/baseApi.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/manifest.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Workorder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Workorder.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/index/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/login/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/login.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/uni.scss" beforeDir="false" afterPath="$PROJECT_DIR$/uni.scss" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/manifest.json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -28,34 +29,44 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue">
+        <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2070">
-              <caret line="69" selection-start-line="69" selection-end-line="69" />
+            <state relative-caret-position="239">
+              <caret line="61" column="28" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="28" />
+              <folding>
+                <element signature="n#view#2;n#view#0;n#template#0;n#!!top" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1320">
-              <caret line="44" column="45" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" />
+            <state relative-caret-position="539">
+              <caret line="145" selection-start-line="145" selection-end-line="145" />
+              <folding>
+                <element signature="n#style#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="e#1561#1611#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pages/index/BillPending/BillPending.vue">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="189">
-              <caret line="436" column="44" selection-start-line="436" selection-start-column="44" selection-end-line="436" selection-end-column="44" />
-              <folding>
-                <element signature="n#style#0;n#view#1;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#view#1;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#view#2;n#view#0;n#u-popup#0;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#view#2;n#view#0;n#u-popup#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="2160">
+              <caret line="72" column="48" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="48" />
             </state>
           </provider>
         </entry>
@@ -71,26 +82,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>editdata</find>
-      <find>_htOption</find>
-      <find>showdct</find>
-      <find>getpayrecord</find>
-      <find>closepay</find>
-      <find>paytall</find>
-      <find>paytall1</find>
-      <find>name</find>
-      <find>model1</find>
-      <find>Predeposit</find>
-      <find>Confirmationpaymentjine</find>
-      <find>showpay</find>
-      <find>paybills</find>
-      <find>zhifu</find>
-      <find>zhifuleft</find>
-      <find>likezhifu</find>
       <find>zhifuright</find>
       <find>zhifumk</find>
       <find>canceltype</find>
-      <find>confirmtype</find>
       <find>BaseApi</find>
       <find>zhifucanvas</find>
       <find>canys</find>
@@ -101,6 +95,23 @@
       <find>queryOrder</find>
       <find>Immediatepayment</find>
       <find>Confirmationpayment</find>
+      <find>typechange</find>
+      <find>confirmtype</find>
+      <find>seedetail</find>
+      <find>Currentamount</find>
+      <find>Workordertodone</find>
+      <find>projectId</find>
+      <find>deviceArr</find>
+      <find>getuserInfo</find>
+      <find>getuserInfoname</find>
+      <find>pd</find>
+      <find>totalnumber</find>
+      <find>getuserInfophone</find>
+      <find>indexList</find>
+      <find>Onlinewarranty</find>
+      <find>dataForm</find>
+      <find>设备异常</find>
+      <find>Punchindata</find>
     </findStrings>
     <replaceStrings>
       <replace>repairRegioncontactPerson</replace>
@@ -118,6 +129,11 @@
         <option value="$PROJECT_DIR$/http/baseApi.js" />
         <option value="$PROJECT_DIR$/utils/qrcode.js" />
         <option value="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" />
+        <option value="$PROJECT_DIR$/pages/index/EquipmentException/EquipmentException.vue" />
+        <option value="$PROJECT_DIR$/pages.json" />
+        <option value="$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue" />
+        <option value="$PROJECT_DIR$/pages/index/index.vue" />
+        <option value="$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.vue" />
       </list>
     </option>
   </component>
@@ -163,14 +179,14 @@
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
               <item name="index" type="462c0819:PsiDirectoryNode" />
-              <item name="BillPending" type="462c0819:PsiDirectoryNode" />
+              <item name="Immediateinspection" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
               <item name="index" type="462c0819:PsiDirectoryNode" />
-              <item name="Onlinewarranty" type="462c0819:PsiDirectoryNode" />
+              <item name="Withholdingrecord" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
@@ -244,12 +260,13 @@
       <workItem from="1680939102464" duration="5415000" />
       <workItem from="1681086898029" duration="593000" />
       <workItem from="1681105513481" duration="9579000" />
-      <workItem from="1681172833354" duration="13890000" />
+      <workItem from="1681172833354" duration="23497000" />
+      <workItem from="1681258597059" duration="5548000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="32508000" />
+    <option name="totallyTimeSpent" value="47663000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
@@ -279,13 +296,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="85" column="51" selection-start-line="85" selection-start-column="12" selection-end-line="85" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1080">
@@ -320,50 +330,111 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
+    <entry file="file://$PROJECT_DIR$/http/baseApi.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="62" selection-start-column="17" selection-end-column="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/utils/qrcode.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="279">
-          <caret line="72" column="48" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="48" />
+          <caret line="411" column="38" selection-start-line="411" selection-start-column="29" selection-end-line="411" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/http/baseApi.js">
+    <entry file="file://$PROJECT_DIR$/pages/index/BillPending/BillPending.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="62" selection-start-column="17" selection-end-column="62" />
+        <state relative-caret-position="489">
+          <caret line="446" lean-forward="true" selection-start-line="446" selection-end-line="446" />
+          <folding>
+            <element signature="n#style#0;n#view#1;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#1;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#2;n#view#0;n#u-popup#0;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#2;n#view#0;n#u-popup#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="810">
+          <caret line="44" column="45" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2070">
+        <state relative-caret-position="30">
           <caret line="69" selection-start-line="69" selection-end-line="69" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue">
+    <entry file="file://$PROJECT_DIR$/pages/index/EquipmentException/EquipmentException.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1320">
-          <caret line="44" column="45" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" />
+        <state relative-caret-position="549">
+          <caret line="185" column="30" selection-start-line="185" selection-start-column="30" selection-end-line="185" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/qrcode.js">
+    <entry file="file://$PROJECT_DIR$/pages.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="411" column="38" selection-start-line="411" selection-start-column="29" selection-end-line="411" selection-end-column="38" />
+        <state relative-caret-position="420">
+          <caret line="263" column="47" selection-start-line="263" selection-start-column="47" selection-end-line="263" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/BillPending/BillPending.vue">
+    <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2550">
+          <caret line="85" column="30" selection-start-line="85" selection-start-column="12" selection-end-line="85" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="436" column="44" selection-start-line="436" selection-start-column="44" selection-end-line="436" selection-end-column="44" />
+        <state relative-caret-position="719">
+          <caret line="365" column="5" lean-forward="true" selection-start-line="275" selection-start-column="4" selection-end-line="365" selection-end-column="5" />
           <folding>
-            <element signature="n#style#0;n#view#1;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#view#1;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#2;n#view#0;n#u-popup#0;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#2;n#view#0;n#u-popup#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#view#1;n#view#0;n#template#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="239">
+          <caret line="61" column="28" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="28" />
+          <folding>
+            <element signature="n#view#2;n#view#0;n#template#0;n#!!top" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2160">
+          <caret line="72" column="48" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="539">
+          <caret line="145" selection-start-line="145" selection-end-line="145" />
+          <folding>
+            <element signature="n#style#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="e#1561#1611#0" expanded="true" />
           </folding>
         </state>
       </provider>

pages.json

@@ -1,5 +1,5 @@
 {
-	"pages": [ 
+	"pages": [
 
 
 		{
@@ -30,13 +30,13 @@
 			"style": {
 				"navigationBarTitleText": "首页"
 			}
-		}, 
+		},
 		// {
 		// 	"path": "pages/equipment/equipment",
 		// 	"style": {
 		// 		"navigationBarTitleText": "设备"
 		// 	}
-		
+
 		// },
 		{
 			"path": "pages/Workorder/Workorder",
@@ -60,193 +60,211 @@
 
 	    ,{
             "path" : "pages/my/Personalinformation/Personalinformation",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "个人信息",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/my/Mydistribution/Mydistribution",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "我的派发",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/my/Mytask/Mytask",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "我的任务",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/my/Commentssuggestions/Commentssuggestions",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "意见建议",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/my/Personalinformation/Informationmodification/Informationmodification",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "个人信息修改",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/my/Changepassword/Changepassword",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "密码修改",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/my/Mytask/Taskdetails/Taskdetails",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "任务详情",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/my/Mydistribution/distributiondetil/distributiondetil",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "派送详情",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/my/Mydistribution/distributionedit/distributionedit",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/Workorder/Tenantbill/Tenantbill",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "租户账单",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/Workorder/Remotecontrol/Remotecontrol",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "远程管控",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/index/Onlinewarranty/Onlinewarranty",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "线上报修",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/index/Inspectionrecord/Inspectionrecord",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "巡检记录",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/index/Withholdingrecord/Withholdingrecord",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "扣缴记录",
                 "enablePullDownRefresh": false
-            }      
+            }
         },
 		  {
 		            "path" : "pages/Workorder/Tenantbill/companybill/companybill",
-		            "style" :                                                                                    
+		            "style" :
 		            {
 		                "navigationBarTitleText": "",
 		                "enablePullDownRefresh": false,
 								"navigationStyle": "custom" // 隐藏系统导航栏
 		            }
-		            
-		        },				
+
+		        },
         {
             "path" : "pages/index/Workordertodone/Workordertodone",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "报修工单",
                 "enablePullDownRefresh": false
             }
-            
-        },				
+
+        },
         {
             "path" : "pages/index/Workordertodone/Workorderdetails/Workorderdetails",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "详情",
                 "enablePullDownRefresh": false
             }
-            
+
         }
-       
+
         ,{
             "path" : "pages/index/Immediatecollection/Immediatecollection",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "欠费待收",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/index/Immediatecollection/Chargedetails/Chargedetails",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "详情",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/Workorder/pay/pay",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "支付",
                 "enablePullDownRefresh": false
             }
-            
+
         }
         ,{
             "path" : "pages/index/BillPending/BillPending",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "账单详情",
                 "enablePullDownRefresh": false
             }
-            
+
+        }
+        ,{
+            "path" : "pages/index/EquipmentException/EquipmentException",
+            "style" :
+            {
+                "navigationBarTitleText": "设备异常",
+                "enablePullDownRefresh": false
+            }
+
+        }
+        ,{
+            "path" : "pages/index/Immediateinspection/Immediateinspection",
+            "style" :
+            {
+                "navigationBarTitleText": "巡检打卡",
+                "enablePullDownRefresh": false
+            }
+
         }
     ],
 	"globalStyle": {
@@ -282,7 +300,7 @@
 				"iconPath": "static/tab/w1.png",
 							"selectedIconPath": "static/tab/w2.png",
 				"text": "工作台"
-			},			
+			},
 			// {
 			// 	"pagePath": "pages/Energyconsumption/Energyconsumption",
 			// 	"iconPath": "static/tab/e1.png",

pages/Workorder/Workorder.vue

@@ -21,15 +21,15 @@
 			</view>
 			
 			
-			<view class="managename" @click="pay">
+			<!-- <view class="managename" @click="pay">
 				<view class="managename1">
 					<!-- <img :src='srcyuanc' alt=""> -->
-						<u--image  mode="widthFix"  :src="srcyuanc" width="48rpx" height="48rpx"></u--image>
+					<!-- 	<u--image  mode="widthFix"  :src="srcyuanc" width="48rpx" height="48rpx"></u--image>
 				</view>
 				<view class="managename2">
 					支付功能
 				</view>
-			</view>
+			</view> -->
 		</view>
 	
 		
@@ -55,11 +55,11 @@
 					url: '/pages/Workorder/Remotecontrol/Remotecontrol'
 				})
 			},
-			pay(){
-				uni.navigateTo({
-					url: '/pages/Workorder/pay/pay'
-				})
-			},
+			// pay(){
+			// 	uni.navigateTo({
+			// 		url: '/pages/Workorder/pay/pay'
+			// 	})
+			// },
 		}
 	}
 </script>

pages/index/EquipmentException/EquipmentException.vue

@@ -0,0 +1,320 @@
+<template>
+	<view class="billall">
+		<u-cell-group class="toptemplate">
+			<u-cell :title="mytitle"  @click="floorchange">
+				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
+				<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
+			</u-cell>
+		</u-cell-group>
+
+
+		<view class="u-listdata">
+
+			<view style="padding:10rpx 0 0 30rpx">
+				共有 <span style="color: red">{{totalnumber}}</span>条记录
+			</view>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+				<u-list-item v-for="(item, index) in indexList" :key="index">
+					<view class="companylist" >
+						<h3>{{item.deviceName}}</h3>
+						<view class="Currentamount">
+							空间信息:跨境电商大厦-{{ item.positionInfo }}
+						</view>
+						<view class="Currentamount">
+							设备编号: {{ item.deviceNo }}
+						</view>
+						<view class="Currentamount">
+							告警原因: <span>{{item.alertConfigName}}</span>
+						</view>
+						<view class="Currentamount">
+							告警内容: {{item.content}}
+						</view>
+
+					</view>
+
+				</u-list-item>
+			</u-list>
+
+		</view>
+
+
+		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
+				  :columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
+
+
+		<u-notify ref="uNotify" :show="showdct" message="服务器请求失败"></u-notify>
+	</view>
+</template>
+
+<script>
+	//import { isEmpty, getDictDataList } from "@/utils/index";
+	export default {
+		components: {
+
+		},
+		data() {
+
+			return {
+				totalnumber: 0,
+				setyesno: true,
+				indexList: [],
+				dataList: [],
+				dataForm: {
+					buildingId: "",
+					storeyId: "",
+				//	page: 1,
+				//	limit: 10,
+				},
+				pd: true,
+				showtype: false,
+				showdct: false,
+				mytitle: '',
+				alldata: [],
+				showfloor: false,
+				loading: false,
+				columns: [],
+				columnData: [],
+				myday: '',
+				mytype: '全部',
+				showPicker: false,
+				//myday: currentDate,
+				columnstype: [
+
+				],
+
+
+
+			}
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+		onLoad() {
+
+			// let getDictDataList = uni.getStorageSync('getDictDataList');
+			//
+			// for (let i = 0; i < getDictDataList.length; i++) {
+			// 	if (getDictDataList[i].dictType == 'PayType') {
+			// 		this.columnstype = [getDictDataList[i].dataList]
+			// 	}
+			// }
+
+
+			this.getfloor();
+			//	this.loadmore();
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {
+			// 微信小程序需要用此写法
+
+		},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+
+
+		methods: {
+
+			scrolltolower() {
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return
+				}
+			},
+
+			getalldata() {
+				this.$api.get('/home/actualAlertList', this.dataForm)
+						.then(res => {
+						//	this.totalnumber = res.data.data.total;
+							if(res.data.code==0){
+								console.log('111111111111111111',res.data.data)
+								if(res.data.data==null){
+									this.totalnumber=0;
+									this.indexList=[];
+								}else{
+									this.totalnumber=res.data.data.length;
+									this.indexList=res.data.data;
+								}
+							}else{
+								uni.showToast({
+											title: res.data.msg,
+											icon: 'none',
+											duration: 1500
+										})
+							}
+							// if (res.data.data.list.length != 0) {
+							// 	this.indexList.push(...res.data.data.list);
+							// 	this.dataForm.page = this.dataForm.page + 1;
+							// 	this.pd = true;
+							// } else {
+							// 	uni.showToast({
+							// 		title: '暂无更多数据了',
+							// 		icon: 'none',
+							// 		duration: 1500
+							// 	})
+							// 	this.pd = false;
+							// }
+						})
+			},
+
+
+			getfloor() {
+				this.$api.get('/control/getOrgStructureTree/', {})
+						.then(res => {
+
+							if (res.data.code == 0) {
+							//	this.dataForm.projectId = res.data.data[0].orgId;
+
+								this.mytitle = res.data.data[0].orgName;
+								this.alldata = res.data.data[0].childrenList;
+								//console.log('111111111111111111',  res.data.data[0].childrenList)
+								this.columns = [
+									res.data.data[0].childrenList,
+									res.data.data[0].childrenList[0].childrenList
+								]
+								let allfloor = [];
+								for (let i = 0; i < res.data.data[0].childrenList.length; i++) {
+									allfloor.push(res.data.data[0].childrenList[i].childrenList)
+								}
+								//  console.log('111111111111111111',allfloor)
+								this.columnData = allfloor;
+							//	this.dataForm.page = 1;
+								this.getalldata();
+							} else {
+								this.showdct = true
+							}
+						})
+			},
+
+			floorchange() {
+				this.showfloor = true;
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					index,
+					// 微信小程序无法将picker实例传出来，只能通过ref操作
+					picker = this.$refs.uPicker
+				} = e
+				if (columnIndex === 0) {
+					this.loading = true
+					picker.setColumnValues(1, this.columnData[index])
+					this.loading = false
+				}
+			//	this.getalldata();
+			},
+			confirmfloor(e) {
+				console.log('222222', e.value)
+				this.mytitle = e.value[0].orgName + e.value[1].orgName;
+				this.dataForm.buildingId = e.value[0].orgId;
+				this.dataForm.storeyId = e.value[1].orgId;
+				this.showfloor = false;
+				this.getalldata();
+			},
+			cancelfloor() {
+				this.showfloor = false;
+			},
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.Currentamount {
+		padding-left: 30rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		color: #BCB3A7;
+
+		span {
+			color: #FA5555;
+			padding-left: 9rpx;
+		}
+	}
+
+	.Callfee {
+		width: 100rpx;
+		height: 45rpx;
+		text-align: center;
+		line-height: 45rpx;
+		color: #5C8FFF;
+		border: 1px solid #5C8FFF;
+		font-size: 22rpx;
+		position: absolute;
+		bottom: 10rpx;
+		right: 10px;
+		font-weight: bold;
+	}
+
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		height: 280rpx;
+		border-radius: 10px;
+		position: relative;
+
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+
+	.settled {
+		background-color: #09C700;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+	.outstanding {
+		background-color: #30D3A2;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+
+
+	.billall {}
+
+	.topbill {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100rpx;
+		background-color: #e6e6e6;
+	}
+
+	.topbilledit {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+	}
+
+	.changetime1 {
+		padding-right: 10rpx;
+	}
+</style>

pages/index/Immediateinspection/Immediateinspection.vue

@@ -0,0 +1,383 @@
+<template>
+	<view class="">
+		<view class="getuserInfo">
+			<view class="getuserInfoimg">
+				<u--image :src="src" width="120rpx" height="120rpx"></u--image>
+			</view>
+			<view class="getuserInfoname">
+				<h3>{{getuserInfo.realName}}</h3>
+				<view>安保组</view>
+			</view>
+			<view class="getuserInfophone">
+				<view class="getuserInfophone1">
+					<u-icon name="phone" color="#2979ff" size="36"></u-icon>
+				</view>
+				<view class="getuserInfophone2">{{getuserInfo.mobile}}</view>
+			</view>
+		</view>
+		<!--打卡-->
+		<view class="Punchin">
+			<view class="dakaweizhi">
+				<view class="dakaweizhi1">
+					<u-icon name="map" color="#6DD400" size="36"></u-icon>
+				</view>
+				<view class="dakaweizhi2">当前打卡位置：{{Punchposition}}</view>
+			</view>
+			<view class="shexiangji" @click="Punchindata">
+				<view class="shexiangji1">扫码打卡</view>
+				<view class="shexiangji2">
+					<u-icon name="camera" color="#ffffff" size="90"></u-icon>
+				</view>
+			</view>
+		</view>
+		<view class="dakajilv">今日打卡记录</view>
+		<view class="u-listdata">
+			<view style="padding:10rpx 0 0 30rpx">
+				共有 <span style="color: red">{{totalnumber}}</span>条记录
+			</view>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+				<u-list-item v-for="(item, index) in indexList" :key="index">
+					<view class="companylist">
+						<h3>{{item.position}}</h3>
+						<view class="Currentamount">
+							巡检时间:{{item.circuitTime}}
+						</view>
+					</view>
+				</u-list-item>
+			</u-list>
+
+		</view>
+
+		<u-notify ref="uNotify" message=""></u-notify>
+	</view>
+</template>
+
+<script>
+	import {
+		getCurrentTime
+	} from "@/utils/index";
+	export default {
+		data() {
+			return {
+				Punchposition: '',
+				getuserInfo: {},
+				pd: true,
+				totalnumber: 0,
+				indexList: [],
+				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				dataForm: {
+					page: 1,
+					limit: 10,
+					circuitType: "",
+					startDate: "",
+					endDate: "",
+					buildingId: "",
+					storeyId: "",
+					circuitPersonId: "",
+				},
+			}
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+		onLoad() {
+			this.getuserInfo = uni.getStorageSync('getuserInfo');
+			console.log('111111111111111111', this.getuserInfo)
+
+			var date = new Date();
+			var year = date.getFullYear();
+			var month = date.getMonth() + 1;
+			var day = date.getDate();
+			//	this.circuitPosition = this.$route.query.circuitPosition;
+			this.dataForm.startDate = `${year}-${month}-${day}` + " 00:00:00";
+			this.dataForm.endDate = `${year}-${month}-${day}` + " 23:59:59";
+			this.dataForm.circuitPersonId = this.getuserInfo.id;
+			//	this.dataForm.circuitType = this.userInfo.circuitType;
+			//	console.log('111111111111111111',this.dataForm)
+			this.getDataList();
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+		methods: {
+			Punchindata() {
+
+				uni.scanCode({
+					//是否只能从相机扫码,不能从相册扫码
+					onlyFromCamera: false,
+					//规定扫码类型  字节跳动小程序不支持此参数
+					// barcode就是一维码(条形码)  qrcode就是(er)维码
+					// datamatrix就是Data Matrix码   pdf417就是PDF417条码
+					scanType: ['barCode', 'qrCode', ],
+					// 是否启动自动识别字符编码功能
+					autoDecodeCharset: false,
+					// 是否开启自动放大功能  仅 App-Android (3.5.4+) 支持
+					autoZoom: false,
+					// 是否支持手动输入条形码  仅飞书小程序（V3.14.0）支持
+					barCodeInput: false,
+					success: (res) => {
+						//console.log('111111111111111111', JSON.parse(res.result))
+						let lsdata = JSON.parse(res.result)
+						this.Punchposition = lsdata.position;
+						let postdata = {
+							"buildingId": lsdata.buildingId, //楼宇id
+							"storeyId": lsdata.storeyId, //楼层id
+							//"houseId": lsdata.buildingId, //房间id
+							"position": lsdata.position, //位置信息
+							"circuitPersonId": this.getuserInfo.id, //巡检人员id
+
+							"circuitTime": getCurrentTime(), //巡检时间
+							//  "circuitType": this.getuserInfo.circuitType,//巡检类型
+							"circuitType": '', //巡检类型
+							"remark": lsdata.remark, //备注
+
+						}
+
+						this.$api.post('/circuitrecord', postdata)
+							.then(res => {
+								console.log('99999', res)
+								if (res.data.code == 0) {
+									this.$refs.uNotify.success('打卡成功')
+									this.getDataListtwo();
+
+								} else {
+									this.$refs.uNotify.error('打卡失败')
+								}
+							})
+					},
+					fail: (error) => {
+						this.$refs.uNotify.error(error)
+
+					}
+				})
+			},
+			getDataListtwo() {
+				this.dataForm.page = 1;
+				this.$api.get('/circuitrecord/page', this.dataForm)
+					.then(res => {
+						//console.log('111111111111111111',res.data.data)
+						this.totalnumber = res.data.data.total;
+						this.indexList = res.data.data.list;
+					})
+			},
+
+
+			scrolltolower() {
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return
+				}
+			},
+			getDataList() {
+
+				this.$api.get('/circuitrecord/page', this.dataForm)
+					.then(res => {
+						//console.log('111111111111111111',res.data.data)
+						this.totalnumber = res.data.data.total;
+						if (res.data.data.list.length != 0) {
+							this.indexList.push(...res.data.data.list);
+							this.dataForm.page = this.dataForm.page + 1;
+							this.pd = true;
+						} else {
+							uni.showToast({
+								title: '暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.pd = false;
+						}
+					})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.dakajilv {
+		color: #666;
+		font-size: 32rpx;
+		padding-left: 30rpx;
+	}
+
+	.Currentamount {
+		padding-left: 30rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		color: #BCB3A7;
+
+		span {
+			color: #FA5555;
+			padding-left: 9rpx;
+		}
+	}
+
+	.Callfee {
+		width: 100rpx;
+		height: 45rpx;
+		text-align: center;
+		line-height: 45rpx;
+		color: #5C8FFF;
+		border: 1px solid #5C8FFF;
+		font-size: 22rpx;
+		position: absolute;
+		bottom: 10rpx;
+		right: 10px;
+		font-weight: bold;
+	}
+
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		height: 140rpx;
+		border-radius: 10px;
+		position: relative;
+
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+
+	.settled {
+		background-color: #09C700;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+	.outstanding {
+		background-color: #30D3A2;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+
+
+	.billall {}
+
+	.topbill {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100rpx;
+		background-color: #e6e6e6;
+	}
+
+	.topbilledit {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+	}
+
+	.changetime1 {
+		padding-right: 10rpx;
+	}
+
+	.shexiangji1 {
+		color: #fff;
+		font-size: 36rpx;
+		font-weight: bold;
+	}
+
+	.shexiangji {
+		width: 300rpx;
+		height: 300rpx;
+		border-radius: 50%;
+		background: #5C8FFF;
+		margin: 0 auto;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.dakaweizhi2 {
+		color: #999;
+		font-size: 26rpx;
+	}
+
+	.dakaweizhi {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 690rpx;
+		height: 300rpx;
+	}
+
+	.Punchin {
+		width: 690rpx;
+		margin: 30rpx auto;
+		background: #fff;
+		height: 690rpx;
+	}
+
+	.getuserInfo {
+		display: flex;
+		align-items: center;
+		width: 690rpx;
+		margin: 0 auto;
+		background: #fff;
+		height: 160rpx;
+		border-radius: 10rpx;
+	}
+
+	.getuserInfoimg {
+		margin-left: 20rpx;
+		margin-right: 30rpx;
+	}
+
+	.getuserInfoname {
+		height: 120rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		margin-right: 20rpx;
+
+		h3 {
+			color: #333;
+			font-size: 32rpx;
+		}
+
+		view {
+			color: #999;
+			font-size: 24rpx;
+		}
+	}
+
+	.getuserInfophone {
+		height: 120rpx;
+		display: flex;
+		align-items: flex-start;
+	}
+
+	.getuserInfophone2 {
+		color: #666;
+		font-size: 28rpx;
+	}
+</style>

pages/index/Inspectionrecord/Inspectionrecord.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="billall">
 		<u-cell-group class="toptemplate">
-			<u-cell :title="mytitle"  @click="floorchange">
-				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>				
-					<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
+			<u-cell :title="mytitle" @click="floorchange">
+				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
+				<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
 			</u-cell>
 		</u-cell-group>
 		<view class="topbill">
@@ -52,28 +52,19 @@
 
 			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
 				<u-list-item v-for="(item, index) in indexList" :key="index">
-					<view class="companylist" @click="seedetail(item)">
-						<view class="settled" v-if="item.status==1">
-							已结清
-						</view>
-						<view class="outstanding" v-if="item.status==0">
-							未结清
-						</view>
-						<h3>{{item.name}}</h3>
+					<view class="companylist">
+						<h3>{{item.position}}</h3>
 						<view class="Currentamount">
-							本期金额: <span>￥{{item.feeTotal}}</span>
+							巡检类型: 安保
 						</view>
 						<view class="Currentamount">
-							欠费天数: {{item.elecAmount}}
+							巡检人员: {{item.circuitPerson.realName}}
 						</view>
 						<view class="Currentamount">
-							账户余额:￥{{item.balance}}
+							联系电话:￥{{item.circuitPerson.mobile}}
 						</view>
 						<view class="Currentamount">
-							联系电话: {{item.tel}}
-						</view>
-						<view class="Callfee" v-if="item.status==0" @click.stop="handleClick(item.id)">
-							催费
+							巡检时间: {{item.circuitTime}}
 						</view>
 					</view>
 
@@ -101,7 +92,7 @@
 	// import tTh from '@/components/t-table/t-th.vue';
 	// import tTr from '@/components/t-table/t-tr.vue';
 
-import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup';
+	import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup';
 
 	// import tTd from '@/components/t-table/t-td.vue';
 	export default {
@@ -134,18 +125,20 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 				// ],
 				indexList: [],
 				xjlx: '巡检类型',
-				
+
 				dataList: [],
 				dataForm: {
 					projectId: "",
 					buildingId: "",
 					storeyId: "",
+					circuitType: "",
+					
 					cycle: "",
-					status: "",
+					//status: "",
+					
 					page: 1,
 					limit: 10,
 				},
-
 				showtype: false,
 				showdct: false,
 				mytitle: '',
@@ -183,17 +176,16 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad() {
 			let getDictDataList = uni.getStorageSync('getDictDataList');
+			console.log('111111111111111111', getDictDataList)
 
 			for (let i = 0; i < getDictDataList.length; i++) {
 				if (getDictDataList[i].dictType == 'ReviewType') {
-					console.log(getDictDataList[i].dataList,"1231313135646");
-					let pushdata={
+					let pushdata = {
 						dictLabel: "全部",
-						dictValue:"",
+						dictValue: "",
 					}
 					getDictDataList[i].dataList.unshift(pushdata)
-					
-					
+
 					this.columnstypexunjian = [getDictDataList[i].dataList]
 				}
 			}
@@ -219,27 +211,14 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 
 
 		methods: {
-			seedetail(e) {
-				console.log('222', e)
-			},
-			handleClick(e) {
-				console.log('111111111111111111', e)
-
-			},
+			
 			scrolltolower() {
-				if(this.pd){
+				if (this.pd) {
 					this.getalldata();
-				}else{
-					 return
+				} else {
+					return
 				}
 			},
-			loadmore() {
-				// for (let i = 0; i < 30; i++) {
-				// 	this.indexList.push({
-				// 		url: this.urls[uni.$u.random(0, this.urls.length - 1)]
-				// 	})
-				// }
-			},
 			xunjianchange() {
 				this.showtypexunjian = true;
 			},
@@ -247,26 +226,26 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 				this.showtypexunjian = false;
 			},
 			confirmxunjian(e) {
-
+				  console.log('111111111111111111',e)
 				this.xjlx = e.value[0].dictLabel;
-				// this.dataForm.cycle = e.value[0].id;
-				// this.dataForm.page = 1;
-				// this.getalldata();
-
+				 this.dataForm.circuitType = e.value[0].dictValue;
+				this.indexList=[];
+				this.dataForm.page = 1;
+				this.getalldata();
 				this.showtypexunjian = false;
 			},
 
 			getalldata() {
 				this.$api.get('/circuitrecord/page', this.dataForm)
 					.then(res => {
-						
+
 						this.totalnumber = res.data.data.total;
 						//  console.log('111111111111111111',res.data.data.list)
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
 							this.dataForm.page = this.dataForm.page + 1;
 							this.pd = true;
-							
+
 						} else {
 							uni.showToast({
 								title: '暂无更多数据了',
@@ -280,17 +259,15 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 
 					})
 			},
-			// edit(item) {
-			// 	console.log('111111111111111111', item)
-			// },
+			
 			canceltype() {
 				this.showtype = false;
 			},
 			confirmtype(e) {
-				//	console.log('111111111111111111', e.value[0])
 				this.showtype = false;
 				this.xjry = e.value[0].label;
 				this.dataForm.cycle = e.value[0].id;
+				this.indexList=[];
 				this.dataForm.page = 1;
 				this.getalldata();
 			},
@@ -300,6 +277,7 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 			dateChange(e) {
 				this.myday = e.target.value;
 				this.dataForm.cycle = e.target.value;
+				this.indexList=[];
 				this.dataForm.page = 1;
 				this.getalldata();
 			},
@@ -336,6 +314,7 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 							}
 							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
+							this.indexList=[];
 							this.dataForm.page = 1;
 							this.getalldata();
 						} else {
@@ -359,7 +338,7 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 					picker.setColumnValues(1, this.columnData[index])
 					this.loading = false
 				}
-				this.getalldata();
+			//	this.getalldata();
 			},
 			confirmfloor(e) {
 				console.log('222222', e.value)
@@ -367,6 +346,8 @@ import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup
 				this.dataForm.buildingId = e.value[0].orgId;
 				this.dataForm.storeyId = e.value[1].orgId;
 				this.showfloor = false;
+				this.indexList=[];
+				this.dataForm.page = 1;
 				this.getalldata();
 			},
 			cancelfloor() {

pages/index/Withholdingrecord/Withholdingrecord.vue

@@ -2,7 +2,7 @@
 	<view class="billall">
 		<u-cell-group class="toptemplate">
 			<u-cell :title="mytitle"  @click="floorchange">
-				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>				
+				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
 					<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
 			</u-cell>
 		</u-cell-group>
@@ -36,12 +36,7 @@
 				<u-list-item v-for="(item, index) in indexList" :key="index">
 
 					<view class="companylist" @click="seedetail(item)">
-						<!-- <view class="settled" v-if="item.status==1">
-					已结清
-				</view> -->
-						<!-- 	<view class="outstanding" v-if="item.status==0">
-					未结清
-				</view> -->
+
 						<view class="outstanding">
 							预存
 						</view>
@@ -168,7 +163,7 @@
 					return
 				}
 			},
-			
+
 			getalldata() {
 				this.$api.get('/payrecord/page', this.dataForm)
 					.then(res => {
@@ -224,7 +219,7 @@
 
 							this.mytitle = res.data.data[0].orgName;
 							this.alldata = res.data.data[0].childrenList;
-							//console.log('111111111111111111',  res.data.data[0].childrenList)			
+							//console.log('111111111111111111',  res.data.data[0].childrenList)
 							this.columns = [
 								res.data.data[0].childrenList,
 								res.data.data[0].childrenList[0].childrenList
@@ -258,7 +253,7 @@
 					picker.setColumnValues(1, this.columnData[index])
 					this.loading = false
 				}
-				this.getalldata();
+			//	this.getalldata();
 			},
 			confirmfloor(e) {
 				console.log('222222', e.value)

pages/index/index.vue

@@ -26,11 +26,39 @@
 					</view>
 				</view>
 			</view>
-			
+
 		</view>
 		<!-- <view class="kongbai">
-			
+
 		</view> -->
+		<view class="pending" >
+			<view class="pending_middle" >
+				<view class="all"  >
+					<view class="work">
+						<span style="font-size: 30rpx;font-weight: bold;">实时巡检</span>
+					</view>
+					<view class="processing">
+						<view class="immediately" @click="Immediateinspection">
+							<span style="font-size: 25rpx; color: #5c8fff; ">立即巡检</span>
+							<u-icon name="arrow-right" color="#5c8fff" size="16rpx"></u-icon>
+						</view>
+
+					</view>
+				</view>
+				<view class="wait" >
+					<view  >
+						<view style="font-size: 26rpx;color: #697081;">今日待巡检</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{inspectionInfoList.todayTotalNum}}</view>
+					</view>
+					<view  >
+						<view style="font-size: 26rpx;color: #697081;">今日已巡检</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{inspectionInfoList.todayNum}}</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+
 		<view class="pending"  v-if="$has('app:Tobeassigned')&&$has('app:Toberepaired')&&$has('app:hasrepaired')">
 			<view class="pending_middle" >
 				<view class="all"   v-if="$has('app:WorkorderTobeDone')">
@@ -61,6 +89,7 @@
 				</view>
 			</view>
 		</view>
+
 		<view class="equipment" v-if="$has('app:EquipmentException')">
 			<view class="pending_middle">
 				<view class="all" v-if="$has('app:LookatImmediately')">
@@ -68,7 +97,7 @@
 						<span style="font-size: 30rpx;font-weight: bold;">设备异常</span>
 					</view>
 					<view class="processing">
-						<view class="immediately">
+						<view class="immediately"  @click="EquipmentException">
 							<span style="font-size: 25rpx; color: #5c8fff; ">立即查看</span>
 							<u-icon name="arrow-right" color="#5c8fff" size="16rpx"></u-icon>
 						</view>
@@ -153,7 +182,7 @@
 				</t-table>
 			</view>
 		</view>
-		
+
 	</view>
 </template>
 
@@ -179,13 +208,13 @@
 				workList: {}, //工单代办
 				deviceArr: {}, //设备异常数据
 getuserInfo:{},
-
+				inspectionInfoList:{},
 			}
 		},
 		onLoad() {
 			this.getalldata();
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
-		
+
 		},
 		methods: {
 			getalldata() {
@@ -194,6 +223,7 @@ getuserInfo:{},
 						//console.log('111111111111111111', res.data.data)
 						this.workList = res.data.data.workOrder;
 						this.deviceArr = res.data.data.equip.maps;
+this.inspectionInfoList=res.data.data.inspectionInfo;
 
 						this.tableList = res.data.data.billPaymentList.map(item => {
 							let json = {};
@@ -208,7 +238,7 @@ getuserInfo:{},
 							json.name = item.payType;
 							json.tenant = item.arrearageNum;
 							json.arrears = item.arrearageAmount;
-							
+
 								json.currentAmount = item.currentAmount;
 								json.cumulativeAmount = item.cumulativeAmount;
 							return json
@@ -231,11 +261,21 @@ getuserInfo:{},
 					url: '/pages/index/Workordertodone/Workordertodone'
 				})
 			},
+			EquipmentException(){
+				uni.navigateTo({
+					url: '/pages/index/EquipmentException/EquipmentException'
+				})
+			},
 			Onlinewarranty() {
 				uni.navigateTo({
 					url: '/pages/index/Onlinewarranty/Onlinewarranty'
 				})
 			},
+			Immediateinspection(){
+				uni.navigateTo({
+					url: '/pages/index/Immediateinspection/Immediateinspection'
+				})
+			},
 			Inspectionrecord() {
 				uni.navigateTo({
 					url: '/pages/index/Inspectionrecord/Inspectionrecord'
@@ -277,7 +317,7 @@ getuserInfo:{},
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
+
 	}
 .kongbai{
 			height: 100rpx;