lxh 1 周之前
父节点
当前提交
baf89457a3

+ 2 - 2
common/service/config.service.js

@@ -3,7 +3,7 @@ let BASE_URL = "";
 if (process.env.NODE_ENV == "development") {
   BASE_URL = "http://182.92.126.35:9999"; // 开发环境
 } else {
-  // BASE_URL = "http://182.92.126.35:9999"; // 开发环境
+  BASE_URL = "http://182.92.126.35:9999"; // 开发环境
   // BASE_URL = "http://10.246.95.4:9999"; // 布尔台
   // BASE_URL = "http://10.248.135.10:9999"; // 大柳塔进
   // BASE_URL = "http://10.248.135.121:9999"; // 活鸡兔井
@@ -14,7 +14,7 @@ if (process.env.NODE_ENV == "development") {
   // BASE_URL = "http://172.16.53.16:9999"; // 
   // BASE_URL = "http://10.246.167.205:9999"; //上湾
   // BASE_URL = "http://172.30.157.9:9999"; //元子沟
-  BASE_URL = "http://10.246.167.205:9999"; //上湾
+  // BASE_URL = "http://10.246.167.205:9999"; //上湾
 }
 let staticDomainURL = BASE_URL + "/sys/common/static";
 

+ 61 - 89
node_modules/echarts/package.json

@@ -1,41 +1,72 @@
 {
-  "_args": [
-    [
-      "echarts@5.5.1",
-      "D:\\通防技术部\\jeecg-uniapp"
-    ]
-  ],
-  "_from": "echarts@5.5.1",
-  "_id": "echarts@5.5.1",
-  "_inBundle": false,
-  "_integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==",
-  "_location": "/echarts",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "echarts@5.5.1",
-    "name": "echarts",
-    "escapedName": "echarts",
-    "rawSpec": "5.5.1",
-    "saveSpec": null,
-    "fetchSpec": "5.5.1"
-  },
-  "_requiredBy": [
-    "/"
+  "name": "echarts",
+  "version": "5.5.1",
+  "description": "Apache ECharts is a powerful, interactive charting and data visualization library for browser",
+  "license": "Apache-2.0",
+  "keywords": [
+    "echarts",
+    "data-visualization",
+    "charts",
+    "charting-library",
+    "visualization",
+    "apache",
+    "data-viz",
+    "canvas",
+    "svg"
   ],
-  "_resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz",
-  "_spec": "5.5.1",
-  "_where": "D:\\通防技术部\\jeecg-uniapp",
+  "main": "dist/echarts.js",
+  "module": "index.js",
+  "jsdelivr": "dist/echarts.min.js",
+  "types": "index.d.ts",
+  "homepage": "https://echarts.apache.org",
   "bugs": {
     "url": "https://github.com/apache/echarts/issues",
     "email": "dev@echarts.apache.org"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/apache/echarts.git"
+  },
+  "sideEffects": [
+    "index.js",
+    "index.blank.js",
+    "index.common.js",
+    "index.simple.js",
+    "lib/echarts.js",
+    "lib/chart/*.js",
+    "lib/component/*.js",
+    "extension/**/*.js",
+    "theme/*.js",
+    "i18n/*.js"
+  ],
+  "scripts": {
+    "build": "node build/build.js --type all,common,simple --min",
+    "build:esm": "node build/build.js --type all --min --format esm",
+    "build:i18n": "node build/build-i18n.js",
+    "build:lib": "node build/build.js --prepublish",
+    "build:extension": "node build/build.js --type extension",
+    "build:ssr": "node build/build.js --type ssr",
+    "dev:fast": "node build/build-i18n.js && node build/dev-fast.js",
+    "dev": "npx -y concurrently -n build,server \"npm run dev:fast\" \"npx -y http-server -c-1 -s -o test\"",
+    "prepare": "npm run build:lib && husky install",
+    "release": "npm run build:lib && npm run build:i18n && npm run build && npm run build:esm && npm run build:extension && npm run build:ssr",
+    "help": "node build/build.js --help",
+    "test:visual": "node test/runTest/server.js",
+    "test": "npx jest --config test/ut/jest.config.cjs",
+    "test:single": "npx jest --config test/ut/jest.config.cjs --coverage=false -t",
+    "test:single:debug": "npx --node-arg=--inspect-brk jest --runInBand --config test/ut/jest.config.cjs --coverage=false -t",
+    "test:dts": "node build/testDts.js",
+    "mktest": "node test/build/mktest.js",
+    "mktest:help": "node test/build/mktest.js -h",
+    "checktype": "tsc --noEmit",
+    "lint": "npx eslint --cache --cache-location node_modules/.cache/eslint src/**/*.ts ssr/client/src/**/*.ts extension-src/**/*.ts",
+    "lint:fix": "npx eslint --fix src/**/*.ts extension-src/**/*.ts",
+    "lint:dist": "echo 'It might take a while. Please wait ...' && npx jshint --config .jshintrc-dist dist/echarts.js"
+  },
   "dependencies": {
     "tslib": "2.3.0",
     "zrender": "5.6.0"
   },
-  "description": "Apache ECharts is a powerful, interactive charting and data visualization library for browser",
   "devDependencies": {
     "@babel/code-frame": "7.10.4",
     "@babel/core": "7.3.4",
@@ -71,6 +102,7 @@
     "ts-jest": "^26.4.3",
     "typescript": "4.4.3"
   },
+  "type": "module",
   "exports": {
     ".": {
       "types": "./index.d.ts",
@@ -189,65 +221,5 @@
     "./dist/extension/dataTool": "./dist/extension/dataTool.js",
     "./dist/extension/dataTool.min": "./dist/extension/dataTool.min.js",
     "./*": "./*"
-  },
-  "homepage": "https://echarts.apache.org",
-  "jsdelivr": "dist/echarts.min.js",
-  "keywords": [
-    "echarts",
-    "data-visualization",
-    "charts",
-    "charting-library",
-    "visualization",
-    "apache",
-    "data-viz",
-    "canvas",
-    "svg"
-  ],
-  "license": "Apache-2.0",
-  "main": "dist/echarts.js",
-  "module": "index.js",
-  "name": "echarts",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/apache/echarts.git"
-  },
-  "scripts": {
-    "build": "node build/build.js --type all,common,simple --min",
-    "build:esm": "node build/build.js --type all --min --format esm",
-    "build:extension": "node build/build.js --type extension",
-    "build:i18n": "node build/build-i18n.js",
-    "build:lib": "node build/build.js --prepublish",
-    "build:ssr": "node build/build.js --type ssr",
-    "checktype": "tsc --noEmit",
-    "dev": "npx -y concurrently -n build,server \"npm run dev:fast\" \"npx -y http-server -c-1 -s -o test\"",
-    "dev:fast": "node build/build-i18n.js && node build/dev-fast.js",
-    "help": "node build/build.js --help",
-    "lint": "npx eslint --cache --cache-location node_modules/.cache/eslint src/**/*.ts ssr/client/src/**/*.ts extension-src/**/*.ts",
-    "lint:dist": "echo 'It might take a while. Please wait ...' && npx jshint --config .jshintrc-dist dist/echarts.js",
-    "lint:fix": "npx eslint --fix src/**/*.ts extension-src/**/*.ts",
-    "mktest": "node test/build/mktest.js",
-    "mktest:help": "node test/build/mktest.js -h",
-    "prepare": "npm run build:lib && husky install",
-    "release": "npm run build:lib && npm run build:i18n && npm run build && npm run build:esm && npm run build:extension && npm run build:ssr",
-    "test": "npx jest --config test/ut/jest.config.cjs",
-    "test:dts": "node build/testDts.js",
-    "test:single": "npx jest --config test/ut/jest.config.cjs --coverage=false -t",
-    "test:single:debug": "npx --node-arg=--inspect-brk jest --runInBand --config test/ut/jest.config.cjs --coverage=false -t",
-    "test:visual": "node test/runTest/server.js"
-  },
-  "sideEffects": [
-    "index.js",
-    "index.blank.js",
-    "index.common.js",
-    "index.simple.js",
-    "lib/echarts.js",
-    "lib/chart/*.js",
-    "lib/component/*.js",
-    "extension/**/*.js",
-    "theme/*.js",
-    "i18n/*.js"
-  ],
-  "type": "module",
-  "types": "index.d.ts",
-  "version": "5.5.1"
+  }
 }

+ 107 - 158
node_modules/moment/package.json

@@ -1,167 +1,116 @@
 {
-  "_args": [
-    [
-      "moment@2.30.1",
-      "D:\\通防技术部\\jeecg-uniapp"
-    ]
-  ],
-  "_from": "moment@2.30.1",
-  "_id": "moment@2.30.1",
-  "_inBundle": false,
-  "_integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-  "_location": "/moment",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "moment@2.30.1",
     "name": "moment",
-    "escapedName": "moment",
-    "rawSpec": "2.30.1",
-    "saveSpec": null,
-    "fetchSpec": "2.30.1"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
-  "_spec": "2.30.1",
-  "_where": "D:\\通防技术部\\jeecg-uniapp",
-  "author": {
-    "name": "Iskren Ivov Chernev",
-    "email": "iskren.chernev@gmail.com",
-    "url": "https://github.com/ichernev"
-  },
-  "bugs": {
-    "url": "https://github.com/moment/moment/issues"
-  },
-  "contributors": [
-    {
-      "name": "Tim Wood",
-      "email": "washwithcare@gmail.com",
-      "url": "http://timwoodcreates.com/"
+    "version": "2.30.1",
+    "description": "Parse, validate, manipulate, and display dates",
+    "homepage": "https://momentjs.com",
+    "author": "Iskren Ivov Chernev <iskren.chernev@gmail.com> (https://github.com/ichernev)",
+    "contributors": [
+        "Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)",
+        "Rocky Meza (http://rockymeza.com)",
+        "Matt Johnson <mj1856@hotmail.com> (http://codeofmatt.com)",
+        "Isaac Cambron <isaac@isaaccambron.com> (http://isaaccambron.com)",
+        "Andre Polykanine <andre@oire.org> (https://github.com/oire)"
+    ],
+    "keywords": [
+        "moment",
+        "date",
+        "time",
+        "parse",
+        "format",
+        "validate",
+        "i18n",
+        "l10n",
+        "ender"
+    ],
+    "main": "./moment.js",
+    "jsnext:main": "./dist/moment.js",
+    "typings": "./moment.d.ts",
+    "typesVersions": {
+        ">=3.1": {
+            "*": [
+                "ts3.1-typings/*"
+            ],
+            "min/moment-with-locales": [
+                "ts3.1-typings/moment.d.ts"
+            ]
+        }
     },
-    {
-      "name": "Rocky Meza",
-      "url": "http://rockymeza.com"
+    "engines": {
+        "node": "*"
     },
-    {
-      "name": "Matt Johnson",
-      "email": "mj1856@hotmail.com",
-      "url": "http://codeofmatt.com"
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/moment/moment.git"
     },
-    {
-      "name": "Isaac Cambron",
-      "email": "isaac@isaaccambron.com",
-      "url": "http://isaaccambron.com"
+    "bugs": {
+        "url": "https://github.com/moment/moment/issues"
     },
-    {
-      "name": "Andre Polykanine",
-      "email": "andre@oire.org",
-      "url": "https://github.com/oire"
-    }
-  ],
-  "description": "Parse, validate, manipulate, and display dates",
-  "devDependencies": {
-    "@types/node": "17.0.21",
-    "benchmark": "latest",
-    "coveralls": "latest",
-    "cross-env": "^6.0.3",
-    "es6-promise": "latest",
-    "eslint": "latest",
-    "grunt": "latest",
-    "grunt-benchmark": "latest",
-    "grunt-cli": "latest",
-    "grunt-contrib-clean": "latest",
-    "grunt-contrib-concat": "latest",
-    "grunt-contrib-copy": "latest",
-    "grunt-contrib-uglify": "latest",
-    "grunt-contrib-watch": "latest",
-    "grunt-env": "latest",
-    "grunt-exec": "latest",
-    "grunt-karma": "latest",
-    "grunt-nuget": "latest",
-    "grunt-string-replace": "latest",
-    "karma": "latest",
-    "karma-chrome-launcher": "latest",
-    "karma-firefox-launcher": "latest",
-    "karma-qunit": "latest",
-    "karma-sauce-launcher": "4.1.4",
-    "load-grunt-tasks": "latest",
-    "lodash": ">=4.17.19",
-    "node-qunit": "latest",
-    "nyc": "latest",
-    "prettier": "latest",
-    "qunit": "^2.10.0",
-    "rollup": "2.17.1",
-    "typescript": "^1.8.10",
-    "typescript3": "npm:typescript@^3.1.6",
-    "uglify-js": "latest"
-  },
-  "dojoBuild": "package.js",
-  "ender": "./ender.js",
-  "engines": {
-    "node": "*"
-  },
-  "homepage": "https://momentjs.com",
-  "jsnext:main": "./dist/moment.js",
-  "jspm": {
-    "files": [
-      "moment.js",
-      "moment.d.ts",
-      "locale"
-    ],
-    "map": {
-      "moment": "./moment"
+    "license": "MIT",
+    "devDependencies": {
+        "benchmark": "latest",
+        "coveralls": "latest",
+        "cross-env": "^6.0.3",
+        "es6-promise": "latest",
+        "eslint": "latest",
+        "grunt": "latest",
+        "grunt-benchmark": "latest",
+        "grunt-cli": "latest",
+        "grunt-contrib-clean": "latest",
+        "grunt-contrib-concat": "latest",
+        "grunt-contrib-copy": "latest",
+        "grunt-contrib-uglify": "latest",
+        "grunt-contrib-watch": "latest",
+        "grunt-env": "latest",
+        "grunt-exec": "latest",
+        "grunt-karma": "latest",
+        "grunt-nuget": "latest",
+        "grunt-string-replace": "latest",
+        "karma": "latest",
+        "karma-chrome-launcher": "latest",
+        "karma-firefox-launcher": "latest",
+        "karma-qunit": "latest",
+        "karma-sauce-launcher": "4.1.4",
+        "load-grunt-tasks": "latest",
+        "lodash": ">=4.17.19",
+        "node-qunit": "latest",
+        "nyc": "latest",
+        "prettier": "latest",
+        "qunit": "^2.10.0",
+        "rollup": "2.17.1",
+        "typescript": "^1.8.10",
+        "typescript3": "npm:typescript@^3.1.6",
+        "uglify-js": "latest",
+        "@types/node": "17.0.21"
     },
-    "buildConfig": {
-      "uglify": true
-    }
-  },
-  "keywords": [
-    "moment",
-    "date",
-    "time",
-    "parse",
-    "format",
-    "validate",
-    "i18n",
-    "l10n",
-    "ender"
-  ],
-  "license": "MIT",
-  "main": "./moment.js",
-  "name": "moment",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/moment/moment.git"
-  },
-  "scripts": {
-    "coverage": "nyc npm test && nyc report",
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
-    "eslint": "eslint Gruntfile.js tasks src",
-    "prettier-check": "prettier --check Gruntfile.js tasks src",
-    "prettier-fmt": "prettier --write Gruntfile.js tasks src",
-    "test": "grunt test",
-    "ts3.1-typescript-test": "cross-env node_modules/typescript3/bin/tsc --project ts3.1-typing-tests",
-    "typescript-test": "cross-env node_modules/typescript/bin/tsc --project typing-tests"
-  },
-  "spm": {
-    "main": "moment.js",
-    "output": [
-      "locale/*.js"
-    ]
-  },
-  "typesVersions": {
-    ">=3.1": {
-      "*": [
-        "ts3.1-typings/*"
-      ],
-      "min/moment-with-locales": [
-        "ts3.1-typings/moment.d.ts"
-      ]
+    "ender": "./ender.js",
+    "dojoBuild": "package.js",
+    "jspm": {
+        "files": [
+            "moment.js",
+            "moment.d.ts",
+            "locale"
+        ],
+        "map": {
+            "moment": "./moment"
+        },
+        "buildConfig": {
+            "uglify": true
+        }
+    },
+    "scripts": {
+        "ts3.1-typescript-test": "cross-env node_modules/typescript3/bin/tsc --project ts3.1-typing-tests",
+        "typescript-test": "cross-env node_modules/typescript/bin/tsc --project typing-tests",
+        "test": "grunt test",
+        "eslint": "eslint Gruntfile.js tasks src",
+        "prettier-check": "prettier --check Gruntfile.js tasks src",
+        "prettier-fmt": "prettier --write Gruntfile.js tasks src",
+        "coverage": "nyc npm test && nyc report",
+        "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
+    },
+    "spm": {
+        "main": "moment.js",
+        "output": [
+            "locale/*.js"
+        ]
     }
-  },
-  "typings": "./moment.d.ts",
-  "version": "2.30.1"
 }

+ 82 - 117
node_modules/uview-ui/package.json

@@ -1,119 +1,84 @@
 {
-  "_args": [
-    [
-      "uview-ui@2.0.37",
-      "D:\\通防技术部\\jeecg-uniapp"
-    ]
-  ],
-  "_from": "uview-ui@2.0.37",
-  "_id": "uview-ui@2.0.37",
-  "_inBundle": false,
-  "_integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ==",
-  "_location": "/uview-ui",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "uview-ui@2.0.37",
-    "name": "uview-ui",
-    "escapedName": "uview-ui",
-    "rawSpec": "2.0.37",
-    "saveSpec": null,
-    "fetchSpec": "2.0.37"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz",
-  "_spec": "2.0.37",
-  "_where": "D:\\通防技术部\\jeecg-uniapp",
-  "bugs": {
-    "url": "https://github.com/umicro/uView2.0/issues"
-  },
-  "dcloudext": {
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": "1416956117"
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/uview-ui",
-    "type": "component-vue"
-  },
-  "description": "uView UI已完美兼容nvue,全面的组件和便捷的工具会让您信手拈来,如鱼得水",
-  "displayName": "uView2.0重磅发布,利剑出鞘,一统江湖",
-  "engines": {
-    "HBuilderX": "^3.1.0"
-  },
-  "homepage": "https://github.com/umicro/uView2.0#readme",
-  "id": "uview-ui",
-  "keywords": [
-    "uview",
-    "uview",
-    "ui",
-    "ui",
-    "uni-app",
-    "uni-app",
-    "ui"
-  ],
-  "name": "uview-ui",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/umicro/uView2.0.git"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "Vue": {
-          "vue2": "y",
-          "vue3": "n"
-        },
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "y",
-          "联盟": "y"
-        }
-      }
-    }
-  },
-  "version": "2.0.37"
+	"id": "uview-ui",
+	"name": "uview-ui",
+	"displayName": "uView2.0重磅发布,利剑出鞘,一统江湖",
+	"version": "2.0.37",
+	"description": "uView UI已完美兼容nvue,全面的组件和便捷的工具会让您信手拈来,如鱼得水",
+	"keywords": [
+        "uview",
+        "uview",
+        "ui",
+        "ui",
+        "uni-app",
+        "uni-app",
+        "ui"
+    ],
+	"repository": "https://github.com/umicro/uView2.0",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": "1416956117"
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/uview-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "n"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "y",
+					"联盟": "y"
+				}
+			}
+		}
+	}
 }

