Merge branch 'master' of http://182.92.126.35:3000/msx/Vent-App

common/service/config.service.js

@@ -11,15 +11,15 @@ if (process.env.NODE_ENV == "development") {
   // BASE_URL = "http://10.120.120.164:9999"; // 察哈素
   // BASE_URL = "http://182.92.126.35:9999"; // 生产环境
   // BASE_URL = "http://172.16.53.16:9999"; // 
-  BASE_URL = "http://10.246.167.205: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"; //上湾
 }
 let staticDomainURL = BASE_URL + "/sys/common/static";
 
 const configService = {
   apiUrl: BASE_URL,
-  apiUrlP: 'http://10.226.13.96:6006',
+  apiUrlP: 'http://10.246.167.205:6006',
   staticDomainURL: staticDomainURL,
 };
 

node_modules/.store/echarts@5.5.1/node_modules/echarts/package.json

@@ -1,72 +1,41 @@
 {
-  "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"
+  "_args": [
+    [
+      "echarts@5.5.1",
+      "D:\\通防技术部\\jeecg-uniapp"
+    ]
   ],
-  "main": "dist/echarts.js",
-  "module": "index.js",
-  "jsdelivr": "dist/echarts.min.js",
-  "types": "index.d.ts",
-  "homepage": "https://echarts.apache.org",
+  "_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": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz",
+  "_spec": "5.5.1",
+  "_where": "D:\\通防技术部\\jeecg-uniapp",
   "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",
@@ -102,7 +71,6 @@
     "ts-jest": "^26.4.3",
     "typescript": "4.4.3"
   },
-  "type": "module",
   "exports": {
     ".": {
       "types": "./index.d.ts",
@@ -222,7 +190,64 @@
     "./dist/extension/dataTool.min": "./dist/extension/dataTool.min.js",
     "./*": "./*"
   },
-  "__npminstall_done": true,
-  "_from": "echarts@5.5.1",
-  "_resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz"
+  "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"
 }

node_modules/.store/echarts@5.5.1/node_modules/zrender/package.json

@@ -1,44 +1,39 @@
 {
-  "name": "zrender",
-  "version": "5.6.0",
-  "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
-  "keywords": [
-    "canvas",
-    "svg",
-    "2d",
-    "html5",
-    "vector-graphics"
+  "_args": [
+    [
+      "zrender@5.6.0",
+      "D:\\通防技术部\\jeecg-uniapp"
+    ]
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ecomfe/zrender.git"
+  "_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"
   },
-  "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"
+  "_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"
   },
-  "license": "BSD-3-Clause",
-  "types": "index.d.ts",
-  "module": "index.js",
-  "main": "dist/zrender.js",
   "dependencies": {
     "tslib": "2.3.0"
   },
-  "sideEffects": [
-    "lib/canvas/canvas.js",
-    "lib/svg/svg.js",
-    "lib/all.js"
-  ],
+  "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
   "devDependencies": {
     "@microsoft/api-extractor": "^7.7.2",
     "@rollup/plugin-node-resolve": "^11.0.0",
@@ -60,7 +55,6 @@
     "typescript": "^4.4.3",
     "uglify-js": "^3.10.0"
   },
-  "type": "module",
   "exports": {
     ".": {
       "types": "./index.d.ts",
@@ -86,7 +80,42 @@
     "./lib/graphic/RadialGradient": "./lib/graphic/RadialGradient.js",
     "./*": "./*"
   },
-  "__npminstall_done": true,
-  "_from": "zrender@5.6.0",
-  "_resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz"
+  "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"
 }

node_modules/.store/moment@2.30.1/node_modules/moment/package.json

@@ -1,52 +1,69 @@
 {
-  "name": "moment",
-  "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"
+  "_args": [
+    [
+      "moment@2.30.1",
+      "D:\\通防技术部\\jeecg-uniapp"
+    ]
   ],
-  "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"
-      ]
-    }
-  },
-  "engines": {
-    "node": "*"
+  "_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"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/moment/moment.git"
+  "_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"
   },
-  "license": "MIT",
+  "contributors": [
+    {
+      "name": "Tim Wood",
+      "email": "washwithcare@gmail.com",
+      "url": "http://timwoodcreates.com/"
+    },
+    {
+      "name": "Rocky Meza",
+      "url": "http://rockymeza.com"
+    },
+    {
+      "name": "Matt Johnson",
+      "email": "mj1856@hotmail.com",
+      "url": "http://codeofmatt.com"
+    },
+    {
+      "name": "Isaac Cambron",
+      "email": "isaac@isaaccambron.com",
+      "url": "http://isaaccambron.com"
+    },
+    {
+      "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",
@@ -79,11 +96,15 @@
     "rollup": "2.17.1",
     "typescript": "^1.8.10",
     "typescript3": "npm:typescript@^3.1.6",
-    "uglify-js": "latest",
-    "@types/node": "17.0.21"
+    "uglify-js": "latest"
   },
-  "ender": "./ender.js",
   "dojoBuild": "package.js",
+  "ender": "./ender.js",
+  "engines": {
+    "node": "*"
+  },
+  "homepage": "https://momentjs.com",
+  "jsnext:main": "./dist/moment.js",
   "jspm": {
     "files": [
       "moment.js",
@@ -97,15 +118,33 @@
       "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": {
-    "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",
+    "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",
-    "coverage": "nyc npm test && nyc report",
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
+    "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",
@@ -113,7 +152,16 @@
       "locale/*.js"
     ]
   },
-  "__npminstall_done": true,
-  "_from": "moment@2.30.1",
-  "_resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz"
+  "typesVersions": {
+    ">=3.1": {
+      "*": [
+        "ts3.1-typings/*"
+      ],
+      "min/moment-with-locales": [
+        "ts3.1-typings/moment.d.ts"
+      ]
+    }
+  },
+  "typings": "./moment.d.ts",
+  "version": "2.30.1"
 }

node_modules/.store/node_modules/zrender/package.json

@@ -1,44 +1,39 @@
 {
-  "name": "zrender",
-  "version": "5.6.0",
-  "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
-  "keywords": [
-    "canvas",
-    "svg",
-    "2d",
-    "html5",
-    "vector-graphics"
+  "_args": [
+    [
+      "zrender@5.6.0",
+      "D:\\通防技术部\\jeecg-uniapp"
+    ]
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ecomfe/zrender.git"
+  "_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"
   },
-  "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"
+  "_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"
   },
-  "license": "BSD-3-Clause",
-  "types": "index.d.ts",
-  "module": "index.js",
-  "main": "dist/zrender.js",
   "dependencies": {
     "tslib": "2.3.0"
   },
-  "sideEffects": [
-    "lib/canvas/canvas.js",
-    "lib/svg/svg.js",
-    "lib/all.js"
-  ],
+  "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
   "devDependencies": {
     "@microsoft/api-extractor": "^7.7.2",
     "@rollup/plugin-node-resolve": "^11.0.0",
@@ -60,7 +55,6 @@
     "typescript": "^4.4.3",
     "uglify-js": "^3.10.0"
   },
-  "type": "module",
   "exports": {
     ".": {
       "types": "./index.d.ts",
@@ -86,7 +80,42 @@
     "./lib/graphic/RadialGradient": "./lib/graphic/RadialGradient.js",
     "./*": "./*"
   },
-  "__npminstall_done": true,
-  "_from": "zrender@5.6.0",
-  "_resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz"
+  "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"
 }

node_modules/.store/uview-ui@2.0.37/node_modules/uview-ui/package.json

@@ -1,21 +1,34 @@
 {
-  "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"
+  "_args": [
+    [
+      "uview-ui@2.0.37",
+      "D:\\通防技术部\\jeecg-uniapp"
+    ]
   ],
-  "repository": "https://github.com/umicro/uView2.0",
-  "engines": {
-    "HBuilderX": "^3.1.0"
+  "_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": {
@@ -37,6 +50,27 @@
     "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": [],
@@ -81,7 +115,5 @@
       }
     }
   },
-  "__npminstall_done": true,
-  "_from": "uview-ui@2.0.37",
-  "_resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz"
+  "version": "2.0.37"
 }

node_modules/.store/vuex@3.6.2/node_modules/vuex/package.json

@@ -1,59 +1,39 @@
 {
-  "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"
-    },
-    "./": "./"
-  },
-  "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"
+  "_args": [
+    [
+      "vuex@3.6.2",
+      "D:\\通防技术部\\jeecg-uniapp"
+    ]
   ],
-  "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"
+  "_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"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vuex.git"
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
+  "_spec": "3.6.2",
+  "_where": "D:\\通防技术部\\jeecg-uniapp",
+  "author": {
+    "name": "Evan You"
   },
-  "author": "Evan You",
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/vuejs/vuex/issues"
   },
-  "homepage": "https://github.com/vuejs/vuex#readme",
-  "peerDependencies": {
-    "vue": "^2.0.0"
-  },
+  "description": "state management for Vue.js",
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
@@ -93,7 +73,54 @@
     "webpack-dev-middleware": "^3.7.2",
     "webpack-hot-middleware": "^2.25.0"
   },
-  "__npminstall_done": true,
-  "_from": "vuex@3.6.2",
-  "_resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz"
+  "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"
 }

node_modules/.store/zrender@5.6.0/node_modules/zrender/package.json

@@ -1,44 +1,39 @@
 {
-  "name": "zrender",
-  "version": "5.6.0",
-  "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
-  "keywords": [
-    "canvas",
-    "svg",
-    "2d",
-    "html5",
-    "vector-graphics"
+  "_args": [
+    [
+      "zrender@5.6.0",
+      "D:\\通防技术部\\jeecg-uniapp"
+    ]
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ecomfe/zrender.git"
+  "_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"
   },
-  "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"
+  "_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"
   },
-  "license": "BSD-3-Clause",
-  "types": "index.d.ts",
-  "module": "index.js",
-  "main": "dist/zrender.js",
   "dependencies": {
     "tslib": "2.3.0"
   },
-  "sideEffects": [
-    "lib/canvas/canvas.js",
-    "lib/svg/svg.js",
-    "lib/all.js"
-  ],
+  "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
   "devDependencies": {
     "@microsoft/api-extractor": "^7.7.2",
     "@rollup/plugin-node-resolve": "^11.0.0",
@@ -60,7 +55,6 @@
     "typescript": "^4.4.3",
     "uglify-js": "^3.10.0"
   },
-  "type": "module",
   "exports": {
     ".": {
       "types": "./index.d.ts",
@@ -86,7 +80,42 @@
     "./lib/graphic/RadialGradient": "./lib/graphic/RadialGradient.js",
     "./*": "./*"
   },
-  "__npminstall_done": true,
-  "_from": "zrender@5.6.0",
-  "_resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz"
+  "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"
 }

pages/device/index.vue

@@ -1,7 +1,9 @@
 <template>
 	<view>
 		<!-- 建议放在外层 -->
-		<u-navbar title="设备中心" @leftClick="devicemenuShow" :safeAreaInsetTop="true">
+		<u-navbar 
+      :bgStatusImage="backPic0"
+      :bgImage="backPic" title="设备中心" @leftClick="devicemenuShow" :safeAreaInsetTop="true">
 			<view class="u-nav-slot" slot="left">
 				<u-icon name="list" size="20"> </u-icon>
 			</view>
@@ -31,6 +33,8 @@ export default {
 	},
 	data() {
 		return {
+			backPic0: "url(/static/topnavbar0.png)",
+			backPic: "url(../../static/topnavbar.png)",
 			PageCur: "0",
 			showColum: {},
 			menushow: false,

pages/filecenter/filecenter.vue

@@ -16,7 +16,7 @@
     </view> -->
     <view v-if="!menushow" class="container">
       <view class="main">
-        <view class="fileArea" style="margin-top: 15px">
+        <view class="fileArea" style="margin-top: 28px">
           <view style="margin-top: 15px; margin-left: 10px" class="fileTitle"
             >文件名称</view
           >

pages/gasreport/components/gasFill.vue

@@ -1509,8 +1509,8 @@ export default {
                     .then((response) => {
                         if (response.data.code == 200) {
                             let data = response.data.result
-                            that.formState.jcdd = data.id
-                            that.deviceId = data.id
+                            that.formState.jcdd = data.strInstallPos
+                            that.deviceId = data.deviceId
                         }
                     })
             });
@@ -1524,8 +1524,6 @@ export default {
             if (that.nfcShow) {
                 testNfc.listenNFCStatus()
                 testNfc.readData();
-                // //根据NFC读取数据获取监测地点信息
-                // that.getCardLists(ids)
             }
         },
         getAddSave() {
@@ -1533,7 +1531,7 @@ export default {
             let param = {}
             if (that.formState.bc == '早班' && that.formState.count == '第一次') {
                 param = {
-                    id: that.formState.id,
+                    // id: that.formState.id,
                     deviceId: that.deviceId,
                     bxySdzEarly1: that.formState.bxy,
                     ch4Early1: that.formState.ch4,
@@ -1552,7 +1550,7 @@ export default {
             } else if (that.formState.bc == '早班' && that.formState.count == '第二次') {
                 param = {
                     deviceId: that.deviceId,
-                    id: that.formState.id,
+                    // id: that.formState.id,
                     bxySdzEarly2: that.formState.bxy,
                     ch4Early2: that.formState.ch4,
                     checkPersonEarly: that.formState.jcy,
@@ -1569,7 +1567,7 @@ export default {
             } else if (that.formState.bc == '中班' && that.formState.count == '第一次') {
                 param = {
                     deviceId: that.deviceId,
-                    id: that.formState.id,
+                    // id: that.formState.id,
                     bxySdzNoon1: that.formState.bxy,
                     ch4Noon1: that.formState.ch4,
                     checkPersonNoon: that.formState.jcy,
@@ -1587,7 +1585,7 @@ export default {
             } else if (that.formState.bc == '中班' && that.formState.count == '第二次') {
                 param = {
                     deviceId: that.deviceId,
-                    id: that.formState.id,
+                    // id: that.formState.id,
                     bxySdzNoon2: that.formState.bxy,
                     ch4Noon2: that.formState.ch4,
                     checkPersonNoon: that.formState.jcy,
@@ -1605,7 +1603,7 @@ export default {
             } else if (that.formState.bc == '夜班' && that.formState.count == '第一次') {
                 param = {
                     deviceId: that.deviceId,
-                    id: that.formState.id,
+                    // id: that.formState.id,
                     bxySdzNight1: that.formState.bxy,
                     ch4Night1: that.formState.ch4,
                     checkPersonNight: that.formState.jcy,
@@ -1622,7 +1620,7 @@ export default {
             } else if (that.formState.bc == '夜班' && that.formState.count == '第二次') {
                 param = {
                     deviceId: that.deviceId,
-                    id: that.formState.id,
+                    // id: that.formState.id,
                     bxySdzNight2: that.formState.bxy,
                     ch4Night2: that.formState.ch4,
                     checkPersonNoon: that.formState.jcy,
@@ -2117,7 +2115,6 @@ export default {
         //新增保存
         getConfirm() {
             let that = this
-            console.log(that.saveShowList, '999999999999999999999999999999999')
             that.isStatus = JSON.stringify(that.saveShowList) != '{}' ? 'edit' : 'add'
             if (that.isStatus == 'add') {
                 that.getAddSave()

pages/gasreport/components/gasImgIdentify.vue

@@ -156,8 +156,9 @@
             <view class="top-dialog-area">
                 <view class="dialog-item">
                     <text class="dialog-label">班次：</text>
-                    <uni-data-select placeholder="请选择班次" disabled style="text-align: center;" :clear="true"
-                        v-model="formState.bc" :localdata="rangeBc"></uni-data-select>
+                    <uni-data-select placeholder="请选择班次" style="text-align: center;" :clear="true"
+                        v-model="formState.bc" :disabled="statusShow == 'edit'" :localdata="rangeBc"
+                        @change="changeBc"></uni-data-select>
                 </view>
                 <view class="dialog-item">
                     <text class="dialog-label">检测次数：</text>
@@ -571,7 +572,119 @@ export default {
             this.indexParam = {}
             this.imageSrc = ''
         },
+        //班次选项切换
+        changeBc(e) {
+            let that = this
+            that.formState.bc = e
+            if (that.formState.bc == '早班' && that.formState.count == '第一次') {
+                let param = {
+                    deviceId: that.deviceId,
+                    bxySdzEarly1: that.formState.bxy,
+                    ch4Early1: that.formState.ch4,
+                    checkPersonEarly: that.formState.jcy,
+                    co2Early1: that.formState.co2,
+                    coEarly1: that.formState.co,
+                    gwSdzEarly1: that.formState.gw,
+                    jwSdzEarly1: that.formState.jw,
+                    o2Early1: that.formState.o2,
+                    strInstallPos: that.formState.jcdd,
+                    timeEarly1: that.formState.time,
+                    reportTime: that.formState.tbrq,
+                    tearly1: that.formState.temp,
+                }
+                that.paramData = Object.assign({}, that.saveShowList, param)
+            } else if (that.formState.bc == '早班' && that.formState.count == '第二次') {
+                let param = {
+                    deviceId: that.deviceId,
+                    bxySdzEarly2: that.formState.bxy,
+                    ch4Early2: that.formState.ch4,
+                    checkPersonEarly: that.formState.jcy,
+                    co2Early2: that.formState.co2,
+                    coEarly2: that.formState.co,
+                    gwSdzEarly2: that.formState.gw,
+                    jwSdzEarly2: that.formState.jw,
+                    o2Early2: that.formState.o2,
+                    strInstallPos: that.formState.jcdd,
+                    timeEarly2: that.formState.time,
+                    reportTime: that.formState.tbrq,
+                    tearly2: that.formState.temp,
+                }
+                that.paramData = Object.assign({}, that.saveShowList, param)
 
+            } else if (that.formState.bc == '中班' && that.formState.count == '第一次') {
+                let param = {
+                    deviceId: that.deviceId,
+                    bxySdzNoon1: that.formState.bxy,
+                    ch4Noon1: that.formState.ch4,
+                    checkPersonNoon: that.formState.jcy,
+                    co2Noon1: that.formState.co2,
+                    coNoon1: that.formState.co,
+                    gwSdzNoon1: that.formState.gw,
+                    jwSdzNoon1: that.formState.jw,
+                    o2Noon1: that.formState.o2,
+                    strInstallPos: that.formState.jcdd,
+                    timeNoon1: that.formState.time,
+                    reportTime: that.formState.tbrq,
+                    tnoon1: that.formState.temp,
+                }
+                that.paramData = Object.assign({}, that.saveShowList, param)
+
+            } else if (that.formState.bc == '中班' && that.formState.count == '第二次') {
+                let param = {
+                    deviceId: that.deviceId,
+                    bxySdzNoon2: that.formState.bxy,
+                    ch4Noon2: that.formState.ch4,
+                    checkPersonNoon: that.formState.jcy,
+                    co2Noon2: that.formState.co2,
+                    coNoon2: that.formState.co,
+                    gwSdzNoon2: that.formState.gw,
+                    jwSdzNoon2: that.formState.jw,
+                    o2Noon2: that.formState.o2,
+                    strInstallPos: that.formState.jcdd,
+                    timeNoon2: that.formState.time,
+                    reportTime: that.formState.tbrq,
+                    tnoon2: that.formState.temp,
+                }
+                that.paramData = Object.assign({}, that.saveShowList, param)
+
+            } else if (that.formState.bc == '夜班' && that.formState.count == '第一次') {
+                let param = {
+                    deviceId: that.deviceId,
+                    bxySdzNight1: that.formState.bxy,
+                    ch4Night1: that.formState.ch4,
+                    checkPersonNight: that.formState.jcy,
+                    co2Night1: that.formState.co2,
+                    coNight1: that.formState.co,
+                    gwSdzNight1: that.formState.gw,
+                    jwSdzNight1: that.formState.jw,
+                    o2Night1: that.formState.o2,
+                    strInstallPos: that.formState.jcdd,
+                    timeNight1: that.formState.time,
+                    reportTime: that.formState.tbrq,
+                    tnight1: that.formState.temp,
+                }
+                that.paramData = Object.assign({}, that.saveShowList, param)
+
+
+            } else if (that.formState.bc == '夜班' && that.formState.count == '第二次') {
+                let param = {
+                    deviceId: that.deviceId,
+                    bxySdzNight2: that.formState.bxy,
+                    ch4Night2: that.formState.ch4,
+                    checkPersonNight: that.formState.jcy,
+                    co2Night2: that.formState.co2,
+                    coNight2: that.formState.co,
+                    gwSdzNight2: that.formState.gw,
+                    jwSdzNight2: that.formState.jw,
+                    o2Night2: that.formState.o2,
+                    strInstallPos: that.formState.jcdd,
+                    timeNight2: that.formState.time,
+                    reportTime: that.formState.tbrq,
+                    tnight2: that.formState.temp,
+                }
+                that.paramData = Object.assign({}, that.saveShowList, param)
+            }
+        },
         //监测次数选项切换
         changeCount(e) {
             let that = this

pages/gasreport/gasreport.vue

@@ -1,6 +1,8 @@
 <template>
     <view class="gas-report" name="gasreport">
-        <u-navbar :title="gasTitle" :safeAreaInsetTop="true" leftIcon="list" @leftClick="handlerToggle"> </u-navbar>
+        <u-navbar
+      :bgStatusImage="backPic0"
+      :bgImage="backPic" :title="gasTitle" :safeAreaInsetTop="true" leftIcon="list" @leftClick="handlerToggle"> </u-navbar>
         <view class="gas-content">
             <component :is="loadComponent" :firstAddress="firstAddress" :secondAddress="secondAddress"
                 :firstTj="firstTj" :secondTj="secondTj"></component>
@@ -30,7 +32,9 @@ export default {
     },
     data() {
         return {
-            gasTitle: '',//标题
+            backPic0: "url(/static/topnavbar0.png)",
+            backPic: "url(../../static/topnavbar.png)",
+            gasTitle: '瓦斯日报',//标题
             showModel: false,//是否打开弹出层
             // loadComponent: 'gasFill',//默认加载组件
             loadComponent: 'gasImgIdentify',//默认加载组件

pages/index/index.vue

@@ -10,7 +10,7 @@
         border: 'none',
       }"
     >
-      <!-- <u-loading-icon></u-loading-icon> -->
+      <u-loading-icon></u-loading-icon>
     </view>
     <iframe
       v-if="PageCur == 'tun2D'"
@@ -25,14 +25,14 @@
         background: '#000',
       }"
     ></iframe>
-    <Device
-      v-if="PageCur == 'device'"
-      :style="{ marginTop: wvTop + 20 + 'px' }"
-    ></Device>
-    <filecenter :cur="PageCur" v-if="PageCur == 'filecenter'"></filecenter>
-    <warndata v-if="PageCur == 'warndata'" :cur="PageCur"></warndata>
-    <gasreport :cur="PageCur" v-if="PageCur == 'gasreport'"></gasreport>
-    <user :cur="PageCur" v-if="PageCur == 'user'"></user>
+   <Device
+     v-show="PageCur == 'device'"
+     :style="{ marginTop: wvTop + 20 + 'px' }"
+   ></Device>
+   <filecenter :cur="PageCur" v-show="PageCur == 'filecenter'"></filecenter>
+   <warndata v-show="PageCur == 'warndata'" :cur="PageCur"></warndata>
+   <gasreport :cur="PageCur" v-show="PageCur == 'gasreport'"></gasreport>
+   <user :cur="PageCur" v-show="PageCur == 'user'"></user>
     <u-tabbar
       :value="PageCur"
       @change="NavChange"
@@ -40,51 +40,27 @@
       :placeholder="true"
       :safeAreaInsetBottom="true"
     >
-      <u-tabbar-item
-        v-for="(item, index) in permission"
-        :key="index"
-        :text="item.meta.title"
-        :name="item.component"
-        :icon="
-          (index = 0
-            ? 'list-dot'
-            : index == 1
-            ? 'calendar'
-            : index == 2
-            ? 'plus-circle'
-            : index == 3
-            ? 'file-text'
-            : index == 4
-            ? 'bell'
-            : 'list-dot')
-        "
-      ></u-tabbar-item>
-      <!--  <u-tabbar-item
-        text="通风系统图"
-        name="tun2D"
-        icon="list-dot"
-      ></u-tabbar-item> -->
-      <!-- <u-tabbar-item
-        text="设备中心"
-        name="device"
-        icon="calendar"
-      ></u-tabbar-item>
-      <u-tabbar-item
-        text="预警分析"
-        name="warndata"
-        icon="plus-circle"
-      ></u-tabbar-item>
-      <u-tabbar-item
-        text="文件共享"
-        name="filecenter"
-        icon="file-text"
-      ></u-tabbar-item>
-      <u-tabbar-item
-        text="瓦斯日报"
-        name="gasreport"
-        icon="bell"
-      ></u-tabbar-item> -->
-      <u-tabbar-item text="我的" name="user" icon="bell"></u-tabbar-item>
+     <u-tabbar-item v-show="menus.device != null"
+       text="设备中心"
+       name="device"
+       icon="calendar"
+     ></u-tabbar-item>
+     <u-tabbar-item v-show="menus.warndata != null"
+       text="预警分析"
+       name="warndata"
+       icon="plus-circle"
+     ></u-tabbar-item>
+     <u-tabbar-item v-show="menus.filecenter != null"
+       text="文件共享"
+       name="filecenter"
+       icon="file-text"
+     ></u-tabbar-item>
+     <u-tabbar-item v-show="menus.gasreport != null"
+       text="瓦斯日报"
+       name="gasreport"
+       icon="bell"
+     ></u-tabbar-item>
+     <u-tabbar-item text="我的" name="user" icon="bell"></u-tabbar-item>
     </u-tabbar>
   </view>
 </template>
@@ -99,19 +75,21 @@ export default {
   data() {
     return {
       isLandScape: "",
-      PageCur: "",
+      PageCur: "device",
       tun3DPage: null,
       wvHeight: getApp().globalData.windowHeight,
       wvWidth: getApp().globalData.windowWidth,
       wvTop: 0,
-      iframeloading: true,
+      iframeloading: false,
+	  menus:{}
     };
   },
   computed: {
     permission: function () {
       var data = uni.getStorageSync("menuPermission");
       console.log(JSON.stringify(data));
-      if (data == null || data == "" || data.length == 0) {
+      if (data == null || data == "" || data.length == 0) 
+	  {
         data = [
           {
             redirect: null,
@@ -179,6 +157,9 @@ export default {
           },
         ];
       }
+	  for(var i=0;i<data.length;i++){
+		  this.menus[data[i].component] = data[i].component
+	  }
       return data;
     },
   },
@@ -191,9 +172,7 @@ export default {
       immediate: true,
   }
 },
-  onLoad(option) {
-	  
-	  this.$tip.success(option.ticket)
+  onLoad() {
     this.changeWV();
   },
   mounted() {},
@@ -255,7 +234,6 @@ export default {
   width: 100%;
   height: 100%;
 }
-
 .loadding-box {
   position: absolute;
   display: flex;

pages/warndata/warndata.vue

@@ -2,6 +2,8 @@
   <view class="container">
     <u-navbar
       :title="titleName"
+      :bgStatusImage="backPic0"
+      :bgImage="backPic"
       :safeAreaInsetTop="true"
       left-icon=""
       @leftClick="menuShow"
@@ -231,6 +233,8 @@ export default {
   watch: {},
   data() {
     return {
+	  backPic0: "url(/static/topnavbar0.png)",
+	  backPic: "url(../../static/topnavbar.png)",
       titleName: "预警分析",
       isShowDetail: true,
       detailComponent: "",
@@ -388,6 +392,7 @@ export default {
   flex: 1;
   width: 100%;
   margin-top: 45px;
+		background: #f1f5f6;
   /* 内容区域顶部留出导航栏的高度 */
 }