Commit 13fc6d26 authored by 胡占生's avatar 胡占生 🇨🇳

消息中心更改

parents 382b99fb dddee994
Pipeline #7262 passed with stage
in 12 seconds
...@@ -1726,8 +1726,9 @@ ...@@ -1726,8 +1726,9 @@
}, },
"aes-decrypter": { "aes-decrypter": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.nlark.com/aes-decrypter/download/aes-decrypter-1.0.3.tgz", "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-1.0.3.tgz",
"integrity": "sha1-nAa4pUNaWtCduTP4oBSvzxhMw04=", "integrity": "sha1-nAa4pUNaWtCduTP4oBSvzxhMw04=",
"dev": true,
"requires": { "requires": {
"pkcs7": "^0.2.3" "pkcs7": "^0.2.3"
} }
...@@ -4150,8 +4151,9 @@ ...@@ -4150,8 +4151,9 @@
}, },
"dom-walk": { "dom-walk": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npm.taobao.org/dom-walk/download/dom-walk-0.1.2.tgz", "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
"integrity": "sha1-DFSL7wSPTR8qlySQAiNgYNqj/YQ=" "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
"dev": true
}, },
"domain-browser": { "domain-browser": {
"version": "1.2.0", "version": "1.2.0",
...@@ -4384,8 +4386,9 @@ ...@@ -4384,8 +4386,9 @@
}, },
"es5-shim": { "es5-shim": {
"version": "4.6.2", "version": "4.6.2",
"resolved": "https://registry.npmmirror.com/es5-shim/download/es5-shim-4.6.2.tgz", "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.2.tgz",
"integrity": "sha1-gnzdDG+1vrJv02jWVDDoterrqUI=" "integrity": "sha512-n0XTVMGps+Deyr38jtqKPR5F5hb9owYeRQcKJW39eFvzUk/u/9Ww315werRzbiNMnHCUw/YHDPBphTlEnzdi+A==",
"dev": true
}, },
"escape-html": { "escape-html": {
"version": "1.0.3", "version": "1.0.3",
...@@ -5983,6 +5986,7 @@ ...@@ -5983,6 +5986,7 @@
"version": "4.3.2", "version": "4.3.2",
"resolved": "https://registry.nlark.com/global/download/global-4.3.2.tgz", "resolved": "https://registry.nlark.com/global/download/global-4.3.2.tgz",
"integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
"dev": true,
"requires": { "requires": {
"min-document": "^2.19.0", "min-document": "^2.19.0",
"process": "~0.5.1" "process": "~0.5.1"
...@@ -5991,7 +5995,8 @@ ...@@ -5991,7 +5995,8 @@
"process": { "process": {
"version": "0.5.2", "version": "0.5.2",
"resolved": "https://registry.npm.taobao.org/process/download/process-0.5.2.tgz", "resolved": "https://registry.npm.taobao.org/process/download/process-0.5.2.tgz",
"integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=" "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
"dev": true
} }
} }
}, },
...@@ -6509,8 +6514,9 @@ ...@@ -6509,8 +6514,9 @@
}, },
"individual": { "individual": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/individual/download/individual-2.0.0.tgz", "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
"integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=" "integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=",
"dev": true
}, },
"infer-owner": { "infer-owner": {
"version": "1.0.4", "version": "1.0.4",
...@@ -6772,8 +6778,9 @@ ...@@ -6772,8 +6778,9 @@
}, },
"is-function": { "is-function": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/is-function/download/is-function-1.0.2.tgz", "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
"integrity": "sha1-Twl/MKv2762smDOxfKXcA/gUTgg=" "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
"dev": true
}, },
"is-glob": { "is-glob": {
"version": "4.0.1", "version": "4.0.1",
...@@ -7413,8 +7420,9 @@ ...@@ -7413,8 +7420,9 @@
}, },
"m3u8-parser": { "m3u8-parser": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.nlark.com/m3u8-parser/download/m3u8-parser-2.1.0.tgz", "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-2.1.0.tgz",
"integrity": "sha1-yBcDKewc1RXQ1Yu4t2LamJbLA2g=" "integrity": "sha1-yBcDKewc1RXQ1Yu4t2LamJbLA2g=",
"dev": true
}, },
"make-dir": { "make-dir": {
"version": "2.1.0", "version": "2.1.0",
...@@ -7607,8 +7615,9 @@ ...@@ -7607,8 +7615,9 @@
}, },
"min-document": { "min-document": {
"version": "2.19.0", "version": "2.19.0",
"resolved": "https://registry.npm.taobao.org/min-document/download/min-document-2.19.0.tgz", "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
"integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
"dev": true,
"requires": { "requires": {
"dom-walk": "^0.1.0" "dom-walk": "^0.1.0"
} }
...@@ -7819,8 +7828,9 @@ ...@@ -7819,8 +7828,9 @@
}, },
"mux.js": { "mux.js": {
"version": "4.3.2", "version": "4.3.2",
"resolved": "https://registry.npmmirror.com/mux.js/download/mux.js-4.3.2.tgz", "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-4.3.2.tgz",
"integrity": "sha1-V21TffA33F7DXsExa5SNgV01whA=" "integrity": "sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ==",
"dev": true
}, },
"mz": { "mz": {
"version": "2.7.0", "version": "2.7.0",
...@@ -8397,8 +8407,9 @@ ...@@ -8397,8 +8407,9 @@
}, },
"parse-headers": { "parse-headers": {
"version": "2.0.4", "version": "2.0.4",
"resolved": "https://registry.nlark.com/parse-headers/download/parse-headers-2.0.4.tgz?cache=0&sync_timestamp=1628092214952&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fparse-headers%2Fdownload%2Fparse-headers-2.0.4.tgz", "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.4.tgz",
"integrity": "sha1-nq8tAr7S0e/0lDMc498215JHYL8=" "integrity": "sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw==",
"dev": true
}, },
"parse-json": { "parse-json": {
"version": "4.0.0", "version": "4.0.0",
...@@ -8542,8 +8553,9 @@ ...@@ -8542,8 +8553,9 @@
}, },
"pkcs7": { "pkcs7": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npm.taobao.org/pkcs7/download/pkcs7-0.2.3.tgz", "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-0.2.3.tgz",
"integrity": "sha1-ItYGZtAQZcXyRDkJjkpIMEUic74=" "integrity": "sha1-ItYGZtAQZcXyRDkJjkpIMEUic74=",
"dev": true
}, },
"pkg-dir": { "pkg-dir": {
"version": "3.0.0", "version": "3.0.0",
...@@ -10129,8 +10141,9 @@ ...@@ -10129,8 +10141,9 @@
}, },
"rust-result": { "rust-result": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/rust-result/download/rust-result-1.0.0.tgz", "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
"integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=", "integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
"dev": true,
"requires": { "requires": {
"individual": "^2.0.0" "individual": "^2.0.0"
} }
...@@ -10156,8 +10169,9 @@ ...@@ -10156,8 +10169,9 @@
}, },
"safe-json-parse": { "safe-json-parse": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.nlark.com/safe-json-parse/download/safe-json-parse-4.0.0.tgz", "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
"integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=", "integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
"dev": true,
"requires": { "requires": {
"rust-result": "^1.0.0" "rust-result": "^1.0.0"
} }
...@@ -11341,8 +11355,9 @@ ...@@ -11341,8 +11355,9 @@
}, },
"tsml": { "tsml": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmmirror.com/tsml/download/tsml-1.0.1.tgz", "resolved": "https://registry.npmjs.org/tsml/-/tsml-1.0.1.tgz",
"integrity": "sha1-ifghi52eJX9H1/a1bQHFpNLGj8M=" "integrity": "sha1-ifghi52eJX9H1/a1bQHFpNLGj8M=",
"dev": true
}, },
"tty-browserify": { "tty-browserify": {
"version": "0.0.0", "version": "0.0.0",
...@@ -11614,8 +11629,9 @@ ...@@ -11614,8 +11629,9 @@
}, },
"url-toolkit": { "url-toolkit": {
"version": "2.2.3", "version": "2.2.3",
"resolved": "https://registry.nlark.com/url-toolkit/download/url-toolkit-2.2.3.tgz", "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz",
"integrity": "sha1-ePqQEhWrusNBggZpMiICebgEUis=" "integrity": "sha512-Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ==",
"dev": true
}, },
"use": { "use": {
"version": "3.1.1", "version": "3.1.1",
...@@ -11719,8 +11735,9 @@ ...@@ -11719,8 +11735,9 @@
}, },
"video.js": { "video.js": {
"version": "6.13.0", "version": "6.13.0",
"resolved": "https://registry.npmmirror.com/video.js/download/video.js-6.13.0.tgz", "resolved": "https://registry.npmjs.org/video.js/-/video.js-6.13.0.tgz",
"integrity": "sha1-+Uh9RjJzQPpI7NUTcqKYHbts3kw=", "integrity": "sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg==",
"dev": true,
"requires": { "requires": {
"babel-runtime": "^6.9.2", "babel-runtime": "^6.9.2",
"global": "4.3.2", "global": "4.3.2",
...@@ -11734,8 +11751,9 @@ ...@@ -11734,8 +11751,9 @@
}, },
"videojs-contrib-hls": { "videojs-contrib-hls": {
"version": "5.15.0", "version": "5.15.0",
"resolved": "https://registry.nlark.com/videojs-contrib-hls/download/videojs-contrib-hls-5.15.0.tgz", "resolved": "https://registry.npmjs.org/videojs-contrib-hls/-/videojs-contrib-hls-5.15.0.tgz",
"integrity": "sha1-/klXNn5daLfSP3jtMuN6ndiSoKg=", "integrity": "sha512-18zbMYZ0XRBKTPEayA9bFTWWrqhT9b4G8+zf0czJLD7Epe5PcK1I/3dflTHQeQ5rwlWir+/XnFU3sMg/B2MMcw==",
"dev": true,
"requires": { "requires": {
"aes-decrypter": "1.0.3", "aes-decrypter": "1.0.3",
"global": "^4.3.0", "global": "^4.3.0",
...@@ -11749,8 +11767,9 @@ ...@@ -11749,8 +11767,9 @@
}, },
"videojs-contrib-media-sources": { "videojs-contrib-media-sources": {
"version": "4.7.2", "version": "4.7.2",
"resolved": "https://registry.npm.taobao.org/videojs-contrib-media-sources/download/videojs-contrib-media-sources-4.7.2.tgz", "resolved": "https://registry.npmjs.org/videojs-contrib-media-sources/-/videojs-contrib-media-sources-4.7.2.tgz",
"integrity": "sha1-Ct+SkQfVt0zyyKuygkyCF35DhY4=", "integrity": "sha512-e6iCHWBFuV05EGo7v+pS9iepObXnJ9joms467gzi8ZjpKVb3ifha9M0Ja24Rd8JfvYpzjltsgDVtGFDvIg4hQQ==",
"dev": true,
"requires": { "requires": {
"global": "^4.3.0", "global": "^4.3.0",
"mux.js": "4.3.2", "mux.js": "4.3.2",
...@@ -11760,8 +11779,9 @@ ...@@ -11760,8 +11779,9 @@
}, },
"videojs-flash": { "videojs-flash": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npm.taobao.org/videojs-flash/download/videojs-flash-2.2.1.tgz", "resolved": "https://registry.npmjs.org/videojs-flash/-/videojs-flash-2.2.1.tgz",
"integrity": "sha1-GiJduxztIArpu/FeAf5KYQhtkPE=", "integrity": "sha512-mHu6TD12EKkxMvr8tg4AcfV/DuVLff427nneoZom3N9Dd2bv0sJOWwdLPQH1v5BCuAuXAVuAOba56ovTl+G3tQ==",
"dev": true,
"requires": { "requires": {
"global": "^4.4.0", "global": "^4.4.0",
"video.js": "^6 || ^7", "video.js": "^6 || ^7",
...@@ -11770,8 +11790,9 @@ ...@@ -11770,8 +11790,9 @@
"dependencies": { "dependencies": {
"global": { "global": {
"version": "4.4.0", "version": "4.4.0",
"resolved": "https://registry.nlark.com/global/download/global-4.4.0.tgz", "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
"integrity": "sha1-PnsQUXkAajI+1xqvyj6cV6XMZAY=", "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
"dev": true,
"requires": { "requires": {
"min-document": "^2.19.0", "min-document": "^2.19.0",
"process": "^0.11.10" "process": "^0.11.10"
...@@ -11781,31 +11802,36 @@ ...@@ -11781,31 +11802,36 @@
}, },
"videojs-font": { "videojs-font": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmmirror.com/videojs-font/download/videojs-font-2.1.0.tgz", "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-2.1.0.tgz",
"integrity": "sha1-olkwpn9snPvyu4jay4xrRR8JM3k=" "integrity": "sha1-olkwpn9snPvyu4jay4xrRR8JM3k=",
"dev": true
}, },
"videojs-hotkeys": { "videojs-hotkeys": {
"version": "0.2.27", "version": "0.2.27",
"resolved": "https://registry.nlark.com/videojs-hotkeys/download/videojs-hotkeys-0.2.27.tgz", "resolved": "https://registry.npmjs.org/videojs-hotkeys/-/videojs-hotkeys-0.2.27.tgz",
"integrity": "sha1-Dfl5Urnf8ObMHPikOf7X6snHPwE=" "integrity": "sha512-pwtm1QocRmzJy1PWQsmFVHyeldYHHpLdeATK3FsFHVMmNpz6CROkAn8TFy2UILr8Ghgq134K8jEKNue8HWpudQ==",
"dev": true
}, },
"videojs-ie8": { "videojs-ie8": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/videojs-ie8/download/videojs-ie8-1.1.2.tgz", "resolved": "https://registry.npmjs.org/videojs-ie8/-/videojs-ie8-1.1.2.tgz",
"integrity": "sha1-oj09hgitcZK2nGB3/E64SJmNNdk=", "integrity": "sha1-oj09hgitcZK2nGB3/E64SJmNNdk=",
"dev": true,
"requires": { "requires": {
"es5-shim": "^4.5.1" "es5-shim": "^4.5.1"
} }
}, },
"videojs-swf": { "videojs-swf": {
"version": "5.4.2", "version": "5.4.2",
"resolved": "https://registry.npm.taobao.org/videojs-swf/download/videojs-swf-5.4.2.tgz", "resolved": "https://registry.npmjs.org/videojs-swf/-/videojs-swf-5.4.2.tgz",
"integrity": "sha1-aWSpv/kDtzLz5GUxSuR4oCoX6Ks=" "integrity": "sha512-FGg+Csioa8/A/EacvFefBdb9Z0rSiMlheHDunZnN3xXfUF43jvjawcWFQnZvrv1Cs1nE1LBrHyUZjF7j2mKOLw==",
"dev": true
}, },
"videojs-vtt.js": { "videojs-vtt.js": {
"version": "0.12.6", "version": "0.12.6",
"resolved": "https://registry.npm.taobao.org/videojs-vtt.js/download/videojs-vtt.js-0.12.6.tgz", "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz",
"integrity": "sha1-4HhgC9qJnqpvnDMHE0zQyBGUe44=", "integrity": "sha512-XFXeGBQiljnElMhwCcZst0RDbZn2n8LU7ZScXryd3a00OaZsHAjdZu/7/RdSr7Z1jHphd45FnOvOQkGK4YrWCQ==",
"dev": true,
"requires": { "requires": {
"global": "^4.3.1" "global": "^4.3.1"
} }
...@@ -11913,8 +11939,9 @@ ...@@ -11913,8 +11939,9 @@
}, },
"vue-video-player": { "vue-video-player": {
"version": "5.0.2", "version": "5.0.2",
"resolved": "https://registry.nlark.com/vue-video-player/download/vue-video-player-5.0.2.tgz", "resolved": "https://registry.npmjs.org/vue-video-player/-/vue-video-player-5.0.2.tgz",
"integrity": "sha1-NKQiOf8wTvx2mNogpBZQUddmweY=", "integrity": "sha512-IZXeRGGSX4YIp54G0Q5cB7iqh6Ok6Dpa2jRkjdyvMWw7MShJuh54/d5QNb1CZ+CvZUzX/TH7osnpir7mBNcFvQ==",
"dev": true,
"requires": { "requires": {
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"video.js": "^6.6.0", "video.js": "^6.6.0",
...@@ -12301,8 +12328,9 @@ ...@@ -12301,8 +12328,9 @@
}, },
"webwackify": { "webwackify": {
"version": "0.1.6", "version": "0.1.6",
"resolved": "https://registry.npm.taobao.org/webwackify/download/webwackify-0.1.6.tgz", "resolved": "https://registry.npmjs.org/webwackify/-/webwackify-0.1.6.tgz",
"integrity": "sha1-HUKhKsYYI9fjRaveCE6qpipKles=" "integrity": "sha512-pGcw1T3HpNnM/UTRQqqRkkkzythSLts05mB+7Gr00B+0VbL0m39dFL5g20rSIEUt9Wrpw+/8k+snxRlUFHhcqA==",
"dev": true
}, },
"which": { "which": {
"version": "1.3.1", "version": "1.3.1",
...@@ -12414,8 +12442,9 @@ ...@@ -12414,8 +12442,9 @@
}, },
"xhr": { "xhr": {
"version": "2.4.0", "version": "2.4.0",
"resolved": "https://registry.npm.taobao.org/xhr/download/xhr-2.4.0.tgz", "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.4.0.tgz",
"integrity": "sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=", "integrity": "sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=",
"dev": true,
"requires": { "requires": {
"global": "~4.3.0", "global": "~4.3.0",
"is-function": "^1.0.1", "is-function": "^1.0.1",
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-esign": "^1.0.5", "vue-esign": "^1.0.5",
"vue-router": "^3.0.7", "vue-router": "^3.0.7",
"vue-video-player": "^5.0.2",
"vue2-verify": "^1.1.5", "vue2-verify": "^1.1.5",
"vuex": "^3.1.2" "vuex": "^3.1.2"
}, },
...@@ -39,6 +38,7 @@ ...@@ -39,6 +38,7 @@
"less": "^3.0.4", "less": "^3.0.4",
"less-loader": "^5.0.0", "less-loader": "^5.0.0",
"postcss-pxtorem": "^4.0.1", "postcss-pxtorem": "^4.0.1",
"vue-template-compiler": "^2.6.10" "vue-template-compiler": "^2.6.10",
"vue-video-player": "^5.0.2"
} }
} }
...@@ -44,10 +44,10 @@ service.interceptors.response.use(response => { ...@@ -44,10 +44,10 @@ service.interceptors.response.use(response => {
theme: 'round-button', theme: 'round-button',
}).then(() => { }).then(() => {
removeToken() removeToken()
// location.reload() location.reload()
router.push({ // router.push({
name:'login2' // name:'login2'
}) // })
}); });
}else{ }else{
Toast.fail({ Toast.fail({
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
</template> </template>
</van-search> </van-search>
<div class="card" v-for="(item,index) in checkedList" :key="index" @click="cardLocation(item)"> <div class="card" v-for="(item,index) in checkedList" :key="index" @click="cardLocation(item)">
<div>检查编号:{{item.no}}</div>
<div>检查名称:{{item.name}}</div> <div>检查名称:{{item.name}}</div>
<div>检查类型:{{item.type}}</div> <div>检查类型:{{item.type}}</div>
<div>开始时间:{{item.planStartTime}}</div> <div>开始时间:{{item.planStartTime}}</div>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<div> <div>
<LHeader v-bind:text="text"></LHeader> <LHeader v-bind:text="text"></LHeader>
<div class="card"> <div class="card">
<div>检查编号:{{nums.no}}</div>
<div>检查名称:{{nums.name}}</div> <div>检查名称:{{nums.name}}</div>
<div>检查类型:{{nums.type}}</div> <div>检查类型:{{nums.type}}</div>
<div>检查开始时间:{{nums.planStartTime}}</div> <div>检查开始时间:{{nums.planStartTime}}</div>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<LHeader v-bind:text="text"></LHeader> <LHeader v-bind:text="text"></LHeader>
<div class="card"> <div class="card">
<div>问题位置:{{list.address}}</div> <div>问题位置:{{list.address}}</div>
<div>责任单位:{{list.deptNames.join('/')}}</div> <div>责任单位:{{list.deptNames}}</div>
<div>问题描述:{{list.context}}</div> <div>问题描述:{{list.context}}</div>
<div>法律依据:{{list.checkBasis}}</div> <div>法律依据:{{list.checkBasis}}</div>
<div>图片展示:<van-uploader multiple :deletable="false" :show-upload="false" v-model="list.pictures" /></div> <div>图片展示:<van-uploader multiple :deletable="false" :show-upload="false" v-model="list.pictures" /></div>
...@@ -49,7 +49,22 @@ export default { ...@@ -49,7 +49,22 @@ export default {
init(){ init(){
this.list={} this.list={}
getFun('check/carry/trouble/'+this.id).then((Response)=>{ getFun('check/carry/trouble/'+this.id).then((Response)=>{
this.list=Response.data this.list=JSON.parse(JSON.stringify(Response.data))
//数据处理
this.list.deptNames=this.list.deptNames.join('/')
this.list.pictures=[]
this.list.videos=[]
Response.data.pictures.forEach((item) => {
this.list.pictures.push({
url:item
})
});
Response.data.videos.forEach((item) => {
this.list.videos.push({
url:item
})
});
}) })
} }
} }
......
...@@ -21,11 +21,10 @@ ...@@ -21,11 +21,10 @@
/> />
<van-field <van-field
v-model="editObj.checkBasis" v-model="editObj.checkBasis"
name="法律依据" name="判定依据"
label="法律依据" label="判定依据"
placeholder="法律依据" placeholder="判定依据"
:disabled="true" :disabled="true"
:rules="[{ required: true, message: '请填写法律依据' }]"
/> />
<van-field <van-field
v-model="editObj.address" v-model="editObj.address"
...@@ -96,14 +95,23 @@ export default { ...@@ -96,14 +95,23 @@ export default {
mounted() { mounted() {
if(this.$route.query.name=='note'){ if(this.$route.query.name=='note'){
this.editObj=JSON.parse(this.$route.query.obj) this.editObj=JSON.parse(this.$route.query.obj)
var pictures=[]
var videos=[]
this.editObj.pictures.forEach((item)=>{
pictures.push({url:item})
})
this.editObj.videos.forEach((item)=>{
videos.push({url:item})
})
this.editObj={ this.editObj={
id:this.editObj.id,//问题ID id:this.editObj.id,//问题ID
address:this.editObj.address,//问题位置 address:this.editObj.address,//问题位置
value:this.editObj.deptNames.join('/'),//责任单位 value:this.editObj.deptNames.join('/'),//责任单位
context:this.editObj.context,//问题描述 context:this.editObj.context,//问题描述
checkBasis:this.editObj.checkBasis,//法律依据 checkBasis:this.editObj.checkBasis,//法律依据
pictures:this.editObj.pictures,//图片 pictures:pictures,//图片
videos:this.editObj.videos//视频 videos:videos//视频
} }
this.ids=this.editObj.deptIds this.ids=this.editObj.deptIds
} }
...@@ -139,22 +147,14 @@ export default { ...@@ -139,22 +147,14 @@ export default {
console.log(value) console.log(value)
var pictures=[]; var pictures=[];
value.uploader.forEach((item) => { value.uploader.forEach((item) => {
pictures.push(item.content) if(item.content){pictures.push(item.content)}
else if(item.url){pictures.push(item.url)}
}); });
if(this.editObj.pictures){
this.editObj.pictures.forEach((item)=>{
pictures.push(item)
})
}
var videos=[]; var videos=[];
value.uploader2.forEach((item) => { value.uploader2.forEach((item) => {
videos.push(item.content) if(item.content){videos.push(item.content)}
}) else if(item.url){videos.push(item.url)}
if(this.editObj.videos){ });
this.editObj.videos.forEach((item)=>{
videos.push(item)
})
}
var obj={ var obj={
id:this.editObj.id,//列表ID id:this.editObj.id,//列表ID
pictures:pictures,//图片 pictures:pictures,//图片
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<div class="card" v-for="(item,index) in list" :key="index" > <div class="card" v-for="(item,index) in list" :key="index" >
<van-overlay @click.stop="close(item)" :show="item.show" > <van-overlay @click.stop="close(item)" :show="item.show" >
<van-button round type="primary" @click.stop="detail(index,item)">详情</van-button> <van-button round type="primary" @click.stop="detail(index,item)">详情</van-button>
<van-button round type="info" v-show="!finish" @click.stop="update(index,item)">修改</van-button> <van-button round type="info" v-show="!item.checkSubmitFlag" @click.stop="update(index,item)">修改</van-button>
<van-button round type="warning " v-show="!finish" @click.stop="Delete(item)">删除</van-button> <van-button round type="warning " v-show="!item.checkSubmitFlag" @click.stop="Delete(item)">删除</van-button>
</van-overlay> </van-overlay>
<van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox> <van-checkbox :name="item.id" :disabled="finish?finish:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
<div @click="cardClick(item)"> <div @click="cardClick(item)">
<!-- <div>问题名称:{{item.title}}</div> --> <!-- <div>问题名称:{{item.title}}</div> -->
<div>问题位置:{{item.address}}</div> <div>问题位置:{{item.address}}</div>
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
</div> </div>
</van-checkbox-group> </van-checkbox-group>
<div class="page-footer"> <div class="page-footer">
<van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish=='true'?true:false">全选</van-checkbox> <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish">全选</van-checkbox>
<van-button round type="info" @click="commit" :disabled="finish=='true'?true:false">提交</van-button> <van-button round type="info" @click="commit" :disabled="finish">提交</van-button>
</div> </div>
<tab-bar :index="1"></tab-bar> <tab-bar :index="1"></tab-bar>
</div> </div>
...@@ -134,6 +134,7 @@ export default { ...@@ -134,6 +134,7 @@ export default {
title: '提示', title: '提示',
message: '确定提交检查问题?', message: '确定提交检查问题?',
}).then(()=>{ }).then(()=>{
if(checkedList.length==0){this.$toast.fail('提交失败,请至少选择一个问题');return}
this.$toast.loading({ this.$toast.loading({
message:'提交中...', message:'提交中...',
forbidClick: true, forbidClick: true,
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<LHeader v-bind:text="text"></LHeader> <LHeader v-bind:text="text"></LHeader>
<div class="card"> <div class="card">
<div>问题位置:{{list.address}}</div> <div>问题位置:{{list.address}}</div>
<div>责任单位:{{list.deptId}}</div> <div>责任单位:{{list.deptNames}}</div>
<div>问题描述:{{list.context}}</div> <div>问题描述:{{list.context}}</div>
<div>法律依据:{{list.checkBasis}}</div> <div>法律依据:{{list.checkBasis}}</div>
<div>图片展示:<van-uploader multiple :deletable="false" :show-upload="false" v-model="list.pictures" /></div> <div>图片展示:<van-uploader multiple :deletable="false" :show-upload="false" v-model="list.pictures" /></div>
...@@ -48,8 +48,22 @@ export default { ...@@ -48,8 +48,22 @@ export default {
/* 获取详情列表 */ /* 获取详情列表 */
init(){ init(){
this.list={} this.list={}
getFun('check/confirm/trouble/list',{planId:this.id}).then((Response)=>{ getFun('check/notify/trouble/'+this.id).then((Response)=>{
this.list=Response.data.list this.list=JSON.parse(JSON.stringify(Response.data))
//数据处理
this.list.deptNames=this.list.deptNames.join('/')
this.list.pictures=[]
this.list.videos=[]
Response.data.pictures.forEach((item) => {
this.list.pictures.push({
url:item
})
});
Response.data.videos.forEach((item) => {
this.list.videos.push({
url:item
})
});
}) })
} }
} }
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox> <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
<div @click="cardClick(item)"> <div @click="cardClick(item)">
<div>负责人姓名:{{item.realName}}</div> <div>负责人姓名:{{item.realName}}</div>
<div>问题名称:{{item.title}}</div> <!-- <div>问题名称:{{item.title}}</div> -->
<div>问题位置:{{item.address}}</div> <div>问题位置:{{item.address}}</div>
<div>问题内容:{{item.context}}</div> <div>问题内容:{{item.context}}</div>
<div>发现时间:{{item.checkTime}}</div> <div>发现时间:{{item.checkTime}}</div>
...@@ -38,13 +38,15 @@ ...@@ -38,13 +38,15 @@
label="整改完成时间" label="整改完成时间"
placeholder="请选择时间" placeholder="请选择时间"
@click="calendarOpen" @click="calendarOpen"
:disabled="true"
/> />
<van-popup v-model="showCalendar" position="bottom"> <van-popup v-model="showCalendar" position="bottom">
<van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/> <van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/>
</van-popup> </van-popup>
<div class="sign"><span>检查组负责人签字确认:</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext" @click="sign" >电子签字</p><img class="sign-img" v-show="isImg" :src="resultImg" alt=""></van-tag></div> <div class="sign"><span>检查负责人签字确认:</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext" @click="sign" >电子签字</p><img class="sign-img" v-show="isImg" :src="resultImg" alt=""></van-tag></div>
<div class="sign"><span>现场负责人签字确认:</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istextl" @click="signl" >电子签字</p><img class="sign-img" v-show="isImgl" :src="resultImgl" alt=""></van-tag></div>
<div class="page-footer-button"> <div class="page-footer-button">
<van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">整改确认</van-button> <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">确认</van-button>
</div> </div>
<tab-bar :index="1"></tab-bar> <tab-bar :index="1"></tab-bar>
</div> </div>
...@@ -62,10 +64,14 @@ export default { ...@@ -62,10 +64,14 @@ export default {
}, },
data() { data() {
return { return {
currentDate: new Date(),//当前默认时间
istextl:true,//检查组签字是否显示文字
dialogShow:false,//弹框是否显示 dialogShow:false,//弹框是否显示
istext:true,//是否显示文字 istext:true,//是否显示文字
isImg:false,//是否显示图片 isImg:false,//是否显示图片
resultImg:'',//电子签名图片 resultImg:'',//电子签名图片
resultImgl:'',//检查组电子签名图片
isImgl:false,//是否显示检查组图片
noticeQuestionList:[],//整改通知问题记录列表 noticeQuestionList:[],//整改通知问题记录列表
active: 0,//tab选中状态 active: 0,//tab选中状态
checkedAll:false,//全选状态 checkedAll:false,//全选状态
...@@ -89,13 +95,17 @@ export default { ...@@ -89,13 +95,17 @@ export default {
if(this.$route.params.name=='checkedConfirm'){ if(this.$route.params.name=='checkedConfirm'){
this.istext=true//是否显示文字 this.istext=true//是否显示文字
this.isImg=false//是否显示图片 this.isImg=false//是否显示图片
this.istextl=true//检查组是否显示文字
this.isImgl=false//检查组是否显示图片
this.value=''//日期值 this.value=''//日期值
this.resultImg=''//电子签名图片 this.resultImg=''//电子签名图片
this.resultImgl=''//检查组电子签名图片
this.id=this.$route.params.id//请求问题记录列表的唯一id this.id=this.$route.params.id//请求问题记录列表的唯一id
this.noticeTableList=[];//问题记录列表数组 this.noticeTableList=[];//问题记录列表数组
if(sessionStorage.getItem('ConfirmFinish')){ if(sessionStorage.getItem('ConfirmFinish')){
this.finish=sessionStorage.getItem('ConfirmFinish') this.finish=sessionStorage.getItem('ConfirmFinish')
} }
this.problem()
} }
//判断是否从电子签名跳转过来-获取图片是否显示的布尔值 //判断是否从电子签名跳转过来-获取图片是否显示的布尔值
if(this.$route.query.name=='callbackSign'){ if(this.$route.query.name=='callbackSign'){
...@@ -108,6 +118,17 @@ export default { ...@@ -108,6 +118,17 @@ export default {
} }
} }
} }
//判断是否从检查组的电子签名跳转过来-获取图片是否显示的布尔值
if(this.$route.query.name=='callbackSignl'){
if(this.$route.query.confirmImgl==true||this.$route.query.confirmImgl=='true'){
this.istextl=false
this.isImgl=true
//从session中获取签名生成的图片1
if(sessionStorage.getItem('confirmImgl')){
this.resultImgl=sessionStorage.getItem('confirmImgl')
}
}
}
}, },
mounted() { mounted() {
//刷新页面时候,从session中获取确认id //刷新页面时候,从session中获取确认id
...@@ -138,14 +159,6 @@ export default { ...@@ -138,14 +159,6 @@ export default {
item.show=false item.show=false
}) })
this.$toast.clear() this.$toast.clear()
/* ----详情---- */
if(this.isFinish){
//获取选中状态数组
this.noticeQuestionList.forEach((item)=>{
if(item.checkSubmitId){
this.result.push(parseInt(item.checkSubmitId))
}
})
//日期数据回显 //日期数据回显
if(Response.data.finishTime){ if(Response.data.finishTime){
this.value=Response.data.finishTime this.value=Response.data.finishTime
...@@ -154,11 +167,28 @@ export default { ...@@ -154,11 +167,28 @@ export default {
if(Response.data.leaderSign){ if(Response.data.leaderSign){
this.resultImg=Response.data.leaderSign this.resultImg=Response.data.leaderSign
} }
//获取选中状态数组
this.noticeQuestionList.forEach((item)=>{
if(item.checkSubmitId){
this.result.push(parseInt(item.checkSubmitId))
}
})
//判断是否有签名 //判断是否有签名
if(this.resultImg){ if(this.resultImg){
this.istext=false this.istext=false
this.isImg=true this.isImg=true
} }
/* ----详情---- */
if(this.isFinish){
//检查组电子签名数据回显
if(Response.data.managerSign){
this.resultImgl=Response.data.managerSign
}
//判断是否有签名
if(this.resultImgl){
this.istextl=false
this.isImgl=true
}
} }
}) })
}, },
...@@ -197,9 +227,9 @@ export default { ...@@ -197,9 +227,9 @@ export default {
}, },
//日期输入框点击事件 //日期输入框点击事件
calendarOpen(){ calendarOpen(){
if(this.finish=='false'){ // if(this.finish=='false'){
this.showCalendar = true // this.showCalendar = true
} // }
}, },
//标签点击事件防止标签切换首次进入不执行复选框监听事件 //标签点击事件防止标签切换首次进入不执行复选框监听事件
tabClick(idx){ tabClick(idx){
...@@ -224,6 +254,19 @@ export default { ...@@ -224,6 +254,19 @@ export default {
this.$router.push({name:'sign',query:{name:'confirmNote',confirmImg:true}}) this.$router.push({name:'sign',query:{name:'confirmNote',confirmImg:true}})
} }
}, },
//电子签名2
signl(){
//点击电子签名,保存用户选择的日期和复选框回显值
if(this.finish=='false'){
//每次签名检测需要签名的模块是哪个
if(sessionStorage.getItem('IsconfirmImgl')){
sessionStorage.removeItem('IsconfirmImgl')
}else{
sessionStorage.setItem('IsconfirmImgl',true)
}
this.$router.push({name:'sign',query:{name:'confirmNotel',confirmImgl:true}})
}
},
//提交问题记录 //提交问题记录
commit(){ commit(){
var checkedList=[] var checkedList=[]
...@@ -238,6 +281,7 @@ export default { ...@@ -238,6 +281,7 @@ export default {
var obj={ var obj={
planId:this.id, planId:this.id,
leaderSign:this.resultImg, leaderSign:this.resultImg,
managerSign:this.resultImgl
} }
this.$dialog.confirm({ this.$dialog.confirm({
title: '提示', title: '提示',
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<van-col span="18">{{ item.dueDate | formatTime }}</van-col> <van-col span="18">{{ item.dueDate | formatTime }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">状态:</van-col> <van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col> <van-col span="18">{{ item.taskName }}</van-col>
</van-row> </van-row>
<!-- 详情 --> <!-- 详情 -->
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<van-col span="18">{{ item.dueDate | formatTime }}</van-col> <van-col span="18">{{ item.dueDate | formatTime }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">状态:</van-col> <van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col> <van-col span="18">{{ item.taskName }}</van-col>
</van-row> </van-row>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
</van-row> --> </van-row> -->
<!-- <van-row gutter=""> <!-- <van-row gutter="">
<van-col span="6">状态:</van-col> <van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col> <van-col span="18">{{ item.taskName }}</van-col>
</van-row> --> </van-row> -->
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<van-col span="18">{{ item | formatTime }}</van-col> <van-col span="18">{{ item | formatTime }}</van-col>
</van-row> </van-row>
<van-row gutter=""> <van-row gutter="">
<van-col span="6">状态:</van-col> <van-col span="6">工单状态:</van-col>
<van-col span="18">{{ item.taskName }}</van-col> <van-col span="18">{{ item.taskName }}</van-col>
</van-row> </van-row>
<!-- 详情 --> <!-- 详情 -->
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<LHeader v-bind:text="text"></LHeader> <LHeader v-bind:text="text"></LHeader>
<div class="card"> <div class="card">
<div>问题位置:{{list.address}}</div> <div>问题位置:{{list.address}}</div>
<div>责任单位:{{list.deptNames.join('/')}}</div> <div>责任单位:{{list.deptNames}}</div>
<div>问题描述:{{list.context}}</div> <div>问题描述:{{list.context}}</div>
<div>法律依据:{{list.checkBasis}}</div> <div>法律依据:{{list.checkBasis}}</div>
<div>图片展示:<van-uploader multiple :deletable="false" :show-upload="false" v-model="list.pictures" /></div> <div>图片展示:<van-uploader multiple :deletable="false" :show-upload="false" v-model="list.pictures" /></div>
...@@ -49,7 +49,21 @@ export default { ...@@ -49,7 +49,21 @@ export default {
init(){ init(){
this.list={} this.list={}
getFun('check/notify/trouble/'+this.id).then((Response)=>{ getFun('check/notify/trouble/'+this.id).then((Response)=>{
this.list=Response.data this.list=JSON.parse(JSON.stringify(Response.data))
//数据处理
this.list.deptNames=this.list.deptNames.join('/')
this.list.pictures=[]
this.list.videos=[]
Response.data.pictures.forEach((item) => {
this.list.pictures.push({
url:item
})
});
Response.data.videos.forEach((item) => {
this.list.videos.push({
url:item
})
});
}) })
} }
} }
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
/> />
<van-field <van-field
v-model="editObj.checkBasis" v-model="editObj.checkBasis"
name="法律依据" name="判定依据"
label="法律依据" label="判定依据"
placeholder="法律依据" placeholder="判定依据"
:rules="[{ required: true, message: '请填写法律依据' }]" :disabled="true"
/> />
<van-field <van-field
v-model="editObj.address" v-model="editObj.address"
...@@ -53,12 +53,12 @@ ...@@ -53,12 +53,12 @@
/> />
<!-- <van-area title="标题" :area-list="areaList" @confirm="onConfirm" /> --> <!-- <van-area title="标题" :area-list="areaList" @confirm="onConfirm" /> -->
</van-popup> </van-popup>
<van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]"> <van-field name="uploader" label="图像上传">
<template #input> <template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.pictures" /> <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.pictures" />
</template> </template>
</van-field> </van-field>
<van-field name="uploader2" label="视频上传" :rules="[{ required: true, message: '请上传视频' }]"> <van-field name="uploader2" label="视频上传">
<template #input> <template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.videos" /> <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="editObj.videos" />
</template> </template>
...@@ -96,14 +96,22 @@ export default { ...@@ -96,14 +96,22 @@ export default {
if(this.$route.query.name=='noticeList'){ if(this.$route.query.name=='noticeList'){
this.editObj=JSON.parse(this.$route.query.obj) this.editObj=JSON.parse(this.$route.query.obj)
var pictures=[]
var videos=[]
this.editObj.pictures.forEach((item)=>{
pictures.push({url:item})
})
this.editObj.videos.forEach((item)=>{
videos.push({url:item})
})
this.editObj={ this.editObj={
id:this.editObj.id,//问题ID id:this.editObj.id,//问题ID
address:this.editObj.address,//问题位置 address:this.editObj.address,//问题位置
value:this.editObj.deptNames.join('/'),//责任单位 value:this.editObj.deptNames.join('/'),//责任单位
context:this.editObj.context,//问题描述 context:this.editObj.context,//问题描述
checkBasis:this.editObj.checkBasis,//法律依据 checkBasis:this.editObj.checkBasis,//法律依据
pictures:this.editObj.pictures,//图片 pictures:pictures,//图片
videos:this.editObj.videos//视频 videos:videos//视频
} }
this.ids=this.editObj.deptIds this.ids=this.editObj.deptIds
...@@ -138,15 +146,14 @@ export default { ...@@ -138,15 +146,14 @@ export default {
/* 问题提交 */ /* 问题提交 */
onSubmit(value){ onSubmit(value){
var pictures=[]; var pictures=[];
console.log(value)
value.uploader.forEach((item) => { value.uploader.forEach((item) => {
if(item.content){pictures.push(item.content)} if(item.content){pictures.push(item.content)}
else if(item){pictures.push(item)} else if(item.url){pictures.push(item.url)}
}); });
var videos=[]; var videos=[];
value.uploader2.forEach((item) => { value.uploader2.forEach((item) => {
if(item.content){videos.push(item.content)} if(item.content){videos.push(item.content)}
else if(item){videos.push(item)} else if(item.url){videos.push(item.url)}
}); });
var obj={ var obj={
id:this.editObj.id,//列表ID id:this.editObj.id,//列表ID
...@@ -157,6 +164,7 @@ export default { ...@@ -157,6 +164,7 @@ export default {
context:value['问题描述'],//问题描述 context:value['问题描述'],//问题描述
checkBasis:value['法律依据']//法律依据 checkBasis:value['法律依据']//法律依据
} }
console.log(obj)
this.$dialog.confirm({ this.$dialog.confirm({
title: '提示', title: '提示',
message: '确定提交检查问题?', message: '确定提交检查问题?',
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox> <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
<div @click="cardClick(item)"> <div @click="cardClick(item)">
<div>负责人姓名:{{item.realName}}</div> <div>负责人姓名:{{item.realName}}</div>
<div>问题名称:{{item.title}}</div> <!-- <div>问题名称:{{item.title}}</div> -->
<div>问题位置:{{item.address}}</div> <div>问题位置:{{item.address}}</div>
<div>问题内容:{{item.context}}</div> <div>问题内容:{{item.context}}</div>
<div>发现时间:{{item.checkTime}}</div> <div>发现时间:{{item.checkTime}}</div>
......
...@@ -29,6 +29,7 @@ export default { ...@@ -29,6 +29,7 @@ export default {
lineColor: 'red', lineColor: 'red',
bgColor: '', bgColor: '',
resultImg: '', resultImg: '',
confirmImgl:'',
isCrop: false, isCrop: false,
value:'', value:'',
result:[], result:[],
...@@ -46,6 +47,9 @@ export default { ...@@ -46,6 +47,9 @@ export default {
if(this.$route.query.name=='confirmNote'){ if(this.$route.query.name=='confirmNote'){
this.confirmImg=this.$route.query.confirmImg this.confirmImg=this.$route.query.confirmImg
} }
if(this.$route.query.name=='confirmNotel'){
this.confirmImgl=this.$route.query.confirmImgl
}
}, },
methods: { methods: {
handleReset () { handleReset () {
...@@ -58,6 +62,8 @@ export default { ...@@ -58,6 +62,8 @@ export default {
//生成图片后存储到session中并跳转把图片是否显示的boolean带过去 //生成图片后存储到session中并跳转把图片是否显示的boolean带过去
if(this.confirmImg){ if(this.confirmImg){
this.$router.push({name:'confirmNote',query:{name:'callbackSign',confirmImg:this.confirmImg}}) this.$router.push({name:'confirmNote',query:{name:'callbackSign',confirmImg:this.confirmImg}})
}else if(this.confirmImgl){
this.$router.push({name:'confirmNote',query:{name:'callbackSignl',confirmImgl:this.confirmImgl}})
}else{ }else{
this.$router.push({name:'noticeList',query:{name:'sign',img:this.img}}) this.$router.push({name:'noticeList',query:{name:'sign',img:this.img}})
} }
...@@ -65,9 +71,9 @@ export default { ...@@ -65,9 +71,9 @@ export default {
if(this.img){ if(this.img){
sessionStorage.setItem('resultImg',this.resultImg) sessionStorage.setItem('resultImg',this.resultImg)
} }
// else if(this.img2){ else if(this.confirmImgl){
// sessionStorage.setItem('resultImg2',this.resultImg) sessionStorage.setItem('confirmImgl',this.resultImg)
// } }
else if(this.confirmImg){ else if(this.confirmImg){
sessionStorage.setItem('confirmImg',this.resultImg) sessionStorage.setItem('confirmImg',this.resultImg)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment