askin 2 년 전
부모
커밋
a9e0ce533d
35개의 변경된 파일164개의 추가작업 그리고 214개의 파일을 삭제
  1. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  2. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  3. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/components/best-gauge/best-gauge.js.map
  4. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/alarm/alarm.js.map
  5. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/alarmRecord/alarmRecord.js.map
  6. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/dataCurve/dataCurve.js.map
  7. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/device.js.map
  8. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/deviceInfo/deviceInfo.js.map
  9. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  10. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/maintenanceRecord/maintenanceRecord.js.map
  11. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/operator/operator.js.map
  12. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/operator/operatorInfo/operatorInfo.js.map
  13. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/operatorLog/operatorLog.js.map
  14. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/parameterSetting/parameterSetting.js.map
  15. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/power/power.js.map
  16. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/project.js.map
  17. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/projectEdit/projectEdit.js.map
  18. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/projectInfo/projectInfo.js.map
  19. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/rolePower/rolePower.js.map
  20. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/roleShowPower/roleShowPower.js.map
  21. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/runningState/runningState.js.map
  22. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/staticProject/staticProject.js.map
  23. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/systemParameter/systemParameter.js.map
  24. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/systemSet/systemSet.js.map
  25. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/user.js.map
  26. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js.map
  27. 1 1
      sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  28. 72 71
      sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/app.json
  29. 26 36
      sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/login/login.js
  30. 36 26
      sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/operator/operator.js
  31. 1 18
      sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/project.config.json
  32. 0 34
      sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/project.private.config.json
  33. BIN
      sources/client/vrv-platform/dist.rar
  34. 1 1
      sources/client/vrv-platform/src/config/api.js
  35. 1 1
      sources/server/vrv/run/application.pid

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/components/best-gauge/best-gauge.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/alarm/alarm.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/alarmRecord/alarmRecord.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/dataCurve/dataCurve.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/device.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/deviceInfo/deviceInfo.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/maintenanceRecord/maintenanceRecord.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/operator/operator.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/operator/operatorInfo/operatorInfo.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/operatorLog/operatorLog.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/parameterSetting/parameterSetting.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/power/power.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/project.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/projectEdit/projectEdit.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/projectInfo/projectInfo.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/rolePower/rolePower.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/roleShowPower/roleShowPower.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/runningState/runningState.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/staticProject/staticProject.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/systemParameter/systemParameter.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/systemSet/systemSet.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/user.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
sources/client/vrv-moblie/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


+ 72 - 71
sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/app.json