+ 50 - 80
node_modules/vuex/package.json

@@ -1,39 +1,59 @@
 {
-  "_args": [
-    [
-      "vuex@3.6.2",
-      "D:\\通防技术部\\jeecg-uniapp"
-    ]
-  ],
-  "_from": "vuex@3.6.2",
-  "_id": "vuex@3.6.2",
-  "_inBundle": false,
-  "_integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
-  "_location": "/vuex",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "vuex@3.6.2",
-    "name": "vuex",
-    "escapedName": "vuex",
-    "rawSpec": "3.6.2",
-    "saveSpec": null,
-    "fetchSpec": "3.6.2"
+  "name": "vuex",
+  "version": "3.6.2",
+  "description": "state management for Vue.js",
+  "main": "dist/vuex.common.js",
+  "exports": {
+    ".": {
+      "module": "./dist/vuex.esm.js",
+      "require": "./dist/vuex.common.js",
+      "import": "./dist/vuex.mjs"
+    },
+    "./": "./"
   },
-  "_requiredBy": [
-    "/"
+  "module": "dist/vuex.esm.js",
+  "unpkg": "dist/vuex.js",
+  "jsdelivr": "dist/vuex.js",
+  "typings": "types/index.d.ts",
+  "sideEffects": false,
+  "files": [
+    "dist",
+    "types/index.d.ts",
+    "types/helpers.d.ts",
+    "types/logger.d.ts",
+    "types/vue.d.ts"
   ],
-  "_resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
-  "_spec": "3.6.2",
-  "_where": "D:\\通防技术部\\jeecg-uniapp",
-  "author": {
-    "name": "Evan You"
+  "scripts": {
+    "dev": "node examples/server.js",
+    "build": "npm run build:main && npm run build:logger",
+    "build:main": "node scripts/build-main.js",
+    "build:logger": "node scripts/build-logger.js",
+    "lint": "eslint src test",
+    "test": "npm run lint && npm run test:types && npm run test:unit && npm run test:ssr && npm run test:e2e && npm run test:esm",
+    "test:unit": "jest --testPathIgnorePatterns test/e2e",
+    "test:e2e": "start-server-and-test dev http://localhost:8080 \"jest --testPathIgnorePatterns test/unit\"",
+    "test:ssr": "cross-env VUE_ENV=server jest --testPathIgnorePatterns test/e2e",
+    "test:types": "tsc -p types/test",
+    "test:esm": "node test/esm/esm-test.js",
+    "coverage": "jest --testPathIgnorePatterns test/e2e --coverage",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
+    "release": "node scripts/release.js",
+    "docs": "vuepress dev docs",
+    "docs:build": "vuepress build docs"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuex.git"
   },
+  "author": "Evan You",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/vuejs/vuex/issues"
   },
-  "description": "state management for Vue.js",
+  "homepage": "https://github.com/vuejs/vuex#readme",
+  "peerDependencies": {
+    "vue": "^2.0.0"
+  },
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
@@ -72,55 +92,5 @@
     "webpack": "^4.43.0",
     "webpack-dev-middleware": "^3.7.2",
     "webpack-hot-middleware": "^2.25.0"
-  },
-  "exports": {
-    ".": {
-      "module": "./dist/vuex.esm.js",
-      "require": "./dist/vuex.common.js",
-      "import": "./dist/vuex.mjs"
-    },
-    "./": "./"
-  },
-  "files": [
-    "dist",
-    "types/index.d.ts",
-    "types/helpers.d.ts",
-    "types/logger.d.ts",
-    "types/vue.d.ts"
-  ],
-  "homepage": "https://github.com/vuejs/vuex#readme",
-  "jsdelivr": "dist/vuex.js",
-  "license": "MIT",
-  "main": "dist/vuex.common.js",
-  "module": "dist/vuex.esm.js",
-  "name": "vuex",
-  "peerDependencies": {
-    "vue": "^2.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vuex.git"
-  },
-  "scripts": {
-    "build": "npm run build:main && npm run build:logger",
-    "build:logger": "node scripts/build-logger.js",
-    "build:main": "node scripts/build-main.js",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "coverage": "jest --testPathIgnorePatterns test/e2e --coverage",
-    "dev": "node examples/server.js",
-    "docs": "vuepress dev docs",
-    "docs:build": "vuepress build docs",
-    "lint": "eslint src test",
-    "release": "node scripts/release.js",
-    "test": "npm run lint && npm run test:types && npm run test:unit && npm run test:ssr && npm run test:e2e && npm run test:esm",
-    "test:e2e": "start-server-and-test dev http://localhost:8080 \"jest --testPathIgnorePatterns test/unit\"",
-    "test:esm": "node test/esm/esm-test.js",
-    "test:ssr": "cross-env VUE_ENV=server jest --testPathIgnorePatterns test/e2e",
-    "test:types": "tsc -p types/test",
-    "test:unit": "jest --testPathIgnorePatterns test/e2e"
-  },
-  "sideEffects": false,
-  "typings": "types/index.d.ts",
-  "unpkg": "dist/vuex.js",
-  "version": "3.6.2"
+  }
 }

