1

.idea/workspace.xml

@@ -4,17 +4,15 @@
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Tenantbill/companybill/companybill.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Tenantbill/companybill/companybill.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videoplayback/Videoplayback.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videoplayback/Videoplayback.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videosurveillance.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videosurveillance.vue" 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/Immediatecollection/Chargedetails/Chargedetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Immediatecollection/Chargedetails/Chargedetails.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue" 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/index/Immediateinspection/Immediateinspection.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.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/Onlinewarranty/Onlinewarranty.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.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/Workordertodone/Workorderdetails/Workorderdetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Workordertodone/Workorderdetails/Workorderdetails.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.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$/pages/my/Personalinformation/Informationmodification/Informationmodification.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Personalinformation/Informationmodification/Informationmodification.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/my/my.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/uni.scss" beforeDir="false" afterPath="$PROJECT_DIR$/uni.scss" afterDir="false" />
     </list>
@@ -32,44 +30,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="510">
-              <caret line="203" column="114" selection-start-line="203" selection-start-column="8" selection-end-line="203" selection-end-column="114" />
-              <folding>
-                <element signature="n#style#0;n#view#1;n#view#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#view#1;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#view#1;n#view#2;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#1;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#1;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#1;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#1;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#1;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#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <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" />
-                <element signature="n#style#0;n#span#0;n#view#0;n#view#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#1;n#view#0;n#view#0;n#view#3;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#3;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#3;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#3;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#3;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#3;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#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#view#0;n#view#3;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#view#1;n#view#3;n#view#1;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#0;n#view#0;n#view#4;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#4;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#t-table#0;n#view#0;n#view#4;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#5;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#5;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#t-table#0;n#view#0;n#view#5;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="e#6982#7036#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="6630">
+              <caret line="221" column="19" selection-start-line="221" selection-start-column="19" selection-end-line="221" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -77,7 +39,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="600">
+            <state relative-caret-position="3330">
               <caret line="111" column="114" selection-start-line="111" selection-start-column="114" selection-end-line="111" selection-end-column="114" />
             </state>
           </provider>
@@ -86,8 +48,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="447">
-              <caret line="336" column="47" selection-start-line="336" selection-start-column="47" selection-end-line="336" selection-end-column="47" />
+            <state relative-caret-position="9990">
+              <caret line="333" column="6" selection-start-line="333" selection-start-column="6" selection-end-line="333" selection-end-column="6" />
             </state>
           </provider>
         </entry>
@@ -95,8 +57,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="165" column="10" lean-forward="true" selection-start-line="158" selection-start-column="8" selection-end-line="165" selection-end-column="10" />
+            <state relative-caret-position="4950">
+              <caret line="165" column="10" selection-start-line="158" selection-start-column="8" selection-end-line="165" selection-end-column="10" />
               <folding>
                 <element signature="n#style#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#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
@@ -110,8 +72,8 @@
       <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="600">
-              <caret line="121" column="34" selection-start-line="121" selection-start-column="34" selection-end-line="121" selection-end-column="34" />
+            <state relative-caret-position="3570">
+              <caret line="119" column="48" selection-start-line="119" selection-start-column="48" selection-end-line="119" selection-end-column="48" />
             </state>
           </provider>
         </entry>
@@ -119,17 +81,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/uni.scss">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="41" selection-start-line="41" selection-start-column="2" selection-end-line="43" selection-end-column="3" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/Workorder/Workorder.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="549">
-              <caret line="129" column="32" lean-forward="true" selection-start-line="129" selection-start-column="32" selection-end-line="129" selection-end-column="32" />
+            <state relative-caret-position="1230">
+              <caret line="41" selection-start-line="43" selection-start-column="2" selection-end-line="45" selection-end-column="3" />
             </state>
           </provider>
         </entry>
@@ -137,11 +90,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="177" column="17" selection-start-line="177" selection-start-column="17" selection-end-line="177" selection-end-column="17" />
-              <folding>
-                <element signature="e#836#997#0" />
-              </folding>
+            <state relative-caret-position="811">
+              <caret line="155" selection-start-line="155" selection-end-line="155" />
             </state>
           </provider>
         </entry>
@@ -225,7 +175,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="1">
     <option name="x" value="1912" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -247,6 +197,11 @@
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
+              <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
+              <item name="http" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
@@ -431,15 +386,17 @@
       <workItem from="1681432005487" duration="594000" />
       <workItem from="1681691706962" duration="1414000" />
       <workItem from="1681776390439" duration="13917000" />
-      <workItem from="1681862208704" duration="23793000" />
+      <workItem from="1681862208704" duration="24333000" />
+      <workItem from="1682035999607" duration="2001000" />
+      <workItem from="1682208706300" duration="592000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="95301000" />
+    <option name="totallyTimeSpent" value="98434000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="1912" y="-8" width="1936" height="1056" extended-state="1" />
     <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
@@ -541,13 +498,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/http/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="11" column="52" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="52" />
-        </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="279">
@@ -619,88 +569,45 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
+    <entry file="file://$PROJECT_DIR$/http/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="600">
-          <caret line="121" column="34" selection-start-line="121" selection-start-column="34" selection-end-line="121" selection-end-column="34" />
+        <state relative-caret-position="330">
+          <caret line="83" column="30" lean-forward="true" selection-start-line="83" selection-start-column="30" selection-end-line="83" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
+    <entry file="file://$PROJECT_DIR$/pages/Workorder/Workorder.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="203" column="114" selection-start-line="203" selection-start-column="8" selection-end-line="203" selection-end-column="114" />
-          <folding>
-            <element signature="n#style#0;n#view#1;n#view#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#1;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#1;n#view#2;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#1;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#1;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#1;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#1;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#1;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#1;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <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" />
-            <element signature="n#style#0;n#span#0;n#view#0;n#view#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#1;n#view#0;n#view#0;n#view#3;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#3;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#3;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#3;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#3;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#3;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#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#0;n#view#3;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#1;n#view#3;n#view#1;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#0;n#view#0;n#view#4;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#4;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#t-table#0;n#view#0;n#view#4;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#5;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#5;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#t-table#0;n#view#0;n#view#5;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="e#6982#7036#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="1209">
+          <caret line="124" column="32" lean-forward="true" selection-start-line="124" selection-start-column="32" selection-end-line="124" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
+    <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="600">
-          <caret line="111" column="114" selection-start-line="111" selection-start-column="114" selection-end-line="111" selection-end-column="114" />
+        <state relative-caret-position="6630">
+          <caret line="221" column="19" selection-start-line="221" selection-start-column="19" selection-end-line="221" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/uni.scss">
+    <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="41" selection-start-line="41" selection-start-column="2" selection-end-line="43" selection-end-column="3" />
+        <state relative-caret-position="3330">
+          <caret line="111" column="114" selection-start-line="111" selection-start-column="114" selection-end-line="111" selection-end-column="114" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="447">
-          <caret line="336" column="47" selection-start-line="336" selection-start-column="47" selection-end-line="336" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/Workorder/Workorder.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="549">
-          <caret line="129" column="32" lean-forward="true" selection-start-line="129" selection-start-column="32" selection-end-line="129" selection-end-column="32" />
+        <state relative-caret-position="9990">
+          <caret line="333" column="6" selection-start-line="333" selection-start-column="6" selection-end-line="333" selection-end-column="6" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="165" column="10" lean-forward="true" selection-start-line="158" selection-start-column="8" selection-end-line="165" selection-end-column="10" />
+        <state relative-caret-position="4950">
+          <caret line="165" column="10" selection-start-line="158" selection-start-column="8" selection-end-line="165" selection-end-column="10" />
           <folding>
             <element signature="n#style#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#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
@@ -710,13 +617,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3570">
+          <caret line="119" column="48" selection-start-line="119" selection-start-column="48" selection-end-line="119" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/uni.scss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1230">
+          <caret line="41" selection-start-line="43" selection-start-column="2" selection-end-line="45" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="177" column="17" selection-start-line="177" selection-start-column="17" selection-end-line="177" selection-end-column="17" />
-          <folding>
-            <element signature="e#836#997#0" />
-          </folding>
+        <state relative-caret-position="811">
+          <caret line="155" selection-start-line="155" selection-end-line="155" />
         </state>
       </provider>
     </entry>

pages.json

@@ -198,7 +198,7 @@
             "path" : "pages/index/Workordertodone/Workordertodone",
             "style" :
             {
-                "navigationBarTitleText": "工单待办",
+                "navigationBarTitleText": "报修工单",
                 "enablePullDownRefresh": false
             }
 
@@ -263,81 +263,73 @@
             "style" :
             {
                 "navigationBarTitleText": "巡检打卡",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": false,
+					"navigationStyle": "custom" // 隐藏系统导航栏
             }
 
         }
         ,{
             "path" : "pages/my/Myorder/Myorder",
-            "style" :
+            "style" :                                                                                    
             {
                 "navigationBarTitleText": "我的订单",
                 "enablePullDownRefresh": false
             }
-
+            
         }
         ,{
             "path" : "pages/my/Myorder/Orderdetails/Orderdetails",
-            "style" :
+            "style" :                                                                                    
             {
                 "navigationBarTitleText": "订单明细",
                 "enablePullDownRefresh": false
             }
-
+            
         }
         ,{
             "path" : "pages/Workorder/Arrearsrecord/Arrearsrecord",
-            "style" :
+            "style" :                                                                                    
             {
                 "navigationBarTitleText": "欠费记录",
                 "enablePullDownRefresh": false
             }
-
+            
         }
         ,{
             "path" : "pages/Workorder/Videosurveillance/Videosurveillance",
-            "style" :
+            "style" :                                                                                    
             {
                 "navigationBarTitleText": "视频监控",
                 "enablePullDownRefresh": false
             }
-
+            
         }