@@ -1,73 +1,74 @@
 {
-  "pages": [
-    "pages/operator/operator",
-    "pages/login/login",
-    "pages/operator/operatorInfo/operatorInfo",
-    "pages/device/device",
-    "pages/device/deviceInfo/deviceInfo",
-    "pages/staticProject/staticProject",
-    "pages/project/project",
-    "pages/project/projectInfo/projectInfo",
-    "pages/alarm/alarm",
-    "pages/operatorLog/operatorLog",
-    "pages/systemSet/systemSet",
-    "pages/error/error",
-    "pages/parameterSetting/parameterSetting",
-    "pages/systemParameter/systemParameter",
-    "pages/alarmRecord/alarmRecord",
-    "pages/maintenanceRecord/maintenanceRecord",
-    "pages/user/user",
-    "pages/rolePower/rolePower",
-    "pages/roleShowPower/roleShowPower",
-    "pages/runningState/runningState",
-    "pages/dataCurve/dataCurve",
-    "pages/power/power",
-    "pages/project/projectEdit/projectEdit"
-  ],
-  "subPackages": [],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "color": "#7A7E83",
-    "selectedColor": "#3cc51f",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/operator/operator",
-        "iconPath": "static/底部按钮/项目管理@2x.png",
-        "selectedIconPath": "static/底部按钮/项目管理@2x.png",
-        "text": "运营商管理"
-      },
-      {
-        "pagePath": "pages/project/project",
-        "iconPath": "static/底部按钮/项目管理@2x.png",
-        "selectedIconPath": "static/底部按钮/项目管理@2x.png",
-        "text": "项目管理"
-      },
-      {
-        "pagePath": "pages/alarm/alarm",
-        "iconPath": "static/底部按钮/报警管理@2x.png",
-        "selectedIconPath": "static/底部按钮/报警管理@2x.png",
-        "text": "报警管理"
-      },
-      {
-        "pagePath": "pages/operatorLog/operatorLog",
-        "iconPath": "static/底部按钮/操作日志@2x.png",
-        "selectedIconPath": "static/底部按钮/操作日志@2x.png",
-        "text": "操作日志"
-      },
-      {
-        "pagePath": "pages/systemSet/systemSet",
-        "iconPath": "static/底部按钮/系统设置@2x.png",
-        "selectedIconPath": "static/底部按钮/系统设置@2x.png",
-        "text": "系统设置"
-      }
-    ]
-  },
-  "usingComponents": {}
+    "pages": [
+        "pages/operator/operator",
+        "pages/login/login",
+        "pages/operator/operatorInfo/operatorInfo",
+        "pages/device/device",
+        "pages/device/deviceInfo/deviceInfo",
+        "pages/staticProject/staticProject",
+        "pages/project/project",
+        "pages/project/projectInfo/projectInfo",
+        "pages/alarm/alarm",
+        "pages/operatorLog/operatorLog",
+        "pages/systemSet/systemSet",
+        "pages/error/error",
+        "pages/parameterSetting/parameterSetting",
+        "pages/systemParameter/systemParameter",
+        "pages/alarmRecord/alarmRecord",
+        "pages/maintenanceRecord/maintenanceRecord",
+        "pages/user/user",
+        "pages/rolePower/rolePower",
+        "pages/roleShowPower/roleShowPower",
+        "pages/runningState/runningState",
+        "pages/dataCurve/dataCurve",
+        "pages/power/power",
+        "pages/project/projectEdit/projectEdit"
+    ],
+    "subPackages": [],
+    "window": {
+        "navigationBarTextStyle": "black",
+        "navigationBarTitleText": "uni-app",
+        "navigationBarBackgroundColor": "#F8F8F8",
+        "backgroundColor": "#F8F8F8"
+    },
+    "tabBar": {
+        "color": "#7A7E83",
+        "selectedColor": "#3cc51f",
+        "borderStyle": "black",
+        "backgroundColor": "#ffffff",
+        "list": [
+            {
+                "pagePath": "pages/operator/operator",
+                "iconPath": "static/底部按钮/项目管理@2x.png",
+                "selectedIconPath": "static/底部按钮/项目管理@2x.png",
+                "text": "运营商管理"
+            },
+            {
+                "pagePath": "pages/project/project",
+                "iconPath": "static/底部按钮/项目管理@2x.png",
+                "selectedIconPath": "static/底部按钮/项目管理@2x.png",
+                "text": "项目管理"
+            },
+            {
+                "pagePath": "pages/alarm/alarm",
+                "iconPath": "static/底部按钮/报警管理@2x.png",
+                "selectedIconPath": "static/底部按钮/报警管理@2x.png",
+                "text": "报警管理"
+            },
+            {
+                "pagePath": "pages/operatorLog/operatorLog",
+                "iconPath": "static/底部按钮/操作日志@2x.png",
+                "selectedIconPath": "static/底部按钮/操作日志@2x.png",
+                "text": "操作日志"
+            },
+            {
+                "pagePath": "pages/systemSet/systemSet",
+                "iconPath": "static/底部按钮/系统设置@2x.png",
+                "selectedIconPath": "static/底部按钮/系统设置@2x.png",
+                "text": "系统设置"
+            }
+        ]
+    },
+    "usingComponents": {},
+    "sitemapLocation": "sitemap.json"
 }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 26 - 36
sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/login/login.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 36 - 26
sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/operator/operator.js


+ 1 - 18
sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/project.config.json

@@ -19,24 +19,7 @@
     "libVersion": "2.26.0",
     "appid": "wx95c3daeeb44f85f6",
     "projectname": "vrv-platform",
-    "condition": {
-        "search": {
-            "current": -1,
-            "list": []
-        },
-        "conversation": {
-            "current": -1,
-            "list": []
-        },
-        "game": {
-            "current": -1,
-            "list": []
-        },
-        "miniprogram": {
-            "current": -1,
-            "list": []
-        }
-    },
+    "condition": {},
     "editorSetting": {
         "tabIndent": "insertSpaces",
         "tabSize": 4

+ 0 - 34
sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -3,39 +3,5 @@
     "projectname": "vrv-platform",
     "setting": {
         "compileHotReLoad": true
-    },
-    "condition": {
-        "miniprogram": {
-            "list": [
-                {
-                    "name": "",
-                    "pathName": "pages/login/login",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/runningState/runningState",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/parameterSetting/parameterSetting",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/dataCurve/dataCurve",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                }
-            ]
-        }
     }
 }

BIN
sources/client/vrv-platform/dist.rar


+ 1 - 1
sources/client/vrv-platform/src/config/api.js

@@ -1,5 +1,5 @@
 //路径
-const root = "http://127.0.0.1:8888";
+const root = "http://127.0.0.1:9999";
 
 //接口auth
 const api = {

+ 1 - 1
sources/server/vrv/run/application.pid

@@ -1 +1 @@
-14968
+5776