+ 33 - 60
node_modules/zrender/node_modules/tslib/package.json

@@ -1,64 +1,37 @@
 {
-  "_from": "tslib@2.3.0",
-  "_id": "tslib@2.3.0",
-  "_inBundle": false,
-  "_integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
-  "_location": "/zrender/tslib",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "tslib@2.3.0",
     "name": "tslib",
-    "escapedName": "tslib",
-    "rawSpec": "2.3.0",
-    "saveSpec": null,
-    "fetchSpec": "2.3.0"
-  },
-  "_requiredBy": [
-    "/zrender"
-  ],
-  "_resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
-  "_shasum": "803b8cdab3e12ba581a4ca41c8839bbb0dacb09e",
-  "_spec": "tslib@2.3.0",
-  "_where": "D:\\通防技术部\\jeecg-uniapp\\node_modules\\zrender",
-  "author": {
-    "name": "Microsoft Corp."
-  },
-  "bugs": {
-    "url": "https://github.com/Microsoft/TypeScript/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "Runtime library for TypeScript helper functions",
-  "exports": {
-    ".": {
-      "module": "./tslib.es6.js",
-      "import": "./modules/index.js",
-      "default": "./tslib.js"
+    "author": "Microsoft Corp.",
+    "homepage": "https://www.typescriptlang.org/",
+    "version": "2.3.0",
+    "license": "0BSD",
+    "description": "Runtime library for TypeScript helper functions",
+    "keywords": [
+        "TypeScript",
+        "Microsoft",
+        "compiler",
+        "language",
+        "javascript",
+        "tslib",
+        "runtime"
+    ],
+    "bugs": {
+        "url": "https://github.com/Microsoft/TypeScript/issues"
     },
-    "./": "./"
-  },
-  "homepage": "https://www.typescriptlang.org/",
-  "jsnext:main": "tslib.es6.js",
-  "keywords": [
-    "TypeScript",
-    "Microsoft",
-    "compiler",
-    "language",
-    "javascript",
-    "tslib",
-    "runtime"
-  ],
-  "license": "0BSD",
-  "main": "tslib.js",
-  "module": "tslib.es6.js",
-  "name": "tslib",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Microsoft/tslib.git"
-  },
-  "sideEffects": false,
-  "typings": "tslib.d.ts",
-  "version": "2.3.0"
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Microsoft/tslib.git"
+    },
+    "main": "tslib.js",
+    "module": "tslib.es6.js",
+    "jsnext:main": "tslib.es6.js",
+    "typings": "tslib.d.ts",
+    "sideEffects": false,
+    "exports": {
+        ".": {
+            "module": "./tslib.es6.js",
+            "import": "./modules/index.js",
+            "default": "./tslib.js"
+        },
+        "./": "./"
+    }
 }