+		,{
+		    "path" : "pages/Workorder/AccessControl/AccessControl",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "门禁开关",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
         ,{
             "path" : "pages/Workorder/Videosurveillance/Videoplayback/Videoplayback",
-            "style" :
+            "style" :                                                                                    
             {
                 "navigationBarTitleText": "摄像头直播",
                 "enablePullDownRefresh": false
             }
-
+            
         }
         ,{
             "path" : "pages/index/Workordertodone/Toberepaired/Toberepaired",
-            "style" :
-            {
-                "navigationBarTitleText": "待维修详情",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/index/Workordertodone/hasrepaired/hasrepaired",
-            "style" :
+            "style" :                                                                                    
             {
-                "navigationBarTitleText": "已维修详情",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/Workorder/AccessControl/AccessControl",
-            "style" :
-            {
-                "navigationBarTitleText": "门禁管理",
+                "navigationBarTitleText": "详情",
                 "enablePullDownRefresh": false
             }
-
+            
         }
     ],
 	"globalStyle": {
@@ -346,49 +338,50 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	},
-//
-//	"tabBar": {
-//		"color": "#0C1935",
-//		"selectedColor": "#2E69EB",
-//		"borderStyle": "black",
-//		"backgroundColor": "#ffffff",
-//		"height": "55px",
-//		"fontSize": "10px",
-//		"iconWidth": "24px",
-//		"spacing": "3px",
-//		"list": [{
-//				"pagePath": "pages/index/index",
-//				"iconPath": "static/tab/h1.png",
-//							"selectedIconPath": "static/tab/h2.png",
-//				"text": "首页"
-//			},
-//			// {
-//			// 	"pagePath": "pages/equipment/equipment",
-//			// 	"iconPath": "static/tab/s1.png",
-//			// 				"selectedIconPath": "static/tab/s2.png",
-//			// 	"text": "设备"
-//			// },
-//			{
-//				"pagePath": "pages/Workorder/Workorder",
-//				"iconPath": "static/tab/w1.png",
-//							"selectedIconPath": "static/tab/w2.png",
-//				"text": "工作台"
-//			},
-//			// {
-//			// 	"pagePath": "pages/Energyconsumption/Energyconsumption",
-//			// 	"iconPath": "static/tab/e1.png",
-//			// 				"selectedIconPath": "static/tab/e2.png",
-//			// 	"text": "能耗"
-//			// },
-//			{
-//				"pagePath": "pages/my/my",
-//				"iconPath": "static/tab/y1.png",
-//							"selectedIconPath": "static/tab/y2.png",
-//				"text": "我的"
-//			}
-//		]
-//
-//	},
+
+	// "tabBar": {
+	// 	"color": "#0C1935",
+	// 	"selectedColor": "#2E69EB",
+	// 	"borderStyle": "black",
+	// 	"backgroundColor": "#ffffff",
+	// 	"height": "55px",
+	// 	"fontSize": "10px",
+	// 	"iconWidth": "24px",
+	// 	"spacing": "3px",
+	// 	"list": [{
+	// 			"pagePath": "pages/index/index",
+	// 			"iconPath": "static/tab/h1.png",
+	// 						"selectedIconPath": "static/tab/h2.png",
+	// 			"text": "首页"
+	// 		},
+	// 		// {
+	// 		// 	"pagePath": "pages/equipment/equipment",
+	// 		// 	"iconPath": "static/tab/s1.png",
+	// 		// 				"selectedIconPath": "static/tab/s2.png",
+	// 		// 	"text": "设备"
+	// 		// },
+	// 		{
+	// 			"pagePath": "pages/Workorder/Workorder",
+	// 			"iconPath": "static/tab/w1.png",
+	// 						"selectedIconPath": "static/tab/w2.png",
+	// 			"text": "工作台"
+	// 		},
+	// 		// {
+	// 		// 	"pagePath": "pages/Energyconsumption/Energyconsumption",
+	// 		// 	"iconPath": "static/tab/e1.png",
+	// 		// 				"selectedIconPath": "static/tab/e2.png",
+	// 		// 	"text": "能耗"
+	// 		// },
+	// 		{
+	// 			"pagePath": "pages/my/my",
+	// 			"iconPath": "static/tab/y1.png",
+	// 						"selectedIconPath": "static/tab/y2.png",
+	// 			"text": "我的"
+	// 		}
+	// 	]
+
+	// },
+	
 	"easycom": {
 		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
 	},

pages/Workorder/AccessControl/AccessControl.vue

@@ -1,29 +1,33 @@
 <template>
-	<view class="menjin" >
-		<view class="mjym"  v-for="(item,index) in mjlist" :key="item.id">
-<view class="mjzt1" v-if="item.status==1">在线</view>
-			<view class="mjzt2"  v-if="item.status==0">离线</view>
+	<view class="menjin">
+		<view class="mjym" v-for="(item,index) in mjlist" :key="item.id">
+			<view class="mjzt1" v-if="item.status==1">在线</view>
+			<view class="mjzt2" v-if="item.status==0">离线</view>
 
-<h3 class="mjname">{{item.deviceName}}</h3>
-<view class="mjlx">{{item.deviceSerial}}</view>
+			<h3 class="mjname">{{item.deviceName}}</h3>
+			<view class="mjlx">{{item.deviceSerial}}</view>
 			<view class="mjsh">{{item.parentCategory}}</view>
 
 			<view class="mjkg">
 				<view class="sfkq">
 					<view class="sfkq1">是否开启</view>
-					<view class="sfkq2"><u-switch activeColor="#2979FF" asyncChange @change="asyncChange1(item)"
-												  inactiveColor="rgb(230, 230, 230)" v-model="item.value1" size="40" ></u-switch></view>
+					<view class="sfkq2">
+						<u-switch activeColor="#2979FF" asyncChange @change="asyncChange1(item)"
+							inactiveColor="rgb(230, 230, 230)" v-model="item.value1" size="40"></u-switch>
+					</view>
 				</view>
 				<view class="sfkq">
 					<view class="sfkq1">是否常开</view>
-					<view class="sfkq2"><u-switch activeColor="#2979FF" asyncChange @change="asyncChange2(item)"
-												  inactiveColor="rgb(230, 230, 230)" v-model="item.value2" size="40" ></u-switch></view>
+					<view class="sfkq2">
+						<u-switch activeColor="#2979FF" asyncChange @change="asyncChange2(item)"
+							inactiveColor="rgb(230, 230, 230)" v-model="item.value2" size="40"></u-switch>
+					</view>
 				</view>
 			</view>
 		</view>
 
 
-		<u-notify ref="uNotify" message="" ></u-notify>
+		<u-notify ref="uNotify" message=""></u-notify>
 	</view>
 </template>
 
@@ -31,67 +35,67 @@
 	export default {
 		data() {
 			return {
-				mjlist:[],
-			//	postdata:{},
+				mjlist: [],
+				//	postdata:{},
 			}
 		},
-		onLoad(){
+		onLoad() {
 			this.getalldata()
 		},
 
 		methods: {
-			getalldata(){
-				this.$api.get('/access/page',{})
-						.then(res=>{
-
-							if(res.data.code==0){
-								if(res.data.data.length==0){
-									this.mjlist=[]
-								}else{
-									for(let i=0;i<res.data.data.length;i++){
-										res.data.data[i].value1=false;
-										res.data.data[i].value2=false;
-									}
-
-									this.mjlist=res.data.data;
+			getalldata() {
+				this.$api.get('/access/page', {})
+					.then(res => {
+
+						if (res.data.code == 0) {
+							if (res.data.data.length == 0) {
+								this.mjlist = []
+							} else {
+								for (let i = 0; i < res.data.data.length; i++) {
+									res.data.data[i].value1 = false;
+									res.data.data[i].value2 = false;
 								}
-								//console.log('111111111111111111',this.mjlist)
-							}else{
-								this.$refs.uNotify.error(res.data.msg)
+
+								this.mjlist = res.data.data;
 							}
-						})
+							//console.log('111111111111111111',this.mjlist)
+						} else {
+							this.$refs.uNotify.error(res.data.msg)
+						}
+					})
 			},
-			operate(e){
-				this.$api.post('/access/operate',e)
-						.then(res=>{
-							if(res.data.code==0){
-								this.$refs.uNotify.success('成功')
-							}else{
-								this.$refs.uNotify.error(res.data.msg)
-							}
-						})
+			operate(e) {
+				this.$api.post('/access/operate', e)
+					.then(res => {
+						if (res.data.code == 0) {
+							this.$refs.uNotify.success('成功')
+						} else {
+							this.$refs.uNotify.error(res.data.msg)
+						}
+					})
 			},
 
-			asyncChange1(e,) {
+			asyncChange1(e, ) {
 				uni.showModal({
 					content: e.value1 ? '确定要关闭门禁吗' : '确定要开启门禁吗',
 					success: (res) => {
 						if (res.confirm) {
-							e.value1=!e.value1;
+							e.value1 = !e.value1;
 
-if(e.value1==true){
-	let postdata={
-		cmd:'open',
-		deviceSerial:e.deviceSerial
-	}
-	this.operate(postdata)
-}else{
-	let postdata={
-		cmd:'close',
-		deviceSerial:e.deviceSerial
-	}
-	this.operate(postdata)
-}
+							if (e.value1 == true) {
+								let postdata = {
+									cmd: 'open',
+									deviceSerial: e.deviceSerial
+								}
+								this.operate(postdata)
+							} else {
+								let postdata = {
+									cmd: 'close',
+									deviceSerial: e.deviceSerial
+								}
+								this.operate(postdata)
+							}
 
 
 						}
@@ -99,23 +103,23 @@ if(e.value1==true){
 				})
 
 			},
-			asyncChange2(e,) {
+			asyncChange2(e, ) {
 				uni.showModal({
 					content: e.value2 ? '确定要关闭常开吗' : '确定要常开吗',
 					success: (res) => {
 						if (res.confirm) {
-							e.value2=!e.value2;
+							e.value2 = !e.value2;
 
-							if(e.value2==true){
-								let postdata={
-									cmd:'alwaysOpen',
-									deviceSerial:e.deviceSerial
+							if (e.value2 == true) {
+								let postdata = {
+									cmd: 'alwaysOpen',
+									deviceSerial: e.deviceSerial
 								}
 								this.operate(postdata)
-							}else{
-								let postdata={
-									cmd:'alwaysClose',
-									deviceSerial:e.deviceSerial
+							} else {
+								let postdata = {
+									cmd: 'alwaysClose',
+									deviceSerial: e.deviceSerial
 								}
 								this.operate(postdata)
 							}
@@ -130,40 +134,45 @@ if(e.value1==true){
 </script>
 
 <style>
-.menjin{
-
-}
-.sfkq1{
-	padding-right: 25rpx;
-}
-.sfkq{
-	width: 345rpx;
-	height: 40rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-.mjkg{
-	display: flex;
-	align-items: center;
-margin-top: 80rpx;
-}
-.mjsh{
-	padding: 0rpx 0 0rpx 30rpx;
-	font-size: 26rpx;
-	font-weight: 400;
-	color: #697081;
-}
-.mjlx{
-	font-size: 30rpx;
-	padding: 0rpx 0 20rpx 30rpx;
-	font-weight: 600;
-	color: #0c1935;
-}
-.mjname{
-	padding: 50rpx 0 50rpx 30rpx;
-}
-	.mjym{
+	.menjin {}
+
+	.sfkq1 {
+		padding-right: 25rpx;
+	}
+
+	.sfkq {
+		width: 345rpx;
+		height: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.mjkg {
+		display: flex;
+		align-items: center;
+		margin-top: 80rpx;
+	}
+
+	.mjsh {
+		padding: 0rpx 0 0rpx 30rpx;
+		font-size: 26rpx;
+		font-weight: 400;
+		color: #697081;
+	}
+
+	.mjlx {
+		font-size: 30rpx;
+		padding: 0rpx 0 20rpx 30rpx;
+		font-weight: 600;
+		color: #0c1935;
+	}
+
+	.mjname {
+		padding: 50rpx 0 50rpx 30rpx;
+	}
+
+	.mjym {
 		width: 690rpx;
 		height: 400rpx;
 		background: #fff;
@@ -171,29 +180,30 @@ margin-top: 80rpx;
 		border-radius: 10px;
 		position: relative;
 	}
-.mjzt1{
-	position: absolute;
-	right: 10rpx;
-	top: 10rpx;
-	background: #30D3A2;
-	color: #fff;
-	width: 100rpx;
-	height: 50rpx;
-	border-radius: 10px;
-	line-height: 50rpx;
-	text-align: center;
-}
-.mjzt2{
-	position: absolute;
-	right: 10rpx;
-	top: 10rpx;
-	background:rgb(105, 112, 129);
-	color: #fff;
-	width: 100rpx;
-	height: 50rpx;
-	border-radius: 10px;
-	line-height: 50rpx;
-	text-align: center;
-}
 
+	.mjzt1 {
+		position: absolute;
+		right: 10rpx;
+		top: 10rpx;
+		background: #30D3A2;
+		color: #fff;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 10px;
+		line-height: 50rpx;
+		text-align: center;
+	}
+
+	.mjzt2 {
+		position: absolute;
+		right: 10rpx;
+		top: 10rpx;
+		background: rgb(105, 112, 129);
+		color: #fff;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 10px;
+		line-height: 50rpx;
+		text-align: center;
+	}
 </style>

pages/Workorder/Tenantbill/companybill/companybill.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="">
+		<view class="" style="width: 750rpx;height: 50rpx;">
+			
+		</view>
 		<view class="topname">
 			<view class="topname1" @click="goback">
 				<u-icon name="arrow-left" color="#000000" size="36"></u-icon>
@@ -166,6 +169,7 @@
 </template>
 
 <script>
+	import qs from 'qs'
 	var QRCode = require('@/utils/qrcode.js');
 	const BaseApi = require("@/http/baseApi.js");
 	
@@ -294,7 +298,7 @@
 			  }else if(this.prestorename=='补助'){
 				   this.subsidydata(this.model1.userInfo.amount)
 			  }else if(this.prestorename=='退费'){
-				   this.refunddata(this.model1.userInfo.amount)
+				 //  this.refunddata(this.model1.userInfo.amount)
 			  }  
 			      //   let postdata = {
 			      //       totalFee: '0.01',
@@ -309,14 +313,18 @@
 			//预存
 			prestoredata(e){
 				   this.zhifucanvas=true;
-				//  console.log('11',e)
-				//this.fatherparameter.id
+				
+			
 				let postdata = {
 				    totalFee: e,
-				    tenantId: Math.floor(this.fatherparameter.id),
+					  tenantId:this.dataForm.tenantId, 
 				    tradeType: 'NATIVE',
 				    billIds: ''
 				}
+				
+				
+										
+				
 				uni.request({
 				    url: BaseApi.BaseApi + '/pay/createOrder',
 				    method: "POST",
@@ -360,47 +368,36 @@
 				//this.fatherparameter.id
 				let postdata = {
 				    totalFee: e,
-				    tenantId: Math.floor(this.fatherparameter.id),
+				    tenantId:this.fatherparameter.id,
 				    tradeType: 'NATIVE',
 				    billIds: ''
 				}
-				uni.request({
-				    url: BaseApi.BaseApi + '/pay/createOrder',
-				    method: "POST",
-				    data: postdata,
-				    header: {
-				        'content-type': 'application/x-www-form-urlencoded',
-				        "token": uni.getStorageSync('tokendata'),
-				    },
-				    success: (res) => {
-				   
-				     	this.$refs.uNotify.success('补助成功')														    		
-				    }
-				});
-				
 				
-			},
-			//退费
-			refunddata(e){
-				  console.log('33',e)
-				  let postdata = {
-				      amount: e,
-				      id:Math.floor(this.fatherparameter.id),
-				      orderId: 0,
-				      refundReason: ''
-				  }
-				  
-				this.$api.post('/refundinfo',postdata)
+				this.$api.postJson('/pay/createOrder',postdata)
 				.then(res=>{
-				if(res.data.code==0){
-					this.$refs.uNotify.success('退费成功')										
-				}else{
-					this.$refs.uNotify.error(res.data.msg)										
-				}
-				
+					console.log('111111111111111111',res)			
+							this.$refs.uNotify.success('补助成功')																						
 				})
-					
+
+				
+				
+				// uni.request({
+				//     url: BaseApi.BaseApi + '/pay/createOrder',
+				//     method: "POST",
+				//     data: postdata,
+				//     header: {
+				//         'content-type': 'application/x-www-form-urlencoded',
+				//         "token": uni.getStorageSync('tokendata'),
+				//     },
+				//     success: (res) => {
+				   
+				//      	this.$refs.uNotify.success('补助成功')														    		
+				//     }
+				// });
+				
+				
 			},
+		
 			
 			closepay1() {
 			    this.showpayjine = false
@@ -695,7 +692,9 @@
 	    height: 600rpx;
 	    position: fixed;
 	    top: 30%;
-	    left: 140rpx;
+	 left: 0;
+	 right: 0;
+	 margin: 0 auto;
 	    background: #e6e6e6;
 	    h4{
 	        width: 500rpx;

pages/Workorder/Videosurveillance/Videoplayback/Videoplayback.vue

@@ -1,12 +1,13 @@
 <template>
 	<view class="shipin">
-		   <div id="video-container" class="myplayer" ref="myPlayer" @click="noclick"></div>
+		<!--   <div id="video-container" class="myplayer" ref="myPlayer"></div> -->
+		    <web-view :src="url"></web-view>
 	</view>
 </template>
 
 <script>
-	 import EZUIKit from "../../../../utils/ezuikit.js";
-	   var player = null;
+	// import EZUIKit from "../../../../static/ezuikit.js";
+	//   var player = null;
 	export default {
 		data() {
 			return {
@@ -16,19 +17,61 @@
 		},
 		onLoad(options) {
 		    this.urls = options.companyOrgId;
-		    console.log( this.urls);
-			this.accessToken();
+	
+		//	this.accessToken();
 			this.width = uni.getSystemInfoSync().screenWidth;
-		  console.log('111111111111111111', uni.getSystemInfoSync().screenWidth)	 
+		//  console.log('111111111111111111', uni.getSystemInfoSync().screenWidth)	 
 		},
+		 onShow() {
+		        this.selectVideoValue();
+		    },
 		
 		methods: {
+			 selectVideoValue(){
+				 
+				  var postdata ={
+				                     'appKey': 'bf1fe258e25b4556af2889b53cf2d835',
+				                     'appSecret': 'f814b3ce1653f7f909b6ccc358563fb3'
+				                 };
+				  
+				  
+				 uni.request({
+				     url:'https://open.ys7.com/api/lapp/token/get',
+				     method: "POST",
+				     data: postdata,
+				     header: {
+				         'content-type': 'application/x-www-form-urlencoded',
+				     },
+				     success: (res) => {
+				       //  console.log('111111111111111111',res.data.data.accessToken)
+				 		
+				 let that = this;
+				// var currentWebview = this.$scope.$getAppWebview() 
+			//	 setTimeout(function() {
+				 	that.url = "../../../../static/sp.html?url="+ this.urls+"&accessToken="+res.data.data.accessToken;
+				 //	var wv = currentWebview.children()[0]
+				 // 	wv.setStyle({
+				 // 		top:200,
+				 // 		height:400,
+				 // 	})
+				//  }, 500);		
+				 
+				     }
+				 });
+				 
+				 
+					
+				},
+		
+			
+			
 			accessToken(){
 				
 				 var postdata ={
 				                    'appKey': 'bf1fe258e25b4556af2889b53cf2d835',
 				                    'appSecret': 'f814b3ce1653f7f909b6ccc358563fb3'
 				                };
+				   console.log('111111111111111111',postdata)
 				 
 				uni.request({
 				    url:'https://open.ys7.com/api/lapp/token/get',
@@ -38,13 +81,12 @@
 				        'content-type': 'application/x-www-form-urlencoded',
 				    },
 				    success: (res) => {
-				      //  console.log('111111111111111111',res.data.data.accessToken)
+				        console.log('111111111111111111',res.data.data.accessToken)
 						
 						 player = new EZUIKit.EZUIKitPlayer({
 						                        id: 'video-container', // 视频容器ID
 						                        accessToken: res.data.data.accessToken,
-						                        url:this.urls,
-						                        // simple - 极简版; pcLive-pc直播；pcRec-pc回放；mobileLive-移动端直播；mobileRec-移动端回放;security - 安防版;voice-语音版;
+						                        url:this.urls,					                    
 						                        template: 'simple',
 						                        plugin: ['talk'], // 加载插件，talk-对讲
 						                        width:this.width,

pages/Workorder/Videosurveillance/Videosurveillance.vue

@@ -1,18 +1,6 @@
 <template>
 	<view class="billall">
 
-		<!-- 	<view class="topbill">
-
-			<view class="topbilledit" @click="typechange">
-				<view class="changetime1">
-					{{mytype}}
-				</view>
-				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
-				</view>
-			</view>
-		</view> -->
-
 		<view class="u-listdata">
 
 			<view style="padding:10rpx 0 0 30rpx">
@@ -26,7 +14,6 @@
 							查看
 						</view>
 
-
 						<view class="Currentamount" style="margin-top: 20rpx;">
 							通道名: {{item.channelName}}
 						</view>
@@ -48,15 +35,6 @@
 		</view>
 
 
-
-		<!-- 
-		<u-picker :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
-		</u-picker> -->
-
-
-
-
-
 	</view>
 </template>
 
@@ -158,7 +136,7 @@
 			getalldata() {
 				this.$api.post('/video/page', this.dataForm)
 					.then(res => {
-						console.log('111111111111111111', res.data.data)
+					//	console.log('111111111111111111', res.data.data)
 
 						this.totalnumber = res.data.data.total;
 						if (res.data.data.list.length != 0) {

pages/Workorder/Workorder.vue

@@ -62,7 +62,7 @@
 			</view> -->
 		</view>
 
-
+<!-- 
 		<u-tabbar
 				:value="value1"
 				:fixed="true"
@@ -74,6 +74,25 @@
 			<u-tabbar-item text="首页" icon="home" @click="click1" ></u-tabbar-item>
 			<u-tabbar-item  v-if="$has('app:worktable')"  text="工作台" icon="list" @click="click2" ></u-tabbar-item>
 			<u-tabbar-item text="我的" icon="account" @click="click3" ></u-tabbar-item>
+		</u-tabbar> -->
+		
+		<u-tabbar class="tabberall" :value="value1" :fixed="true" :placeholder="true" @change="name => value1 = name"
+			:safeAreaInsetBottom="true">
+			<u-tabbar-item text="首页" @click="click1">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg1"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg2"></image>
+			</u-tabbar-item>
+		
+			<u-tabbar-item v-if="$has('app:worktable')" text="工作台"  @click="click2">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg3"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg4"></image>
+		
+			</u-tabbar-item>
+			<u-tabbar-item text="我的" @click="click3">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg5"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg6"></image>
+		
+			</u-tabbar-item>
 		</u-tabbar>
 	</view>
 </template>
@@ -82,6 +101,13 @@
 	export default {
 		data() {
 			return {
+				tabimg1: require('@/static/tab/h2.png'),
+				tabimg2: require('@/static/tab/h1.png'),
+				tabimg3: require('@/static/tab/w2.png'),
+				tabimg4: require('@/static/tab/w1.png'),
+				tabimg5: require('@/static/tab/y2.png'),
+				tabimg6: require('@/static/tab/y1.png'),
+				
 				value1: 1,
 					srczuhu: require('@/static/management/zd.png'),
 					srcyuanc: require('@/static/management/yc.png'),
@@ -126,6 +152,7 @@
 					url: '/pages/Workorder/Videosurveillance/Videosurveillance'
 				})
 			},
+			
 			AccessControl(){
 				uni.navigateTo({
 					url: '/pages/Workorder/AccessControl/AccessControl'
@@ -142,6 +169,10 @@
 </script>
 
 <style>
+	.u-page__item__slot-icon {
+		width: 40rpx;
+		height: 40rpx;
+	}
 .management{}
 .managelind{
 	display: flex;

pages/index/BillPending/BillPending.vue

@@ -724,7 +724,9 @@
     height: 600rpx;
     position: fixed;
     top: 30%;
-    left: 140rpx;
+    left: 0;
+	right: 0;
+	margin: 0 auto;
     background: #e6e6e6;
     h4{
         width: 500rpx;

pages/index/Immediateinspection/Immediateinspection.vue

@@ -1,5 +1,17 @@
 <template>
 	<view class="">
+		<view class="" style="width: 750rpx;height: 50rpx;">
+			
+		</view>
+		<view class="topname">
+			<view class="topname1" @click="goback">
+				<u-icon name="arrow-left" color="#000000" size="36"></u-icon>
+			</view>
+			<view class="topname2">
+				巡检打卡
+			</view>
+		</view>
+		
 		<view class="getuserInfo">
 			<view class="getuserInfoimg">
 				<u--image :src="src" width="120rpx" height="120rpx"></u--image>
@@ -106,6 +118,12 @@
 		//监听用户下拉动作，一般用于下拉刷新
 		onPullDownRefresh() {},
 		methods: {
+			goback() {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			
 			Punchindata() {
 
 				uni.scanCode({
@@ -218,7 +236,23 @@
 			padding-left: 9rpx;
 		}
 	}
+	.topname {
+		height: 44px;
+		width: 750rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.topname1 {
+		width: 50rpx;
+		padding-left: 10rpx;
+	}
 
+	.topname2 {
+		width: 700rpx;
+		text-align: center;
+		font-weight: bold;
+	}
 	.Callfee {
 		width: 100rpx;
 		height: 45rpx;

pages/index/index.vue

@@ -5,7 +5,8 @@
 
 		<!--</view>-->
 
-		<view class="Homepage_suspension" v-if="$has('app:InspectionRecord')&&$has('app:OnlineReport')&&$has('app:WithholdingRecord')">
+		<view class="Homepage_suspension"
+			v-if="$has('app:InspectionRecord')&&$has('app:OnlineReport')&&$has('app:WithholdingRecord')">
 			<view class="Suspension">
 				<view class="online" @click="Onlinewarranty" v-if="$has('app:InspectionRecord')">
 					<view>
@@ -31,7 +32,7 @@
 			</view>
 		</view>
 
-		<view class="pending"  v-if="$has('app:RealtimeInspection')">
+		<view class="pending" v-if="$has('app:RealtimeInspection')">
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
@@ -49,12 +50,14 @@
 					<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>
+							{{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>
+							{{inspectionInfoList.todayNum}}
+						</view>
 					</view>
 
 				</view>
@@ -63,7 +66,7 @@
 
 		<view class="pending" v-if="$has('app:Tobeassigned')&&$has('app:Toberepaired')&&$has('app:hasrepaired')">
 			<view class="pending_middle">
-				<view class="all" >
+				<view class="all">
 					<view class="work">
 						<span style="font-size: 30rpx;font-weight: bold;">工单待办</span>
 					</view>
@@ -79,17 +82,20 @@
 					<view v-if="$has('app:Tobeassigned')">
 						<view style="font-size: 26rpx;color: #697081;">待指派</view>
 						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
-							{{workList[1]}}</view>
+							{{workList[1]}}
+						</view>
 					</view>
 					<view v-if="$has('app:Toberepaired')">
 						<view style="font-size: 26rpx;color: #697081;">待维修</view>
 						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
-							{{workList[2]}}</view>
+							{{workList[2]}}
+						</view>
 					</view>
 					<view v-if="$has('app:hasrepaired')">
 						<view style="font-size: 26rpx;color: #697081;">已维修</view>
 						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
-							{{workList[3]}}</view>
+							{{workList[3]}}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -97,7 +103,7 @@
 
 		<view class="equipment" v-if="$has('app:EquipmentException')">
 			<view class="pending_middle">
-				<view class="all" >
+				<view class="all">
 					<view class="work">
 						<span style="font-size: 30rpx;font-weight: bold;">设备异常</span>
 					</view>
@@ -113,22 +119,26 @@
 					<view>
 						<view style="font-size: 26rpx;color: #697081;">异常总数</view>
 						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
-							{{deviceArr.AirConditioner}}</view>
+							{{deviceArr.AirConditioner}}
+						</view>
 					</view>
 					<view>
 						<view style="font-size: 26rpx;color: #697081;">空调异常</view>
 						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
-							{{deviceArr.Ammeter}}</view>
+							{{deviceArr.Ammeter}}
+						</view>
 					</view>
 					<view>
 						<view style="font-size: 26rpx;color: #697081;">水表异常</view>
 						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
-							{{deviceArr.WaterMeter}}</view>
+							{{deviceArr.WaterMeter}}
+						</view>
 					</view>
 					<view>
 						<view style="font-size: 26rpx;color: #697081;">电表异常</view>
 						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
-							{{deviceArr.Relay}}</view>
+							{{deviceArr.Relay}}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -136,7 +146,7 @@
 		<!-- 管理员界面 -->
 		<view class="arrears" v-if="$has('app:ArrearstobeCollected')">
 			<view class="pending_middle">
-				<view class="all" >
+				<view class="all">
 					<view class="work">
 						<span style="font-size: 30rpx;font-weight: bold;">欠费待收</span>
 					</view>
@@ -170,7 +180,7 @@
 					<view class="work">
 						<span style="font-size: 30rpx;font-weight: bold;">账单待缴</span>
 					</view>
-					<view class="processing"  v-if="$has('app:ImmediatePayment')">
+					<view class="processing" v-if="$has('app:ImmediatePayment')">
 						<view class="immediately" @click="BillPending">
 							<span style="font-size: 25rpx; color: #5c8fff; ">立即缴费</span>
 							<u-icon name="arrow-right" color="#5c8fff" size="16rpx"></u-icon>
@@ -192,17 +202,23 @@
 			</view>
 		</view>
 
-		<u-tabbar
-				:value="value1"
-				:fixed="true"
-				:placeholder="true"
-				@change="name => value1 = name"
-				activeColor="#2E69EB"
-				:safeAreaInsetBottom="true"
-		>
-			<u-tabbar-item  text="首页" icon="home" @click="click1" ></u-tabbar-item>
-			<u-tabbar-item  v-if="$has('app:worktable')"  text="工作台" icon="list" @click="click2" ></u-tabbar-item>
-			<u-tabbar-item    text="我的" icon="account" @click="click3" ></u-tabbar-item>
+		<u-tabbar class="tabberall" :value="value1" :fixed="true" :placeholder="true" @change="name => value1 = name"
+			:safeAreaInsetBottom="true">
+			<u-tabbar-item text="首页" @click="click1">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg1"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg2"></image>
+			</u-tabbar-item>
+
+			<u-tabbar-item v-if="$has('app:worktable')" text="工作台" @click="click2">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg3"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg4"></image>
+
+			</u-tabbar-item>
+			<u-tabbar-item text="我的"  @click="click3">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg5"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg6"></image>
+
+			</u-tabbar-item>
 		</u-tabbar>
 
 	</view>
@@ -223,6 +239,15 @@
 		data() {
 			return {
 				value1: 0,
+
+				tabimg1: require('@/static/tab/h2.png'),
+				tabimg2: require('@/static/tab/h1.png'),
+				tabimg3: require('@/static/tab/w2.png'),
+				tabimg4: require('@/static/tab/w1.png'),
+				tabimg5: require('@/static/tab/y2.png'),
+				tabimg6: require('@/static/tab/y1.png'),
+
+
 				srcxianshang1: require('@/static/index/repair-online.svg'),
 				srcxianshang2: require('@/static/index/check-review.svg'),
 				srcxianshang3: require('@/static/index/reduce-record.svg'),
@@ -237,26 +262,26 @@
 		onLoad() {
 			this.getalldata();
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
-
 		},
+		
 		onPullDownRefresh() {
-		//	console.log('我下拉刷新页面了！！！！！！！！！！！！！！！', )
+			//	console.log('我下拉刷新页面了！！！！！！！！！！！！！！！', )
 			this.getalldata();
 
 		},
 
 		methods: {
-			click1(){
+			click1() {
 				uni.navigateTo({
 					url: '/pages/index/index'
 				})
 			},
-			click2(){
+			click2() {
 				uni.navigateTo({
 					url: '/pages/Workorder/Workorder'
 				})
 			},
-			click3(){
+			click3() {
 				uni.navigateTo({
 					url: '/pages/my/my'
 				})
@@ -294,7 +319,8 @@
 			BillPending() {
 				// console.log('111111111111111111',this.getuserInfo)
 				uni.navigateTo({
-					url: '/pages/index/BillPending/BillPending?info=' + encodeURIComponent(JSON.stringify(this.getuserInfo))
+					url: '/pages/index/BillPending/BillPending?info=' + encodeURIComponent(JSON.stringify(this
+						.getuserInfo))
 				});
 			},
 			Immediatecollection() {
@@ -347,6 +373,18 @@
 		text-decoration: none;
 	}
 
+	// .u-tabbar__content{
+	// 	.u-tabbar-item__icon{
+	// 		.u-tabbar-item__icon{
+	// 			font-size: 19px!important;
+	// 		}		
+	// 	}
+	// }
+	.u-page__item__slot-icon {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
 	.online {
 		display: flex;
 		flex-direction: column;

pages/my/Personalinformation/Informationmodification/Informationmodification.vue

@@ -90,28 +90,9 @@
 								border="none"
 						></u--input>
 					</u-form-item>
-					<!--<u-form-item-->
-					<!--labelWidth="120"-->
-							<!--label="职位:"-->
-							<!--prop="userInfo.position"-->
-							<!--borderBottom-->
-							<!--ref="item1"				>-->
-						<!--<u&#45;&#45;input-->
-								<!--v-model="model1.userInfo.position"-->
-								<!--clearable-->
-								<!--border="none"-->
-						<!--&gt;</u&#45;&#45;input>-->
-					<!--</u-form-item>-->
-
+				
 				</u--form>
-				<!--<u-action-sheet-->
-						<!--:show="showSex"-->
-						<!--:actions="actions"-->
-						<!--title="请选择性别"-->
-						<!--@close="showSex = false"-->
-						<!--@select="sexSelect"-->
-				<!--&gt;-->
-				<!--</u-action-sheet>-->
+				
 
 				<view class="submitdata">
 					<u-button  type="primary" @click="submit">提交</u-button>
@@ -135,9 +116,8 @@
 						gender: '',
 						mobile:'',
 						email:'',
-					//	address:'安徽省合肥市',
-						deptName:'',
-					//	position:'前端工程师'
+						deptName:'合肥传秀科技技术部',
+					
 					},
 				},
 				actions: [
@@ -243,7 +223,7 @@
 							}else if(this.model1.userInfo.gender=='保密'){
 								this.model1.userInfo.gender=2
 							}
-							this.$api.put('/user/',this.model1.userInfo)
+							this.$api.put('/user',this.model1.userInfo)
 									.then(res=>{
 										console.log('111111111111111111',res)
 										if(res.data.code==0){

pages/my/my.vue

@@ -100,7 +100,7 @@
 		<u-modal :show="showtc" content='请问您是否确定一键退出？' :showConfirmButton='true' :showCancelButton='true'
 			@confirm="confirmtc" @cancel='canceltc'></u-modal>
 
-		<u-tabbar
+		<!-- <u-tabbar
 				:value="value1"
 				:fixed="true"
 				:placeholder="true"
@@ -111,6 +111,26 @@
 			<u-tabbar-item text="首页" icon="home" @click="click1" ></u-tabbar-item>
 			<u-tabbar-item  v-if="$has('app:worktable')"  text="工作台" icon="list" @click="click2" ></u-tabbar-item>
 			<u-tabbar-item text="我的" icon="account" @click="click3" ></u-tabbar-item>
+		</u-tabbar> -->
+		
+		
+		<u-tabbar class="tabberall" :value="value1" :fixed="true" :placeholder="true" @change="name => value1 = name"
+			:safeAreaInsetBottom="true">
+			<u-tabbar-item text="首页" @click="click1">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg1"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg2"></image>
+			</u-tabbar-item>
+		
+			<u-tabbar-item v-if="$has('app:worktable')" text="工作台"  @click="click2">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg3"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg4"></image>
+		
+			</u-tabbar-item>
+			<u-tabbar-item text="我的" @click="click3">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg5"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg6"></image>
+		
+			</u-tabbar-item>
 		</u-tabbar>
 	</view>
 </template>
@@ -122,6 +142,13 @@
 	export default {
 		data() {
 			return {
+				tabimg1: require('@/static/tab/h2.png'),
+				tabimg2: require('@/static/tab/h1.png'),
+				tabimg3: require('@/static/tab/w2.png'),
+				tabimg4: require('@/static/tab/w1.png'),
+				tabimg5: require('@/static/tab/y2.png'),
+				tabimg6: require('@/static/tab/y1.png'),
+				
 				value1: 2,
 				fileList: [],
 				showtc: false,
@@ -267,6 +294,10 @@
 </script>
 
 <style lang="scss">
+	.u-page__item__slot-icon {
+		width: 40rpx;
+		height: 40rpx;
+	}
 	.minndle {
 		width: 750rpx;
 		height: 150rpx;

uni.scss

@@ -39,6 +39,8 @@
 ::v-deep .u-picker__view__column__item{
 	font-size: 20px!important;
 }
+
+
 //.u-tabbar-item__text{
 //	font-size: 16px!important;
 //}