+ 37 - 69
node_modules/zrender/package.json

@@ -1,39 +1,44 @@
 {
-  "_args": [
-    [
-      "zrender@5.6.0",
-      "D:\\通防技术部\\jeecg-uniapp"
-    ]
+  "name": "zrender",
+  "version": "5.6.0",
+  "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
+  "keywords": [
+    "canvas",
+    "svg",
+    "2d",
+    "html5",
+    "vector-graphics"
   ],
-  "_from": "zrender@5.6.0",
-  "_id": "zrender@5.6.0",
-  "_inBundle": false,
-  "_integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==",
-  "_location": "/zrender",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "zrender@5.6.0",
-    "name": "zrender",
-    "escapedName": "zrender",
-    "rawSpec": "5.6.0",
-    "saveSpec": null,
-    "fetchSpec": "5.6.0"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ecomfe/zrender.git"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz",
-  "_spec": "5.6.0",
-  "_where": "D:\\通防技术部\\jeecg-uniapp",
-  "bugs": {
-    "url": "https://github.com/ecomfe/zrender/issues"
+  "scripts": {
+    "prepare": "npm run build:lib",
+    "build": "npm run build:bundle && npm run build:lib",
+    "release": "node build/build.js --minify && npm run build:lib",
+    "prepublishOnly": "node build/prepublish.js",
+    "prepare:nightly": "node build/prepareNightly.js",
+    "prepare:nightly-next": "node build/prepareNightly.js --next",
+    "build:bundle": "node build/build.js",
+    "build:lib": "npx tsc -m ES2015 --outDir lib && node build/processLib.js",
+    "watch:bundle": "node build/build.js --watch",
+    "watch:lib": "npx tsc-watch -m ES2015 --outDir lib --synchronousWatchDirectory --onSuccess \"node build/processLib.js\"",
+    "test": "npx jest --config test/ut/jest.config.js",
+    "lint": "npx eslint src/**/*.ts"
   },
+  "license": "BSD-3-Clause",
+  "types": "index.d.ts",
+  "module": "index.js",
+  "main": "dist/zrender.js",
   "dependencies": {
     "tslib": "2.3.0"
   },
-  "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
+  "sideEffects": [
+    "lib/canvas/canvas.js",
+    "lib/svg/svg.js",
+    "lib/all.js"
+  ],
   "devDependencies": {
     "@microsoft/api-extractor": "^7.7.2",
     "@rollup/plugin-node-resolve": "^11.0.0",
@@ -55,6 +60,7 @@
     "typescript": "^4.4.3",
     "uglify-js": "^3.10.0"
   },
+  "type": "module",
   "exports": {
     ".": {
       "types": "./index.d.ts",
@@ -79,43 +85,5 @@
     "./lib/graphic/LinearGradient": "./lib/graphic/LinearGradient.js",
     "./lib/graphic/RadialGradient": "./lib/graphic/RadialGradient.js",
     "./*": "./*"
-  },
-  "homepage": "https://github.com/ecomfe/zrender#readme",
-  "keywords": [
-    "canvas",
-    "svg",
-    "2d",
-    "html5",
-    "vector-graphics"
-  ],
-  "license": "BSD-3-Clause",
-  "main": "dist/zrender.js",
-  "module": "index.js",
-  "name": "zrender",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ecomfe/zrender.git"
-  },
-  "scripts": {
-    "build": "npm run build:bundle && npm run build:lib",
-    "build:bundle": "node build/build.js",
-    "build:lib": "npx tsc -m ES2015 --outDir lib && node build/processLib.js",
-    "lint": "npx eslint src/**/*.ts",
-    "prepare": "npm run build:lib",
-    "prepare:nightly": "node build/prepareNightly.js",
-    "prepare:nightly-next": "node build/prepareNightly.js --next",
-    "prepublishOnly": "node build/prepublish.js",
-    "release": "node build/build.js --minify && npm run build:lib",
-    "test": "npx jest --config test/ut/jest.config.js",
-    "watch:bundle": "node build/build.js --watch",
-    "watch:lib": "npx tsc-watch -m ES2015 --outDir lib --synchronousWatchDirectory --onSuccess \"node build/processLib.js\""
-  },
-  "sideEffects": [
-    "lib/canvas/canvas.js",
-    "lib/svg/svg.js",
-    "lib/all.js"
-  ],
-  "type": "module",
-  "types": "index.d.ts",
-  "version": "5.6.0"
-}
+  }
+}

+ 65 - 47
package-lock.json

@@ -1,96 +1,114 @@
 {
+  "name": "Vent-App",
+  "lockfileVersion": 3,
   "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "crypto-js": {
+  "packages": {
+    "": {
+      "dependencies": {
+        "crypto-js": "^4.2.0",
+        "dayjs": "^1.11.10",
+        "echarts": "^5.5.1",
+        "flv.js": "^1.6.2",
+        "moment": "^2.30.1",
+        "string-similarity": "^4.0.4",
+        "uview-ui": "^2.0.36",
+        "vuex": "^3.6.2",
+        "zrender": "^5.6.0"
+      }
+    },
+    "node_modules/crypto-js": {
       "version": "4.2.0",
       "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
       "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
-    "dayjs": {
+    "node_modules/dayjs": {
       "version": "1.11.12",
       "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.12.tgz",
       "integrity": "sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg=="
     },
-    "echarts": {
+    "node_modules/echarts": {
       "version": "5.5.1",
       "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz",
       "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==",
-      "requires": {
+      "dependencies": {
         "tslib": "2.3.0",
         "zrender": "5.6.0"
-      },
+      }
+    },
+    "node_modules/echarts/node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
+    "node_modules/echarts/node_modules/zrender": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz",
+      "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==",
       "dependencies": {
-        "tslib": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
-          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-        },
-        "zrender": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz",
-          "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==",
-          "requires": {
-            "tslib": "2.3.0"
-          }
-        }
+        "tslib": "2.3.0"
       }
     },
-    "es6-promise": {
+    "node_modules/es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
       "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
-    "flv.js": {
+    "node_modules/flv.js": {
       "version": "1.6.2",
       "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
       "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
-      "requires": {
+      "dependencies": {
         "es6-promise": "^4.2.8",
         "webworkify-webpack": "^2.1.5"
-      },
-      "dependencies": {
-        "webworkify-webpack": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
-          "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="
-        }
       }
     },
-    "moment": {
+    "node_modules/flv.js/node_modules/webworkify-webpack": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+      "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="
+    },
+    "node_modules/moment": {
       "version": "2.30.1",
       "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
     },
-    "string-similarity": {
+    "node_modules/string-similarity": {
       "version": "4.0.4",
       "resolved": "https://registry.npmmirror.com/string-similarity/-/string-similarity-4.0.4.tgz",
-      "integrity": "sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ=="
+      "integrity": "sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
     },
-    "uview-ui": {
+    "node_modules/uview-ui": {
       "version": "2.0.37",
       "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz",
-      "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ=="
+      "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ==",
+      "engines": {
+        "HBuilderX": "^3.1.0"
+      }
     },
-    "vuex": {
+    "node_modules/vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
-      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
+      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
+      "peerDependencies": {
+        "vue": "^2.0.0"
+      }
     },
-    "zrender": {
+    "node_modules/zrender": {
       "version": "5.6.0",
       "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz",
       "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==",
-      "requires": {
-        "tslib": "2.3.0"
-      },
       "dependencies": {
-        "tslib": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
-          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-        }
+        "tslib": "2.3.0"
       }
+    },
+    "node_modules/zrender/node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     }
   }
 }

+ 0 - 1
package.json

@@ -4,7 +4,6 @@
     "dayjs": "^1.11.10",
     "echarts": "^5.5.1",
     "flv.js": "^1.6.2",
-    "hammerjs": "^2.0.8",
     "moment": "^2.30.1",
     "string-similarity": "^4.0.4",
     "uview-ui": "^2.0.36",

文件差异内容过多而无法显示
+ 1187 - 831
pages/gasreport/components/gasImgIdentify.vue


+ 99 - 0
pages/gasreport/components/taskBoard.vue

@@ -0,0 +1,99 @@
+<template>
+    <view class="taskBoard">
+        <u-navbar :bgStatusImage="backPic0" :bgImage="backPic" :title="gasTitle" :safeAreaInsetTop="true"
+            leftIcon="" @leftClick="handlerToggle"> </u-navbar>
+        <u-list :height="708" v-if="isShow">
+            <u-list-item v-for="(item, index) in indexList" :key="index">
+                <u-cell icon="share" @click="getBorad(item)">
+                    <view slot="title" class="u-slot-title">
+                        <text class="u-cell-text">{{ item.name }}</text>
+                    </view>
+                    <view slot="value" class="u-slot-title">
+                        <u-tag :text="item.classType_dictText" plain size="mini"
+                            :type="item.classType_dictText == '早班' ? 'success' : item.classType_dictText == '中班' ? 'warning' : 'error'">
+                        </u-tag>
+                    </view>
+                </u-cell>
+            </u-list-item>
+        </u-list>
+        <component v-else :is="loadComponent" :taskId="taskId" @getBackBoard="getBackBoard"></component>
+    </view>
+</template>
+
+<script>
+import api from "@/api/api";
+import taskBoardAddress from './taskBoardAddress.vue'
+
+export default {
+    name: 'taskBoard',
+    components: {
+        taskBoardAddress
+    },
+    props: {},
+
+    data() {
+        return {
+            isShow: true,
+            loadComponent: '',
+            taskId: '',
+            indexList: [],
+            gasTitle: '巡检任务',//标题
+            backPic0: "url(/static/topnavbar0.png)",
+            backPic: "url(../../static/topnavbar.png)",
+        }
+    },
+    computed: {},
+    mounted() {
+        this.getTimeList()
+    },
+    methods: {
+        //点击返回上一级
+        getBackBoard() {
+            let that=this
+            that.isShow = true
+            that.loadComponent = ''
+        },
+        //点击跳转到识别看板
+        getBorad(item) {
+            let that = this
+            that.isShow = false
+            that.taskId = item.id
+            that.loadComponent = 'taskBoardAddress'
+        },
+        //获取任务管理列表数据
+        getTimeList() {
+            let that = this
+            new Promise((resolve, reject) => {
+                api
+                    .teamList({ pageNo: 1, pageSize: 100 })
+                    .then((response) => {
+                        if (response.data.code == 200) {
+                            that.indexList = response.data.result.records
+                        } else {
+                            reject(response);
+                        }
+                    })
+                    .catch((error) => {
+                        console.log("catch===>response", response);
+                        reject(error);
+                    });
+            });
+        }
+    }
+
+};
+</script>
+
+<style lang="scss" scoped>
+.taskBoard {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+
+}
+
+::v-deep .u-slot-title {
+    display: flex;
+}
+</style>

+ 128 - 0
pages/gasreport/components/taskBoardAddress.vue

@@ -0,0 +1,128 @@
+<template>
+    <view class="taskBoardAddress">
+        <u-navbar :bgStatusImage="backPic0" :bgImage="backPic" :title="gasTitle" :safeAreaInsetTop="true"
+        leftIcon="arrow-left" @leftClick="handlerToggle"> </u-navbar>
+        <u-list :height="708" v-if="isShow">
+            <u-list-item v-for="(item, index) in indexList" :key="index">
+                <u-cell icon="share" @click="getBoradAddress(item)">
+                    <view slot="title" class="u-slot-title">
+                        <text class="u-cell-text">{{ item.deviceName }}</text>
+                        <!-- <u-tag text="查看" plain size="mini" type="warning">
+                        </u-tag> -->
+                    </view>
+                    <view slot="value">
+                        <u-icon :name="item.checkState == '0' ? 'plus' : 'checkmark'" size="16"></u-icon>
+                    </view>
+                </u-cell>
+            </u-list-item>
+        </u-list>
+        <component :is="toComponent" :Ids="Ids" :checkNum="checkNum" :classType="classType" :isSensor="isSensor"
+            :deviceID="deviceID" :deviceName="deviceName" :checkState="checkState" @getBackAddress="getBackAddress" ></component>
+    </view>
+</template>
+
+<script>
+import api from "@/api/api";
+import gasImgIdentify from './gasImgIdentify.vue'
+
+export default {
+    name: 'taskBoardAddress',
+    components: { gasImgIdentify },
+    props: {
+        taskId: {
+            type: String,
+            default: ''
+        }
+    },
+
+    data() {
+        return {
+            Ids: '',
+            checkNum: '',//巡检次数
+            classType: '',
+            isSensor: '',
+            deviceID: '',
+            deviceName: '',
+            checkState:'',
+            isShow: true,
+            toComponent: '',
+            indexList: [],
+            gasTitle: '任务明细',//标题
+            backPic0: "url(/static/topnavbar0.png)",
+            backPic: "url(../../static/topnavbar.png)",
+        }
+    },
+    computed: {},
+    mounted() {
+        this.taskDetailsLists()
+    },
+    methods: {
+        //点击返回上一级
+        handlerToggle(){
+            this.$emit('getBackBoard')
+        },
+        getBoradAddress(item) {
+            let that = this
+            if (item.checkState == '0') {
+                that.isShow = false
+                that.Ids = item.id
+                that.checkNum = item.checkNum
+                that.classType = item.classType_dictText
+                that.checkState=item.checkState
+                that.isSensor = item.isSensor
+                that.deviceID = item.deviceId
+                that.deviceName = item.deviceName
+                that.toComponent = 'gasImgIdentify'
+            } else {
+                that.isShow = false
+                that.checkState=item.checkState
+                that.checkNum = item.checkNum
+                that.deviceID = item.deviceId
+                that.classType = item.classType_dictText
+                that.toComponent = 'gasImgIdentify'
+            }
+
+        },
+        getBackAddress() {
+            this.isShow = true
+            this.toComponent = ''
+            this.taskDetailsLists()
+        },
+       
+        taskDetailsLists() {
+            let that = this
+            new Promise((resolve, reject) => {
+                api
+                    .taskDetailsList({ pageNo: 1, pageSize: 100, taskId: that.taskId })
+                    .then((response) => {
+                        if (response.data.code == 200) {
+                            console.log(response, '地点列表---')
+                            that.indexList = response.data.result.records || []
+                        } else {
+                            reject(response);
+                        }
+                    })
+                    .catch((error) => {
+                        console.log("catch===>response", response);
+                        reject(error);
+                    });
+            });
+        }
+    }
+
+};
+</script>
+
+<style lang="scss" scoped>
+.taskBoardAddress {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+
+}
+
+::v-deep .u-slot-title {
+    display: flex;
+}
+</style>

+ 12 - 9
pages/gasreport/gasreport.vue

@@ -1,8 +1,7 @@
 <template>
     <view class="gas-report" name="gasreport">
-        <u-navbar
-      :bgStatusImage="backPic0"
-      :bgImage="backPic" :title="gasTitle" :safeAreaInsetTop="true" leftIcon="list" @leftClick="handlerToggle"> </u-navbar>
+        <u-navbar :bgStatusImage="backPic0" :bgImage="backPic" :title="gasTitle" :safeAreaInsetTop="true"
+            leftIcon="" @leftClick="handlerToggle"> </u-navbar>
         <view class="gas-content">
             <component :is="loadComponent" :firstAddress="firstAddress" :secondAddress="secondAddress"
                 :firstTj="firstTj" :secondTj="secondTj"></component>
@@ -21,6 +20,7 @@ import gasFill from './components/gasFill.vue'
 import gasTask from './components/gasTask.vue'
 import gasRecordCard from './components/gasRecordCard.vue'
 import gasImgIdentify from './components/gasImgIdentify.vue'
+import taskBoard from './components/taskBoard.vue'
 export default {
     name: 'gasreport',
     components: {
@@ -28,16 +28,18 @@ export default {
         gasFill,
         gasTask,
         gasRecordCard,
-        gasImgIdentify
+        gasImgIdentify,
+        taskBoard
     },
     data() {
         return {
             backPic0: "url(/static/topnavbar0.png)",
             backPic: "url(../../static/topnavbar.png)",
-            gasTitle: '瓦斯日报',//标题
+            gasTitle: '瓦斯日报1',//标题
             showModel: false,//是否打开弹出层
             // loadComponent: 'gasFill',//默认加载组件
-            loadComponent: 'gasImgIdentify',//默认加载组件
+            // loadComponent: 'gasImgIdentify',//默认加载组件
+            loadComponent: 'taskBoard',//默认加载组件
             taskTj: {},
             firstAddress: '',//一次线路
             secondAddress: '',//二次线路
@@ -55,7 +57,8 @@ export default {
 
         //切换导航
         handlerToggle() {
-            this.showModel = !this.showModel
+            // this.showModel = !this.showModel
+           
         },
         //导航栏点击
         handlerClick(data) {
@@ -67,7 +70,7 @@ export default {
                     that.showModel = false
                     break;
                 case '图片识别':
-                    that.loadComponent = 'gasImgIdentify'
+                    that.loadComponent = 'taskBoard'
                     that.gasTitle = '图片识别'
                     that.showModel = false
                     break;
@@ -113,7 +116,7 @@ export default {
                     .queryNowGasInfoByUser({})
                     .then((response) => {
                         if (response.data.code == 200) {
-                            that.taskTj=response.data.result
+                            that.taskTj = response.data.result
                         } else {
                             reject(response);
                         }

部分文件因为文件数量过多而无法显示