From 2fda34643bc22e25f6c569415da5f955c81536bf Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 03 六月 2025 09:37:08 +0800
Subject: [PATCH] 设备详情通过ID过滤/设备详情增加上传附件
---
pages/home/home.vue | 254 +++-
package-lock.json | 5
pages/ToDoList/ToDoSpareParts/ToDoSpareParts.vue | 55 -
node_modules/file-saver/dist/FileSaver.js | 188 +++
pages/maintenanceReport/maintenanceReport.vue | 30
pages/baoZhou/baoZhou.vue | 12
pages/ToDoList/ToDoListDeils/ToDoCheckDetils/ToDoCheckDetils.vue | 13
store/index.js | 282 +++--
pages/device/deviceWebDeils/deviceWebDeils.vue | 19
pages/checkList/checkList.vue | 171 ++-
uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue | 751 ++++++++-------
static/icon_del.png | 0
static/icon_down.png | 0
node_modules/file-saver/CHANGELOG.md | 64 +
common/luch-request/core/Request.js | 2
pages/reportRepair/reportRepair.vue | 35
uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue | 2
node_modules/file-saver/package.json | 69 +
node_modules/file-saver/dist/FileSaver.min.js | 3
common/service/config.service.js | 2
pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue | 23
pages/device/device.vue | 4
pages/TaskManager/TaskManagerList.vue | 3
static/icon_file.png | 0
uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue | 2
pages/reportRepair/reportRepairList/reportRepairList.vue | 249 ++--
node_modules/file-saver/README.md | 150 +++
manifest.json | 2
node_modules/file-saver/LICENSE.md | 11
pages/reportRepair/reportRepairDeils/reportRepairDeils.vue | 34
uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue | 44
common/util/work.js | 8
pages/device/deviceDeils/deviceDeils.vue | 435 +++++++
node_modules/file-saver/dist/FileSaver.min.js.map | 1
34 files changed, 2,011 insertions(+), 912 deletions(-)
diff --git a/common/luch-request/core/Request.js b/common/luch-request/core/Request.js
index 6bf0d85..40b683b 100644
--- a/common/luch-request/core/Request.js
+++ b/common/luch-request/core/Request.js
@@ -181,6 +181,8 @@
})
}
+
+
post(url, data, options = {}) {
return this.request({
url,
diff --git a/common/service/config.service.js b/common/service/config.service.js
index 39d1de7..79aea71 100644
--- a/common/service/config.service.js
+++ b/common/service/config.service.js
@@ -6,7 +6,7 @@
BASE_URL = '/jeecg-boot' // 鐢熶骇鐜
}
let staticDomainURL ='/sys/common/static';
-let staticURL ='http://192.168.4.20:9999/jeecg-boot/sys/common/static';
+let staticURL ='https://192.168.100.105:9999/jeecg-boot/sys/common/static';
const configService = {
apiUrl: BASE_URL,
staticDomainURL: staticDomainURL,
diff --git a/common/util/work.js b/common/util/work.js
index abc6250..f2388ab 100644
--- a/common/util/work.js
+++ b/common/util/work.js
@@ -94,13 +94,13 @@
export const os = {
data:[
{
- title:"鐐规",
+ title:"寰呯偣妫�",
icon:icon_prefix+"xinwen.png",
description:"璁惧鐐规",
useCount:10000,
page:'checkList'
},{
- title:"鍛ㄤ繚",
+ title:"寰呭懆淇�",
icon:icon_prefix+"toupiao.png",
description:"璁惧鍛ㄤ繚",
useCount:10000,
@@ -121,9 +121,9 @@
icon:icon_prefix+"xinwen.png",
description:"璁惧鎶ヤ慨",
useCount:10000,
- page:'reportRepair'
+ page:'reportRepairList'
},{
- title:"缁翠慨",
+ title:"寰呯淮淇�",
icon:icon_prefix+"toupiao.png",
description:"璁惧缁翠慨",
useCount:10000,
diff --git a/manifest.json b/manifest.json
index 903eb2b..c1a40dc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -91,7 +91,7 @@
"proxy": {
/**閰嶇疆鏈嶅姟鍣ㄨ矾寰�**/
"/jeecg-boot": {
- "target": "https://192.168.4.20:9999", // 鐩爣鏈嶅姟鍣�
+ "target": "https://192.168.100.105:9999", // 鐩爣鏈嶅姟鍣�
"changeOrigin": true
}
}
diff --git a/node_modules/file-saver/CHANGELOG.md b/node_modules/file-saver/CHANGELOG.md
new file mode 100644
index 0000000..c8c7955
--- /dev/null
+++ b/node_modules/file-saver/CHANGELOG.md
@@ -0,0 +1,64 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [2.0.5] - 2020-11-18
+
+- Fix server side rendering
+
+## [2.0.2] - 2019-05-14
+
+- Catching an exception on Send (HEAD) ([#534])
+
+## [2.0.0] - 2018-10-17
+
+- Removed eval to resolve CSP ([#465])
+
+## [2.0.0-rc.4] - 2018-10-17
+
+- Don鈥檛 throw on module.exports
+
+## [2.0.0-rc.3] - 2018-09-27
+
+- Switch export method
+
+## [2.0.0-rc.2] - 2018-09-26
+
+- Added a changelog.md
+- Reverted `a.click()` to use dispatch with a try-catch ([#465], [#382])
+- Made third argument to an object where you have to pass `{ autoBom: true }`
+ - boolean are depricated but still works
+
+## [2.0.0-rc.1] - 2018-09-26
+
+- saveAs don't return anything
+ - The object that dispatched `writestart progress write writeend` are gone
+ - detecting such features was never possible and nobody seems to use it.
+- Removed the demo folder
+- Removed date/version from top of the file
+- Dosen't crash in web workers ([#449])
+- Support saving urls ([#260] with workarounds for cross origin)
+- Uses babel universal module pattern (UMD) to export the package
+- Provides source map now as well.
+- use a[download] before msSaveAs ([#193], [#294])
+- removed dist from .gitignore (npm uses it if it don't find a .npmignore)
+- autoBom is now reversed so you have to tell when you want to use autoBom ([#432])
+- `a.click()` since there are new and depricated event constructors that works differently ([#382])
+- opens up a new popup (tab) directly for the fallback method since the FileReader is async
+- removed the explicitly MSIE [1-9] check
+- Uses new anchor link for each save (might solve multiple download problems)
+
+ [#382]: https://github.com/eligrey/FileSaver.js/issues/382
+ [#449]: https://github.com/eligrey/FileSaver.js/issues/449
+ [#260]: https://github.com/eligrey/FileSaver.js/issues/260
+ [#193]: https://github.com/eligrey/FileSaver.js/issues/193
+ [#294]: https://github.com/eligrey/FileSaver.js/issues/294
+ [#432]: https://github.com/eligrey/FileSaver.js/issues/432
+ [#382]: https://github.com/eligrey/FileSaver.js/issues/382
+ [#465]: https://github.com/eligrey/FileSaver.js/issues/465
+ [#469]: https://github.com/eligrey/FileSaver.js/issues/469
+ [#470]: https://github.com/eligrey/FileSaver.js/issues/470
+ [#491]: https://github.com/eligrey/FileSaver.js/issues/491
+ [#534]: https://github.com/eligrey/FileSaver.js/issues/534
diff --git a/node_modules/file-saver/LICENSE.md b/node_modules/file-saver/LICENSE.md
new file mode 100644
index 0000000..32ef3ca
--- /dev/null
+++ b/node_modules/file-saver/LICENSE.md
@@ -0,0 +1,11 @@
+The MIT License
+
+Copyright 漏 2016 [Eli Grey][1].
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ [1]: http://eligrey.com
diff --git a/node_modules/file-saver/README.md b/node_modules/file-saver/README.md
new file mode 100644
index 0000000..8cf55b0
--- /dev/null
+++ b/node_modules/file-saver/README.md
@@ -0,0 +1,150 @@
+If you need to save really large files bigger than the blob's size limitation or don't have
+enough RAM, then have a look at the more advanced [StreamSaver.js][7]
+that can save data directly to the hard drive asynchronously with the power of the new streams API. That will have
+support for progress, cancelation and knowing when it's done writing
+
+FileSaver.js
+============
+
+FileSaver.js is the solution to saving files on the client-side, and is perfect for
+web apps that generates files on the client, However if the file is coming from the
+server we recommend you to first try to use [Content-Disposition][8] attachment response header as it has more cross-browser compatiblity.
+
+Looking for `canvas.toBlob()` for saving canvases? Check out
+[canvas-toBlob.js][2] for a cross-browser implementation.
+
+Supported Browsers
+------------------
+
+| Browser | Constructs as | Filenames | Max Blob Size | Dependencies |
+| -------------- | ------------- | ------------ | ------------- | ------------ |
+| Firefox 20+ | Blob | Yes | 800 MiB | None |
+| Firefox < 20 | data: URI | No | n/a | [Blob.js](https://github.com/eligrey/Blob.js) |
+| Chrome | Blob | Yes | [2GB][3] | None |
+| Chrome for Android | Blob | Yes | [RAM/5][3] | None |
+| Edge | Blob | Yes | ? | None |
+| IE 10+ | Blob | Yes | 600 MiB | None |
+| Opera 15+ | Blob | Yes | 500 MiB | None |
+| Opera < 15 | data: URI | No | n/a | [Blob.js](https://github.com/eligrey/Blob.js) |
+| Safari 6.1+* | Blob | No | ? | None |
+| Safari < 6 | data: URI | No | n/a | [Blob.js](https://github.com/eligrey/Blob.js) |
+| Safari 10.1+ 聽 | Blob 聽 聽 聽 聽 | Yes 聽 聽 聽 聽 | n/a 聽 聽 聽 聽 聽 | None |
+
+Feature detection is possible:
+
+```js
+try {
+ var isFileSaverSupported = !!new Blob;
+} catch (e) {}
+```
+
+### IE < 10
+
+It is possible to save text files in IE < 10 without Flash-based polyfills.
+See [ChenWenBrian and koffsyrup's `saveTextAs()`](https://github.com/koffsyrup/FileSaver.js#examples) for more details.
+
+### Safari 6.1+
+
+Blobs may be opened instead of saved sometimes鈥攜ou may have to direct your Safari users to manually
+press <kbd>鈱�</kbd>+<kbd>S</kbd> to save the file after it is opened. Using the `application/octet-stream` MIME type to force downloads [can cause issues in Safari](https://github.com/eligrey/FileSaver.js/issues/12#issuecomment-47247096).
+
+### iOS
+
+saveAs must be run within a user interaction event such as onTouchDown or onClick; setTimeout will prevent saveAs from triggering. Due to restrictions in iOS saveAs opens in a new window instead of downloading, if you want this fixed please [tell Apple how this WebKit bug is affecting you](https://bugs.webkit.org/show_bug.cgi?id=167341).
+
+Syntax
+------
+### Import `saveAs()` from file-saver
+```js
+import { saveAs } from 'file-saver';
+```
+
+```js
+FileSaver saveAs(Blob/File/Url, optional DOMString filename, optional Object { autoBom })
+```
+
+Pass `{ autoBom: true }` if you want FileSaver.js to automatically provide Unicode text encoding hints (see: [byte order mark](https://en.wikipedia.org/wiki/Byte_order_mark)). Note that this is only done if your blob type has `charset=utf-8` set.
+
+Examples
+--------
+
+### Saving text using `require()`
+```js
+var FileSaver = require('file-saver');
+var blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
+FileSaver.saveAs(blob, "hello world.txt");
+```
+
+### Saving text
+
+```js
+var blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
+FileSaver.saveAs(blob, "hello world.txt");
+```
+
+### Saving URLs
+
+```js
+FileSaver.saveAs("https://httpbin.org/image", "image.jpg");
+```
+Using URLs within the same origin will just use `a[download]`.
+Otherwise, it will first check if it supports cors header with a synchronous head request.
+If it does, it will download the data and save using blob URLs.
+If not, it will try to download it using `a[download]`.
+
+The standard W3C File API [`Blob`][4] interface is not available in all browsers.
+[Blob.js][5] is a cross-browser `Blob` implementation that solves this.
+
+### Saving a canvas
+```js
+var canvas = document.getElementById("my-canvas");
+canvas.toBlob(function(blob) {
+ saveAs(blob, "pretty image.png");
+});
+```
+
+Note: The standard HTML5 `canvas.toBlob()` method is not available in all browsers.
+[canvas-toBlob.js][6] is a cross-browser `canvas.toBlob()` that polyfills this.
+
+### Saving File
+
+You can save a File constructor without specifying a filename. If the
+file itself already contains a name, there is a hand full of ways to get a file
+instance (from storage, file input, new constructor, clipboard event).
+If you still want to change the name, then you can change it in the 2nd argument.
+
+```js
+// Note: Ie and Edge don't support the new File constructor,
+// so it's better to construct blobs and use saveAs(blob, filename)
+var file = new File(["Hello, world!"], "hello world.txt", {type: "text/plain;charset=utf-8"});
+FileSaver.saveAs(file);
+```
+
+
+
+
+
+ [1]: http://eligrey.com/demos/FileSaver.js/
+ [2]: https://github.com/eligrey/canvas-toBlob.js
+ [3]: https://bugs.chromium.org/p/chromium/issues/detail?id=375297#c107
+ [4]: https://developer.mozilla.org/en-US/docs/DOM/Blob
+ [5]: https://github.com/eligrey/Blob.js
+ [6]: https://github.com/eligrey/canvas-toBlob.js
+ [7]: https://github.com/jimmywarting/StreamSaver.js
+ [8]: https://github.com/eligrey/FileSaver.js/wiki/Saving-a-remote-file#using-http-header
+
+Installation
+------------------
+
+```bash
+# Basic Node.JS installation
+npm install file-saver --save
+bower install file-saver
+```
+
+Additionally, TypeScript definitions can be installed via:
+
+```bash
+# Additional typescript definitions
+npm install @types/file-saver --save-dev
+```
diff --git a/node_modules/file-saver/dist/FileSaver.js b/node_modules/file-saver/dist/FileSaver.js
new file mode 100644
index 0000000..e07c980
--- /dev/null
+++ b/node_modules/file-saver/dist/FileSaver.js
@@ -0,0 +1,188 @@
+(function (global, factory) {
+ if (typeof define === "function" && define.amd) {
+ define([], factory);
+ } else if (typeof exports !== "undefined") {
+ factory();
+ } else {
+ var mod = {
+ exports: {}
+ };
+ factory();
+ global.FileSaver = mod.exports;
+ }
+})(this, function () {
+ "use strict";
+
+ /*
+ * FileSaver.js
+ * A saveAs() FileSaver implementation.
+ *
+ * By Eli Grey, http://eligrey.com
+ *
+ * License : https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md (MIT)
+ * source : http://purl.eligrey.com/github/FileSaver.js
+ */
+ // The one and only way of getting global scope in all environments
+ // https://stackoverflow.com/q/3277182/1008999
+ var _global = typeof window === 'object' && window.window === window ? window : typeof self === 'object' && self.self === self ? self : typeof global === 'object' && global.global === global ? global : void 0;
+
+ function bom(blob, opts) {
+ if (typeof opts === 'undefined') opts = {
+ autoBom: false
+ };else if (typeof opts !== 'object') {
+ console.warn('Deprecated: Expected third argument to be a object');
+ opts = {
+ autoBom: !opts
+ };
+ } // prepend BOM for UTF-8 XML and text/* types (including HTML)
+ // note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
+
+ if (opts.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
+ return new Blob([String.fromCharCode(0xFEFF), blob], {
+ type: blob.type
+ });
+ }
+
+ return blob;
+ }
+
+ function download(url, name, opts) {
+ var xhr = new XMLHttpRequest();
+ xhr.open('GET', url);
+ xhr.responseType = 'blob';
+
+ xhr.onload = function () {
+ saveAs(xhr.response, name, opts);
+ };
+
+ xhr.onerror = function () {
+ console.error('could not download file');
+ };
+
+ xhr.send();
+ }
+
+ function corsEnabled(url) {
+ var xhr = new XMLHttpRequest(); // use sync to avoid popup blocker
+
+ xhr.open('HEAD', url, false);
+
+ try {
+ xhr.send();
+ } catch (e) {}
+
+ return xhr.status >= 200 && xhr.status <= 299;
+ } // `a.click()` doesn't work for all browsers (#465)
+
+
+ function click(node) {
+ try {
+ node.dispatchEvent(new MouseEvent('click'));
+ } catch (e) {
+ var evt = document.createEvent('MouseEvents');
+ evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80, 20, false, false, false, false, 0, null);
+ node.dispatchEvent(evt);
+ }
+ } // Detect WebView inside a native macOS app by ruling out all browsers
+ // We just need to check for 'Safari' because all other browsers (besides Firefox) include that too
+ // https://www.whatismybrowser.com/guides/the-latest-user-agent/macos
+
+
+ var isMacOSWebView = _global.navigator && /Macintosh/.test(navigator.userAgent) && /AppleWebKit/.test(navigator.userAgent) && !/Safari/.test(navigator.userAgent);
+ var saveAs = _global.saveAs || ( // probably in some web worker
+ typeof window !== 'object' || window !== _global ? function saveAs() {}
+ /* noop */
+ // Use download attribute first if possible (#193 Lumia mobile) unless this is a macOS WebView
+ : 'download' in HTMLAnchorElement.prototype && !isMacOSWebView ? function saveAs(blob, name, opts) {
+ var URL = _global.URL || _global.webkitURL;
+ var a = document.createElement('a');
+ name = name || blob.name || 'download';
+ a.download = name;
+ a.rel = 'noopener'; // tabnabbing
+ // TODO: detect chrome extensions & packaged apps
+ // a.target = '_blank'
+
+ if (typeof blob === 'string') {
+ // Support regular links
+ a.href = blob;
+
+ if (a.origin !== location.origin) {
+ corsEnabled(a.href) ? download(blob, name, opts) : click(a, a.target = '_blank');
+ } else {
+ click(a);
+ }
+ } else {
+ // Support blobs
+ a.href = URL.createObjectURL(blob);
+ setTimeout(function () {
+ URL.revokeObjectURL(a.href);
+ }, 4E4); // 40s
+
+ setTimeout(function () {
+ click(a);
+ }, 0);
+ }
+ } // Use msSaveOrOpenBlob as a second approach
+ : 'msSaveOrOpenBlob' in navigator ? function saveAs(blob, name, opts) {
+ name = name || blob.name || 'download';
+
+ if (typeof blob === 'string') {
+ if (corsEnabled(blob)) {
+ download(blob, name, opts);
+ } else {
+ var a = document.createElement('a');
+ a.href = blob;
+ a.target = '_blank';
+ setTimeout(function () {
+ click(a);
+ });
+ }
+ } else {
+ navigator.msSaveOrOpenBlob(bom(blob, opts), name);
+ }
+ } // Fallback to using FileReader and a popup
+ : function saveAs(blob, name, opts, popup) {
+ // Open a popup immediately do go around popup blocker
+ // Mostly only available on user interaction and the fileReader is async so...
+ popup = popup || open('', '_blank');
+
+ if (popup) {
+ popup.document.title = popup.document.body.innerText = 'downloading...';
+ }
+
+ if (typeof blob === 'string') return download(blob, name, opts);
+ var force = blob.type === 'application/octet-stream';
+
+ var isSafari = /constructor/i.test(_global.HTMLElement) || _global.safari;
+
+ var isChromeIOS = /CriOS\/[\d]+/.test(navigator.userAgent);
+
+ if ((isChromeIOS || force && isSafari || isMacOSWebView) && typeof FileReader !== 'undefined') {
+ // Safari doesn't allow downloading of blob URLs
+ var reader = new FileReader();
+
+ reader.onloadend = function () {
+ var url = reader.result;
+ url = isChromeIOS ? url : url.replace(/^data:[^;]*;/, 'data:attachment/file;');
+ if (popup) popup.location.href = url;else location = url;
+ popup = null; // reverse-tabnabbing #460
+ };
+
+ reader.readAsDataURL(blob);
+ } else {
+ var URL = _global.URL || _global.webkitURL;
+ var url = URL.createObjectURL(blob);
+ if (popup) popup.location = url;else location.href = url;
+ popup = null; // reverse-tabnabbing #460
+
+ setTimeout(function () {
+ URL.revokeObjectURL(url);
+ }, 4E4); // 40s
+ }
+ });
+ _global.saveAs = saveAs.saveAs = saveAs;
+
+ if (typeof module !== 'undefined') {
+ module.exports = saveAs;
+ }
+});
diff --git a/node_modules/file-saver/dist/FileSaver.min.js b/node_modules/file-saver/dist/FileSaver.min.js
new file mode 100644
index 0000000..77f4ff9
--- /dev/null
+++ b/node_modules/file-saver/dist/FileSaver.min.js
@@ -0,0 +1,3 @@
+(function(a,b){if("function"==typeof define&&define.amd)define([],b);else if("undefined"!=typeof exports)b();else{b(),a.FileSaver={exports:{}}.exports}})(this,function(){"use strict";function b(a,b){return"undefined"==typeof b?b={autoBom:!1}:"object"!=typeof b&&(console.warn("Deprecated: Expected third argument to be a object"),b={autoBom:!b}),b.autoBom&&/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(a.type)?new Blob(["\uFEFF",a],{type:a.type}):a}function c(a,b,c){var d=new XMLHttpRequest;d.open("GET",a),d.responseType="blob",d.onload=function(){g(d.response,b,c)},d.onerror=function(){console.error("could not download file")},d.send()}function d(a){var b=new XMLHttpRequest;b.open("HEAD",a,!1);try{b.send()}catch(a){}return 200<=b.status&&299>=b.status}function e(a){try{a.dispatchEvent(new MouseEvent("click"))}catch(c){var b=document.createEvent("MouseEvents");b.initMouseEvent("click",!0,!0,window,0,0,0,80,20,!1,!1,!1,!1,0,null),a.dispatchEvent(b)}}var f="object"==typeof window&&window.window===window?window:"object"==typeof self&&self.self===self?self:"object"==typeof global&&global.global===global?global:void 0,a=f.navigator&&/Macintosh/.test(navigator.userAgent)&&/AppleWebKit/.test(navigator.userAgent)&&!/Safari/.test(navigator.userAgent),g=f.saveAs||("object"!=typeof window||window!==f?function(){}:"download"in HTMLAnchorElement.prototype&&!a?function(b,g,h){var i=f.URL||f.webkitURL,j=document.createElement("a");g=g||b.name||"download",j.download=g,j.rel="noopener","string"==typeof b?(j.href=b,j.origin===location.origin?e(j):d(j.href)?c(b,g,h):e(j,j.target="_blank")):(j.href=i.createObjectURL(b),setTimeout(function(){i.revokeObjectURL(j.href)},4E4),setTimeout(function(){e(j)},0))}:"msSaveOrOpenBlob"in navigator?function(f,g,h){if(g=g||f.name||"download","string"!=typeof f)navigator.msSaveOrOpenBlob(b(f,h),g);else if(d(f))c(f,g,h);else{var i=document.createElement("a");i.href=f,i.target="_blank",setTimeout(function(){e(i)})}}:function(b,d,e,g){if(g=g||open("","_blank"),g&&(g.document.title=g.document.body.innerText="downloading..."),"string"==typeof b)return c(b,d,e);var h="application/octet-stream"===b.type,i=/constructor/i.test(f.HTMLElement)||f.safari,j=/CriOS\/[\d]+/.test(navigator.userAgent);if((j||h&&i||a)&&"undefined"!=typeof FileReader){var k=new FileReader;k.onloadend=function(){var a=k.result;a=j?a:a.replace(/^data:[^;]*;/,"data:attachment/file;"),g?g.location.href=a:location=a,g=null},k.readAsDataURL(b)}else{var l=f.URL||f.webkitURL,m=l.createObjectURL(b);g?g.location=m:location.href=m,g=null,setTimeout(function(){l.revokeObjectURL(m)},4E4)}});f.saveAs=g.saveAs=g,"undefined"!=typeof module&&(module.exports=g)});
+
+//# sourceMappingURL=FileSaver.min.js.map
\ No newline at end of file
diff --git a/node_modules/file-saver/dist/FileSaver.min.js.map b/node_modules/file-saver/dist/FileSaver.min.js.map
new file mode 100644
index 0000000..0df89e0
--- /dev/null
+++ b/node_modules/file-saver/dist/FileSaver.min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["../src/FileSaver.js"],"names":[],"mappings":"uLAkBA,QAAS,CAAA,CAAT,CAAc,CAAd,CAAoB,CAApB,CAA0B,OACJ,WAAhB,QAAO,CAAA,CADa,CACS,CAAI,CAAG,CAAE,OAAO,GAAT,CADhB,CAEC,QAAhB,QAAO,CAAA,CAFQ,GAGtB,OAAO,CAAC,IAAR,CAAa,oDAAb,CAHsB,CAItB,CAAI,CAAG,CAAE,OAAO,CAAE,CAAC,CAAZ,CAJe,EASpB,CAAI,CAAC,OAAL,EAAgB,6EAA6E,IAA7E,CAAkF,CAAI,CAAC,IAAvF,CATI,CAUf,GAAI,CAAA,IAAJ,CAAS,UAA8B,CAA9B,CAAT,CAA8C,CAAE,IAAI,CAAE,CAAI,CAAC,IAAb,CAA9C,CAVe,CAYjB,CACR,CAED,QAAS,CAAA,CAAT,CAAmB,CAAnB,CAAwB,CAAxB,CAA8B,CAA9B,CAAoC,CAClC,GAAI,CAAA,CAAG,CAAG,GAAI,CAAA,cAAd,CACA,CAAG,CAAC,IAAJ,CAAS,KAAT,CAAgB,CAAhB,CAFkC,CAGlC,CAAG,CAAC,YAAJ,CAAmB,MAHe,CAIlC,CAAG,CAAC,MAAJ,CAAa,UAAY,CACvB,CAAM,CAAC,CAAG,CAAC,QAAL,CAAe,CAAf,CAAqB,CAArB,CACP,CANiC,CAOlC,CAAG,CAAC,OAAJ,CAAc,UAAY,CACxB,OAAO,CAAC,KAAR,CAAc,yBAAd,CACD,CATiC,CAUlC,CAAG,CAAC,IAAJ,EACD,CAED,QAAS,CAAA,CAAT,CAAsB,CAAtB,CAA2B,CACzB,GAAI,CAAA,CAAG,CAAG,GAAI,CAAA,cAAd,CAEA,CAAG,CAAC,IAAJ,CAAS,MAAT,CAAiB,CAAjB,IAHyB,CAIzB,GAAI,CACF,CAAG,CAAC,IAAJ,EACD,CAAC,MAAO,CAAP,CAAU,CAAE,CACd,MAAqB,IAAd,EAAA,CAAG,CAAC,MAAJ,EAAmC,GAAd,EAAA,CAAG,CAAC,MACjC,CAGD,QAAS,CAAA,CAAT,CAAgB,CAAhB,CAAsB,CACpB,GAAI,CACF,CAAI,CAAC,aAAL,CAAmB,GAAI,CAAA,UAAJ,CAAe,OAAf,CAAnB,CACD,CAAC,MAAO,CAAP,CAAU,CACV,GAAI,CAAA,CAAG,CAAG,QAAQ,CAAC,WAAT,CAAqB,aAArB,CAAV,CACA,CAAG,CAAC,cAAJ,CAAmB,OAAnB,OAAwC,MAAxC,CAAgD,CAAhD,CAAmD,CAAnD,CAAsD,CAAtD,CAAyD,EAAzD,CACsB,EADtB,aACsD,CADtD,CACyD,IADzD,CAFU,CAIV,CAAI,CAAC,aAAL,CAAmB,CAAnB,CACD,CACF,C,GAtDG,CAAA,CAAO,CAAqB,QAAlB,QAAO,CAAA,MAAP,EAA8B,MAAM,CAAC,MAAP,GAAkB,MAAhD,CACV,MADU,CACe,QAAhB,QAAO,CAAA,IAAP,EAA4B,IAAI,CAAC,IAAL,GAAc,IAA1C,CACT,IADS,CACgB,QAAlB,QAAO,CAAA,MAAP,EAA8B,MAAM,CAAC,MAAP,GAAkB,MAAhD,CACP,MADO,O,CAyDP,CAAc,CAAG,CAAO,CAAC,SAAR,EAAqB,YAAY,IAAZ,CAAiB,SAAS,CAAC,SAA3B,CAArB,EAA8D,cAAc,IAAd,CAAmB,SAAS,CAAC,SAA7B,CAA9D,EAAyG,CAAC,SAAS,IAAT,CAAc,SAAS,CAAC,SAAxB,C,CAE3H,CAAM,CAAG,CAAO,CAAC,MAAR,GAEQ,QAAlB,QAAO,CAAA,MAAP,EAA8B,MAAM,GAAK,CAA1C,CACI,UAAmB,CAAc,CADrC,CAIG,YAAc,CAAA,iBAAiB,CAAC,SAAhC,EAA6C,CAAC,CAA/C,CACA,SAAiB,CAAjB,CAAuB,CAAvB,CAA6B,CAA7B,CAAmC,IAC/B,CAAA,CAAG,CAAG,CAAO,CAAC,GAAR,EAAe,CAAO,CAAC,SADE,CAE/B,CAAC,CAAG,QAAQ,CAAC,aAAT,CAAuB,GAAvB,CAF2B,CAGnC,CAAI,CAAG,CAAI,EAAI,CAAI,CAAC,IAAb,EAAqB,UAHO,CAKnC,CAAC,CAAC,QAAF,CAAa,CALsB,CAMnC,CAAC,CAAC,GAAF,CAAQ,UAN2B,CAWf,QAAhB,QAAO,CAAA,CAXwB,EAajC,CAAC,CAAC,IAAF,CAAS,CAbwB,CAc7B,CAAC,CAAC,MAAF,GAAa,QAAQ,CAAC,MAdO,CAmB/B,CAAK,CAAC,CAAD,CAnB0B,CAe/B,CAAW,CAAC,CAAC,CAAC,IAAH,CAAX,CACI,CAAQ,CAAC,CAAD,CAAO,CAAP,CAAa,CAAb,CADZ,CAEI,CAAK,CAAC,CAAD,CAAI,CAAC,CAAC,MAAF,CAAW,QAAf,CAjBsB,GAuBjC,CAAC,CAAC,IAAF,CAAS,CAAG,CAAC,eAAJ,CAAoB,CAApB,CAvBwB,CAwBjC,UAAU,CAAC,UAAY,CAAE,CAAG,CAAC,eAAJ,CAAoB,CAAC,CAAC,IAAtB,CAA6B,CAA5C,CAA8C,GAA9C,CAxBuB,CAyBjC,UAAU,CAAC,UAAY,CAAE,CAAK,CAAC,CAAD,CAAK,CAAzB,CAA2B,CAA3B,CAzBuB,CA2BpC,CA5BC,CA+BA,oBAAsB,CAAA,SAAtB,CACA,SAAiB,CAAjB,CAAuB,CAAvB,CAA6B,CAA7B,CAAmC,CAGnC,GAFA,CAAI,CAAG,CAAI,EAAI,CAAI,CAAC,IAAb,EAAqB,UAE5B,CAAoB,QAAhB,QAAO,CAAA,CAAX,CAUE,SAAS,CAAC,gBAAV,CAA2B,CAAG,CAAC,CAAD,CAAO,CAAP,CAA9B,CAA4C,CAA5C,CAVF,KACE,IAAI,CAAW,CAAC,CAAD,CAAf,CACE,CAAQ,CAAC,CAAD,CAAO,CAAP,CAAa,CAAb,CADV,KAEO,CACL,GAAI,CAAA,CAAC,CAAG,QAAQ,CAAC,aAAT,CAAuB,GAAvB,CAAR,CACA,CAAC,CAAC,IAAF,CAAS,CAFJ,CAGL,CAAC,CAAC,MAAF,CAAW,QAHN,CAIL,UAAU,CAAC,UAAY,CAAE,CAAK,CAAC,CAAD,CAAK,CAAzB,CACX,CAIJ,CAhBC,CAmBA,SAAiB,CAAjB,CAAuB,CAAvB,CAA6B,CAA7B,CAAmC,CAAnC,CAA0C,CAS1C,GANA,CAAK,CAAG,CAAK,EAAI,IAAI,CAAC,EAAD,CAAK,QAAL,CAMrB,CALI,CAKJ,GAJE,CAAK,CAAC,QAAN,CAAe,KAAf,CACA,CAAK,CAAC,QAAN,CAAe,IAAf,CAAoB,SAApB,CAAgC,gBAGlC,EAAoB,QAAhB,QAAO,CAAA,CAAX,CAA8B,MAAO,CAAA,CAAQ,CAAC,CAAD,CAAO,CAAP,CAAa,CAAb,CAAf,CATY,GAWtC,CAAA,CAAK,CAAiB,0BAAd,GAAA,CAAI,CAAC,IAXyB,CAYtC,CAAQ,CAAG,eAAe,IAAf,CAAoB,CAAO,CAAC,WAA5B,GAA4C,CAAO,CAAC,MAZzB,CAatC,CAAW,CAAG,eAAe,IAAf,CAAoB,SAAS,CAAC,SAA9B,CAbwB,CAe1C,GAAI,CAAC,CAAW,EAAK,CAAK,EAAI,CAAzB,EAAsC,CAAvC,GAAgF,WAAtB,QAAO,CAAA,UAArE,CAAiG,CAE/F,GAAI,CAAA,CAAM,CAAG,GAAI,CAAA,UAAjB,CACA,CAAM,CAAC,SAAP,CAAmB,UAAY,CAC7B,GAAI,CAAA,CAAG,CAAG,CAAM,CAAC,MAAjB,CACA,CAAG,CAAG,CAAW,CAAG,CAAH,CAAS,CAAG,CAAC,OAAJ,CAAY,cAAZ,CAA4B,uBAA5B,CAFG,CAGzB,CAHyB,CAGlB,CAAK,CAAC,QAAN,CAAe,IAAf,CAAsB,CAHJ,CAIxB,QAAQ,CAAG,CAJa,CAK7B,CAAK,CAAG,IACT,CAT8F,CAU/F,CAAM,CAAC,aAAP,CAAqB,CAArB,CACD,CAXD,IAWO,IACD,CAAA,CAAG,CAAG,CAAO,CAAC,GAAR,EAAe,CAAO,CAAC,SAD5B,CAED,CAAG,CAAG,CAAG,CAAC,eAAJ,CAAoB,CAApB,CAFL,CAGD,CAHC,CAGM,CAAK,CAAC,QAAN,CAAiB,CAHvB,CAIA,QAAQ,CAAC,IAAT,CAAgB,CAJhB,CAKL,CAAK,CAAG,IALH,CAML,UAAU,CAAC,UAAY,CAAE,CAAG,CAAC,eAAJ,CAAoB,CAApB,CAA0B,CAAzC,CAA2C,GAA3C,CACX,CACF,CA1FU,C,CA6Fb,CAAO,CAAC,MAAR,CAAiB,CAAM,CAAC,MAAP,CAAgB,C,CAEX,WAAlB,QAAO,CAAA,M,GACT,MAAM,CAAC,OAAP,CAAiB,C","file":"FileSaver.min.js","sourcesContent":["/*\n* FileSaver.js\n* A saveAs() FileSaver implementation.\n*\n* By Eli Grey, http://eligrey.com\n*\n* License : https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md (MIT)\n* source : http://purl.eligrey.com/github/FileSaver.js\n*/\n\n// The one and only way of getting global scope in all environments\n// https://stackoverflow.com/q/3277182/1008999\nvar _global = typeof window === 'object' && window.window === window\n ? window : typeof self === 'object' && self.self === self\n ? self : typeof global === 'object' && global.global === global\n ? global\n : this\n\nfunction bom (blob, opts) {\n if (typeof opts === 'undefined') opts = { autoBom: false }\n else if (typeof opts !== 'object') {\n console.warn('Deprecated: Expected third argument to be a object')\n opts = { autoBom: !opts }\n }\n\n // prepend BOM for UTF-8 XML and text/* types (including HTML)\n // note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF\n if (opts.autoBom && /^\\s*(?:text\\/\\S*|application\\/xml|\\S*\\/\\S*\\+xml)\\s*;.*charset\\s*=\\s*utf-8/i.test(blob.type)) {\n return new Blob([String.fromCharCode(0xFEFF), blob], { type: blob.type })\n }\n return blob\n}\n\nfunction download (url, name, opts) {\n var xhr = new XMLHttpRequest()\n xhr.open('GET', url)\n xhr.responseType = 'blob'\n xhr.onload = function () {\n saveAs(xhr.response, name, opts)\n }\n xhr.onerror = function () {\n console.error('could not download file')\n }\n xhr.send()\n}\n\nfunction corsEnabled (url) {\n var xhr = new XMLHttpRequest()\n // use sync to avoid popup blocker\n xhr.open('HEAD', url, false)\n try {\n xhr.send()\n } catch (e) {}\n return xhr.status >= 200 && xhr.status <= 299\n}\n\n// `a.click()` doesn't work for all browsers (#465)\nfunction click (node) {\n try {\n node.dispatchEvent(new MouseEvent('click'))\n } catch (e) {\n var evt = document.createEvent('MouseEvents')\n evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80,\n 20, false, false, false, false, 0, null)\n node.dispatchEvent(evt)\n }\n}\n\n// Detect WebView inside a native macOS app by ruling out all browsers\n// We just need to check for 'Safari' because all other browsers (besides Firefox) include that too\n// https://www.whatismybrowser.com/guides/the-latest-user-agent/macos\nvar isMacOSWebView = _global.navigator && /Macintosh/.test(navigator.userAgent) && /AppleWebKit/.test(navigator.userAgent) && !/Safari/.test(navigator.userAgent)\n\nvar saveAs = _global.saveAs || (\n // probably in some web worker\n (typeof window !== 'object' || window !== _global)\n ? function saveAs () { /* noop */ }\n\n // Use download attribute first if possible (#193 Lumia mobile) unless this is a macOS WebView\n : ('download' in HTMLAnchorElement.prototype && !isMacOSWebView)\n ? function saveAs (blob, name, opts) {\n var URL = _global.URL || _global.webkitURL\n var a = document.createElement('a')\n name = name || blob.name || 'download'\n\n a.download = name\n a.rel = 'noopener' // tabnabbing\n\n // TODO: detect chrome extensions & packaged apps\n // a.target = '_blank'\n\n if (typeof blob === 'string') {\n // Support regular links\n a.href = blob\n if (a.origin !== location.origin) {\n corsEnabled(a.href)\n ? download(blob, name, opts)\n : click(a, a.target = '_blank')\n } else {\n click(a)\n }\n } else {\n // Support blobs\n a.href = URL.createObjectURL(blob)\n setTimeout(function () { URL.revokeObjectURL(a.href) }, 4E4) // 40s\n setTimeout(function () { click(a) }, 0)\n }\n }\n\n // Use msSaveOrOpenBlob as a second approach\n : 'msSaveOrOpenBlob' in navigator\n ? function saveAs (blob, name, opts) {\n name = name || blob.name || 'download'\n\n if (typeof blob === 'string') {\n if (corsEnabled(blob)) {\n download(blob, name, opts)\n } else {\n var a = document.createElement('a')\n a.href = blob\n a.target = '_blank'\n setTimeout(function () { click(a) })\n }\n } else {\n navigator.msSaveOrOpenBlob(bom(blob, opts), name)\n }\n }\n\n // Fallback to using FileReader and a popup\n : function saveAs (blob, name, opts, popup) {\n // Open a popup immediately do go around popup blocker\n // Mostly only available on user interaction and the fileReader is async so...\n popup = popup || open('', '_blank')\n if (popup) {\n popup.document.title =\n popup.document.body.innerText = 'downloading...'\n }\n\n if (typeof blob === 'string') return download(blob, name, opts)\n\n var force = blob.type === 'application/octet-stream'\n var isSafari = /constructor/i.test(_global.HTMLElement) || _global.safari\n var isChromeIOS = /CriOS\\/[\\d]+/.test(navigator.userAgent)\n\n if ((isChromeIOS || (force && isSafari) || isMacOSWebView) && typeof FileReader !== 'undefined') {\n // Safari doesn't allow downloading of blob URLs\n var reader = new FileReader()\n reader.onloadend = function () {\n var url = reader.result\n url = isChromeIOS ? url : url.replace(/^data:[^;]*;/, 'data:attachment/file;')\n if (popup) popup.location.href = url\n else location = url\n popup = null // reverse-tabnabbing #460\n }\n reader.readAsDataURL(blob)\n } else {\n var URL = _global.URL || _global.webkitURL\n var url = URL.createObjectURL(blob)\n if (popup) popup.location = url\n else location.href = url\n popup = null // reverse-tabnabbing #460\n setTimeout(function () { URL.revokeObjectURL(url) }, 4E4) // 40s\n }\n }\n)\n\n_global.saveAs = saveAs.saveAs = saveAs\n\nif (typeof module !== 'undefined') {\n module.exports = saveAs;\n}\n"]}
\ No newline at end of file
diff --git a/node_modules/file-saver/package.json b/node_modules/file-saver/package.json
new file mode 100644
index 0000000..777f1b5
--- /dev/null
+++ b/node_modules/file-saver/package.json
@@ -0,0 +1,69 @@
+{
+ "_from": "file-saver",
+ "_id": "file-saver@2.0.5",
+ "_inBundle": false,
+ "_integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==",
+ "_location": "/file-saver",
+ "_phantomChildren": {},
+ "_requested": {
+ "type": "tag",
+ "registry": true,
+ "raw": "file-saver",
+ "name": "file-saver",
+ "escapedName": "file-saver",
+ "rawSpec": "",
+ "saveSpec": null,
+ "fetchSpec": "latest"
+ },
+ "_requiredBy": [
+ "#USER",
+ "/"
+ ],
+ "_resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+ "_shasum": "d61cfe2ce059f414d899e9dd6d4107ee25670c38",
+ "_spec": "file-saver",
+ "_where": "D:\\HBuilderProjects\\JeecgUniapp-2.0.1",
+ "author": {
+ "name": "Eli Grey",
+ "email": "me@eligrey.com"
+ },
+ "bugs": {
+ "url": "https://github.com/eligrey/FileSaver.js/issues"
+ },
+ "bundleDependencies": false,
+ "deprecated": false,
+ "description": "An HTML5 saveAs() FileSaver implementation",
+ "devDependencies": {
+ "@babel/cli": "^7.1.0",
+ "@babel/core": "^7.1.0",
+ "@babel/plugin-transform-modules-umd": "^7.1.0",
+ "babel-preset-minify": "^0.4.3"
+ },
+ "files": [
+ "dist/FileSaver.js",
+ "dist/FileSaver.min.js",
+ "dist/FileSaver.min.js.map",
+ "src/FileSaver.js"
+ ],
+ "homepage": "https://github.com/eligrey/FileSaver.js#readme",
+ "keywords": [
+ "filesaver",
+ "saveas",
+ "blob"
+ ],
+ "license": "MIT",
+ "main": "dist/FileSaver.min.js",
+ "name": "file-saver",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/eligrey/FileSaver.js.git"
+ },
+ "scripts": {
+ "build": "npm run build:development && npm run build:production",
+ "build:development": "babel -o dist/FileSaver.js --plugins @babel/plugin-transform-modules-umd src/FileSaver.js",
+ "build:production": "babel -o dist/FileSaver.min.js -s --plugins @babel/plugin-transform-modules-umd --presets minify src/FileSaver.js",
+ "prepublishOnly": "npm run build",
+ "test": "echo \"Error: no test specified\" && exit 0"
+ },
+ "version": "2.0.5"
+}
diff --git a/package-lock.json b/package-lock.json
index 7505224..f6efbb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,11 @@
"resolved": "https://registry.npmmirror.com/@dcloudio/uni-ui/-/uni-ui-1.5.7.tgz",
"integrity": "sha512-DugxSIrQrze1FLdUOj9a+JEQ0bHGjnJTcGUK1mN/MivKg7nuKJBRWk5Ipa9sUdoBznX6ndz5h2e7Uao6x1CdCw=="
},
+ "file-saver": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+ },
"html5-qrcode": {
"version": "2.3.8",
"resolved": "https://registry.npmmirror.com/html5-qrcode/-/html5-qrcode-2.3.8.tgz",
diff --git a/pages/TaskManager/TaskManagerList.vue b/pages/TaskManager/TaskManagerList.vue
index 3570fdb..4a81ef9 100644
--- a/pages/TaskManager/TaskManagerList.vue
+++ b/pages/TaskManager/TaskManagerList.vue
@@ -184,6 +184,9 @@
case (name === '鍛ㄤ繚鎵ц' && type === '璁惧鍛ㄤ繚'):
url = '/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure';
break;
+ case (name === '鍛ㄤ繚棰嗗彇' && type === '璁惧鍛ㄤ繚'):
+ url = '/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure';
+ break;
case (name === '鐝粍闀跨‘璁�' && type === '璁惧鐐规'):
url = '/pages/ToDoList/ToDoListCheckSure/ToDoListCheckSure';
break;
diff --git a/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue b/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue
index 1c85fbf..6d6e422 100644
--- a/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue
+++ b/pages/ToDoList/ToDoBaoZhouSure/ToDoBaoZhouSure.vue
@@ -114,7 +114,7 @@
</uni-collapse>
- <uni-forms ref="form" :modelValue="ScanData" validate-trigger="bind" err-show-type="undertext">
+ <uni-forms v-show="isShowSure" ref="form" :modelValue="ScanData" validate-trigger="bind" err-show-type="undertext">
<uni-group top="1">
<view class="divider"><text>鐝粍闀跨‘璁や俊鎭�</text></view>
<!-- <view class="text-gray margin-bottom-lg">鈥斺�斺�斺�斺�斺�斺�斺�斺�旂彮缁勯暱纭淇℃伅鈥斺�斺�斺�斺�斺�斺�斺�斺�斺��</view> -->
@@ -137,10 +137,10 @@
<uni-easyinput type="textarea" v-model="ScanData.initialAcceptanceComment" placeholder="璇疯緭鍏ユ剰瑙�"
:disabled="isShowLast" />
</uni-forms-item>
- <uni-forms-item :label-width="80" required name="randomInspectionFlag" label="鎶芥鏍囪:">
+ <uni-forms-item :label-width="80" name="randomInspectionFlag" label="鎶芥鏍囪:">
<uni-data-select v-model="ScanData.InspectionFlagName"
:localdata="ScanData.randomInspectionFlagList" @change="changehandlingInspectionFlag"
- placeholder="璇烽�夋嫨" :disabled="isShowLast"/>
+ placeholder="璇烽�夋嫨" :disabled="isShowLast"/>
</uni-forms-item>
<uni-forms-item :label-width="80" name="outNum" label="鍒濋獙鏀堕檮浠�:">
<uni-file-picker limit="9" :value="fileList" :image-styles="imageStyles"
@@ -157,7 +157,7 @@
<uni-easyinput type="textarea" v-model="ScanData.finalAcceptanceComment" placeholder="璇疯緭鍏ユ剰瑙�"
:disabled="isfinal" />
</uni-forms-item>
- <uni-forms-item :label-width="80" required name="finalFlagName" label="鎶芥鏍囪:">
+ <uni-forms-item :label-width="80" name="finalFlagName" label="鎶芥鏍囪:">
<uni-data-select v-model="ScanData.finalFlagName" :localdata="ScanData.finalInspectionFlagList"
@change="changehandlingFinalFlag" placeholder="璇烽�夋嫨" :disabled="isfinal" />
</uni-forms-item>
@@ -712,7 +712,7 @@
*/
case 'WAIT_FINAL_ACCEPTANCE':
if (this.flag == 'task') {
- this.title = '缁堥獙'
+ this.title = '璇︽儏'
this.readonly = true
this.readonlyFirst = true
this.isHideFist = true;
@@ -756,7 +756,7 @@
break
case 'COMPLETE':
- this.isShowSure = true;
+ this.isShowSure = true
this.isHideLast = true
this.isHideFist = true
this.isShowLast = true
@@ -767,6 +767,17 @@
this.isShowBtn = false
this.title = '璇︽儏'
break
+
+ case 'UNDER_MAINTENANCE':
+
+ this.isfinal = true
+ this.readonlyFirst = true
+ this.readonly = true
+ this.readonlyFirstFanl = true
+ this.isShowBtn = false
+ this.title = '璇︽儏'
+ break
+
}
this.ScanData.initialAcceptanceComment = this.announcement1.initialAcceptanceComment
this.ScanData.typeName = this.announcement1.confirmDealType
diff --git a/pages/ToDoList/ToDoListDeils/ToDoCheckDetils/ToDoCheckDetils.vue b/pages/ToDoList/ToDoListDeils/ToDoCheckDetils/ToDoCheckDetils.vue
index b675259..29e1e15 100644
--- a/pages/ToDoList/ToDoListDeils/ToDoCheckDetils/ToDoCheckDetils.vue
+++ b/pages/ToDoList/ToDoListDeils/ToDoCheckDetils/ToDoCheckDetils.vue
@@ -128,6 +128,7 @@
<script>
import index from "../../../../store";
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
+ import configService from "@/common/service/config.service.js";
export default {
mixins: [MescrollMixin], // 浣跨敤mixin
data() {
@@ -143,6 +144,7 @@
sourceType: ['album', 'camera'],
isClick: false,
scrollLeft: 0,
+ ipAndPort: configService.staticURL,
searchValue: '',
imgList: [],
equipmentList: [],
@@ -517,11 +519,12 @@
this.standardId = this.announcement1.standardId
this.getStandardFile()
}
- this.formData.num = this.announcement1.equipmentId,
- this.formData.orderNum = this.announcement1.orderNum,
- this.formData.operator = this.announcement1.operator,
- this.formData.inspectionDate = this.announcement1.inspectionDate,
- this.hasInspectionDateArrived();
+ this.formData.num = this.announcement1.equipmentId
+ this.formData.remark = this.announcement1.remark
+ this.formData.orderNum = this.announcement1.orderNum
+ this.formData.operator = this.announcement1.operator
+ this.formData.inspectionDate = this.announcement1.inspectionDate
+ this.hasInspectionDateArrived();
}
diff --git a/pages/ToDoList/ToDoSpareParts/ToDoSpareParts.vue b/pages/ToDoList/ToDoSpareParts/ToDoSpareParts.vue
index 31844e8..951b926 100644
--- a/pages/ToDoList/ToDoSpareParts/ToDoSpareParts.vue
+++ b/pages/ToDoList/ToDoSpareParts/ToDoSpareParts.vue
@@ -63,7 +63,7 @@
<!-- <view class="text-gray margin-bottom-lg">鈥斺�斺�斺�斺�斺�斺�斺�斺�旂鐞嗗憳棰嗙敤澶囦欢鈥斺�斺�斺�斺�斺�斺�斺�斺�斺��</view> -->
<uni-forms-item :label-width="100" required name="sparePartDescription" label="澶囦欢鎻忚堪:">
<uni-easyinput type="textarea" v-model="ScanData.sparePartDescription" placeholder="璇疯緭鍏ュ浠舵弿杩�"
- :disabled="isRuning" />
+ :disabled="isRuning"/>
</uni-forms-item>
</uni-group>
@@ -293,57 +293,8 @@
}
- // if (this.formData.reportStatus == 'UNDER_REPAIR' && this.formData.isSpare == 0 && this.flag !== 'task') {
- // if (this.formData.faultReason == undefined || this.formData.faultReason == null ||
- // this
- // .formData.faultReason ==
- // '') {
-
- // uni.showToast({
- // icon: 'none',
- // title: '鏁呴殰鍘熷洜涓嶈兘涓虹┖'
- // });
- // return false;
- // }
- // if (this.formData.repairDescription == undefined || this.formData.repairDescription == null ||
- // this
- // .formData.repairDescription ==
- // '') {
-
- // uni.showToast({
- // icon: 'none',
- // title: '缁翠慨缁撴灉涓嶈兘涓虹┖'
- // });
- // return false;
- // }
-
- // }
- // if (this.formData.reportStatus == 'UNDER_REPAIR' && this.formData.isSpare == 1 && this.flag !== 'task') {
- // if (this.formData.faultReason == undefined || this.formData.faultReason == null ||
- // this
- // .formData.faultReason ==
- // '') {
-
- // uni.showToast({
- // icon: 'none',
- // title: '鏁呴殰鍘熷洜涓嶈兘涓虹┖'
- // });
- // return false;
- // }
- // if (this.formData.repairDescription == undefined || this.formData.repairDescription == null ||
- // this
- // .formData.repairDescription ==
- // '') {
-
- // uni.showToast({
- // icon: 'none',
- // title: '缁翠慨缁撴灉涓嶈兘涓虹┖'
- // });
- // return false;
- // }
-
- // }
- if (this.formData.reportStatus == 'UNDER_REPAIR' && this.flag !== 'task') {
+
+ if (this.formData.reportStatus == 'UNDER_REPAIR' && this.flag !== 'task' && this.formData.isSpare == 0) {
if (this.formData.faultReason == undefined || this.formData.faultReason == null || this.formData.faultReason == '') {
uni.showToast({
icon: 'none',
diff --git a/pages/baoZhou/baoZhou.vue b/pages/baoZhou/baoZhou.vue
index 1f28e4a..aa7e16b 100644
--- a/pages/baoZhou/baoZhou.vue
+++ b/pages/baoZhou/baoZhou.vue
@@ -139,7 +139,8 @@
announcement1: [],
msg1Count: 0,
msg2Count: 0,
- msg1Title: ""
+ msg1Title: "",
+ equipmentId:''
}
},
computed: {
@@ -160,7 +161,11 @@
this.mescroll.resetUpScroll()
}
},
-
+ onLoad: function(options) {
+ this.equipmentId = options.equipmentId ?
+ decodeURIComponent(options.equipmentId) :
+ '';
+ },
created() {},
methods: {
changehandlingInspectionFlag(e) {
@@ -225,7 +230,8 @@
pageSize: page.size,
order: 'desc',
column: 'createTime',
- maintenanceStatus: 'WAIT_MAINTENANCE'
+ maintenanceStatus: 'WAIT_MAINTENANCE',
+ equipmentId: this.equipmentId || ''
},
}).then(res => {
diff --git a/pages/checkList/checkList.vue b/pages/checkList/checkList.vue
index 8dcfa39..feebc11 100644
--- a/pages/checkList/checkList.vue
+++ b/pages/checkList/checkList.vue
@@ -95,7 +95,7 @@
mixins: [MescrollMixin], // 浣跨敤mixin
data() {
return {
- equipmentList:[],
+ equipmentList: [],
type: 'top',
scrollLeft: 0,
formData: {
@@ -131,7 +131,8 @@
announcement1: [],
msg1Count: 0,
msg2Count: 0,
- msg1Title: ""
+ msg1Title: "",
+ equipmentId: ''
}
},
computed: {
@@ -152,7 +153,11 @@
this.mescroll.resetUpScroll()
}
},
-
+ onLoad: function(options) {
+ this.equipmentId = options.equipmentId ?
+ decodeURIComponent(options.equipmentId) :
+ '';
+ },
created() {
this.getEquipment()
},
@@ -164,8 +169,9 @@
pageSize: 9999,
order: 'desc',
column: 'createTime'
+
},
-
+
}).then(res => {
//璁剧疆鍒楄〃鏁版嵁
if (res.data.success) {
@@ -176,7 +182,7 @@
title: res.data.message,
duration: 2000
});
-
+
}
}).catch(() => {
this.$tip.error("鑱旂綉澶辫触")
@@ -240,19 +246,108 @@
search() {
this.$refs.popup.open();
},
-
-
upCallback(page) {
+ // 纭繚 equipmentId 濮嬬粓浣滀负鍙傛暟浼犻�掞紝鍊间负鏈夋晥瀛楃涓叉垨绌哄瓧绗︿覆
+ const params = {
+ pageNo: page.num,
+ pageSize: page.size,
+ order: 'desc',
+ column: 'createTime',
+ inspectionStatus: 'WAIT_INSPECTION',
+ equipmentId: this.equipmentId || ''
+ };
+
+ this.$http.get(this.url.stallList, {
+ params
+ })
+ .then(res => {
+ if (!res.data.success) {
+ throw new Error('鑾峰彇鏁版嵁澶辫触: ' + res.data.message);
+ }
+
+ const records = res.data.result.records || [];
+ const total = res.data.result.total || 0;
+
+ // 鏇存柊娑堟伅璁℃暟鍜屾爣棰�
+ this.msg1Count = total;
+ this.msg1Title = `閫氱煡(${total})`;
+
+ // 鏇存柊鍒楄〃鏁版嵁
+ this.msgList = page.num === 1 ? [...records] : [...this.msgList, ...records];
+
+ // 缁撴潫鍔犺浇鐘舵��
+ this.mescroll.endSuccess(records.length);
+ console.log('璇锋眰鎴愬姛', res.data);
+ })
+ .catch(error => {
+ console.error('璇锋眰澶辫触', error);
+ this.mescroll.endErr();
+ });
+ },
+
+
+ // upCallback(page) {
+ // this.$http.get(this.url.stallList, {
+ // params: {
+ // pageNo: page.num,
+ // pageSize: page.size,
+ // order: 'desc',
+ // column: 'createTime',
+ // inspectionStatus: 'WAIT_INSPECTION',
+ // equipmentId:this.equipmentId || ''
+ // },
+
+ // }).then(res => {
+ // this.announcement1 = res.data.result.records
+ // this.mescroll.endSuccess(this.announcement1.length);
+ // console.log("url", res)
+ // //璁剧疆鍒楄〃鏁版嵁
+ // if (res.data.success) {
+ // console.log("res", res.data)
+ // this.msg1Count = res.data.result.total
+ // this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
+ // for (let annItem of this.announcement1) {
+ // this.msgList.push(annItem)
+ // }
+ // }
+ // if (page.num == 1) {
+ // this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
+ // this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
+ // }
+
+ // }).catch(() => {
+ // //鑱旂綉澶辫触, 缁撴潫鍔犺浇
+ // this.mescroll.endErr();
+ // })
+
+ // },
+
+
+ resetTask() {
+ this.formData.orderNum = ''
+ this.formData.num = ''
+ this.$refs.popup.close();
+ this.mescroll.resetUpScroll()
+
+ },
+ /* 妫�绱� */
+ getSera() {
+ this.$refs.popup.close();
+ this.msgList = [];
this.$http.get(this.url.stallList, {
params: {
- pageNo: page.num,
- pageSize: page.size,
- order: 'desc',
- column: 'createTime',
- inspectionStatus: 'WAIT_INSPECTION'
- },
+ pageNo: 1,
+ pageSize: 999,
+ order: "desc",
+ column: "createTime",
+ inspectionStatus: 'WAIT_INSPECTION',
+ equipmentId: this.formData.num,
+ orderNum: this.formData.orderNum
+ }
}).then(res => {
+ //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
+
this.announcement1 = res.data.result.records
this.mescroll.endSuccess(this.announcement1.length);
console.log("url", res)
@@ -274,56 +369,6 @@
//鑱旂綉澶辫触, 缁撴潫鍔犺浇
this.mescroll.endErr();
})
-
- },
-
-
- resetTask() {
- this.formData.orderNum = ''
- this.formData.num = ''
- this.$refs.popup.close();
- this.mescroll.resetUpScroll()
-
- },
- /* 妫�绱� */
- getSera() {
- this.$refs.popup.close();
- this.msgList = [];
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- inspectionStatus: 'WAIT_INSPECTION',
- equipmentId: this.formData.num,
- orderNum: this.formData.orderNum
-
- }
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
-
- this.announcement1 = res.data.result.records
- this.mescroll.endSuccess(this.announcement1.length);
- console.log("url", res)
- //璁剧疆鍒楄〃鏁版嵁
- if (res.data.success) {
- console.log("res", res.data)
- this.msg1Count = res.data.result.total
- this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
- for (let annItem of this.announcement1) {
- this.msgList.push(annItem)
- }
- }
- if (page.num == 1) {
- this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- }
-
- }).catch(() => {
- //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- this.mescroll.endErr();
- })
},
diff --git a/pages/device/device.vue b/pages/device/device.vue
index 55df6ab..52619df 100644
--- a/pages/device/device.vue
+++ b/pages/device/device.vue
@@ -27,7 +27,7 @@
</view>
</view>
<view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">缁翠慨鐘舵��::</view>
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">缁翠慨鐘舵��:</view>
<view class="flex-sub bg-white padding-xs margin-xs text-orange radius text-right">
{{item.assetStatus_dictText}}
</view>
@@ -87,7 +87,7 @@
},
computed: {
top() {
- return this.CustomBar * 2 + 160
+ return this.CustomBar * 2 + 100
},
style() {
var StatusBar = this.StatusBar;
diff --git a/pages/device/deviceDeils/deviceDeils.vue b/pages/device/deviceDeils/deviceDeils.vue
index dd2793f..3c86bb0 100644
--- a/pages/device/deviceDeils/deviceDeils.vue
+++ b/pages/device/deviceDeils/deviceDeils.vue
@@ -9,44 +9,79 @@
<uni-forms ref="form" :modelValue="formData" validate-trigger="bind" err-show-type="undertext">
<uni-group top="1">
-
- <uni-forms-item :label-width="100" required name="num" label="璁惧缂栧彿:">
- <uni-easyinput v-model="formData.equipmentCode" :disabled="true" />
- </uni-forms-item>
-
- <uni-forms-item :label-width="100" name="remark" label="璁惧鍚嶇О:">
- <uni-easyinput v-model="formData.equipmentName" :disabled="true" />
- </uni-forms-item>
- <!-- <uni-forms-item :label-width="100" name="outNum" label="鍏抽敭璁惧鏍囪瘑:">
+
+ <uni-forms-item :label-width="100" required name="num" label="璁惧缂栧彿:">
+ <uni-easyinput v-model="formData.equipmentCode" :disabled="true" />
+ </uni-forms-item>
+
+ <uni-forms-item :label-width="100" name="remark" label="璁惧鍚嶇О:">
+ <uni-easyinput v-model="formData.equipmentName" :disabled="true" />
+ </uni-forms-item>
+ <!-- <uni-forms-item :label-width="100" name="outNum" label="鍏抽敭璁惧鏍囪瘑:">
<uni-easyinput v-model="formData.equipmentImportance" :disabled="true" />
</uni-forms-item> -->
- <view class="text-gray margin-bottom-lg">鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�� 鍩烘湰淇℃伅 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺��</view>
- <uni-forms-item :label-width="100" name="taskCode" label="缁翠慨鐘舵��:">
- <uni-easyinput :disabled="true" v-model="formData.repairStatus_dictText" />
- </uni-forms-item>
- <uni-forms-item :label-width="100" name="endLocation" label="淇濆吇鐘舵��:">
- <uni-easyinput :disabled="true" v-model="formData.maintenanceStatus_dictText" />
-
- </uni-forms-item>
- <uni-forms-item :label-width="100" name="endLocation" label="浣跨敤杞﹂棿:">
- <uni-easyinput :disabled="true" v-model="formData.orgId_dictText" />
-
- </uni-forms-item>
-
- <uni-forms-item :label-width="100" name="endLocation" label="瀹夎浣嶇疆:">
- <uni-easyinput :disabled="true" v-model="formData.installationPosition" />
- </uni-forms-item>
- <uni-forms-item :label-width="100" name="endLocation" label="鎶�鏈姸鎬�:">
- <uni-easyinput :disabled="true" v-model="formData.technologyStatus_dictText" />
- </uni-forms-item>
- <uni-forms-item :label-width="100" name="endLocation" label="璁惧绠＄悊鍛�:">
- <uni-easyinput :disabled="true" v-model="formData.equipmentManager_dictText" />
- </uni-forms-item>
- <uni-forms-item :label-width="100" name="endLocation" label="鍑哄巶鏃ユ湡:">
- <uni-easyinput :disabled="true" v-model="formData.leaveFactoryDate" />
- </uni-forms-item>
+ <view class="text-gray margin-bottom-lg">鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�� 鍩烘湰淇℃伅 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺��</view>
+ <uni-forms-item :label-width="100" name="taskCode" label="缁翠慨鐘舵��:">
+ <uni-easyinput :disabled="true" v-model="formData.repairStatus_dictText" />
+ </uni-forms-item>
+ <uni-forms-item :label-width="100" name="endLocation" label="淇濆吇鐘舵��:">
+ <uni-easyinput :disabled="true" v-model="formData.maintenanceStatus_dictText" />
+
+ </uni-forms-item>
+ <uni-forms-item :label-width="100" name="endLocation" label="浣跨敤杞﹂棿:">
+ <uni-easyinput :disabled="true" v-model="formData.orgId_dictText" />
+
+ </uni-forms-item>
+
+ <uni-forms-item :label-width="100" name="endLocation" label="瀹夎浣嶇疆:">
+ <uni-easyinput :disabled="true" v-model="formData.installationPosition" />
+ </uni-forms-item>
+ <uni-forms-item :label-width="100" name="endLocation" label="鎶�鏈姸鎬�:">
+ <uni-easyinput :disabled="true" v-model="formData.technologyStatus_dictText" />
+ </uni-forms-item>
+ <uni-forms-item :label-width="100" name="endLocation" label="璁惧绠＄悊鍛�:">
+ <uni-easyinput :disabled="true" v-model="formData.equipmentManager_dictText" />
+ </uni-forms-item>
+ <uni-forms-item :label-width="100" name="endLocation" label="鍑哄巶鏃ユ湡:">
+ <uni-easyinput :disabled="true" v-model="formData.leaveFactoryDate" />
+ </uni-forms-item>
+ <uni-forms-item :label-width="100" name="outNum" label="璁惧鏂囨。:">
+ <uni-file-picker v-model="fileLists" :extension="['.pdf']" @fail="uploadFail"
+ :list-styles="listStyles" :delIcon="del" :max-count="5" file-mediatype="all"
+ @downloadFile="downloadFile" @select="onFileSelect" @delete="onFileDelete">
+ <button size="mini" type="primary">鐐瑰嚮涓婁紶</button>
+ </uni-file-picker>
+ </uni-forms-item>
</uni-group>
</uni-forms>
+
+
+ <view class="file-list margin-sm">
+ <view class="file-item" v-for="(file, index) in this.selectedFiles" :key="index">
+ <view class="file-icon">
+ <!-- 鏂囦欢鍥炬爣 -->
+ <image src="/static/icon_file.png" style="height: 25px; width: 25px; margin-right: 10px;"
+ mode='aspectFit' class="zai-logo "></image>
+
+ </view>
+ <view class="file-name">
+ <!-- 鏂囦欢鍚� -->
+ {{file.fileName}}
+ </view>
+ <view class="file-actions">
+ <!-- 涓嬭浇鎸夐挳 -->
+ <image v-show="showBtn" src="/static/icon_down.png" @click="downloadFile(file)"
+ style="height: 25px; width: 25px; margin-right: 10px;"></image>
+ <!-- <button size="mini" @click="downloadFile(file)">
+ <view class="icon-download">涓嬭浇</view>
+ </button> -->
+ <!-- 鍒犻櫎鎸夐挳 -->
+ <image v-show="showBtn" src="/static/icon_del.png" @click="deleteFile(index)"
+ style="height: 25px; width: 25px;"></image>
+ </button>
+ </view>
+ </view>
+ </view>
<view class="flex margin-bottom-xs">
<button class="flex-sub cu-btn bg-blue margin-sm lg" hover-class="is-hover"
@click="goReportRepair()">鎶ヤ慨</button>
@@ -63,17 +98,39 @@
<script>
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
+ import {
+ saveAs
+ } from 'file-saver'; // 寮曞叆 file-saver 搴�
export default {
mixins: [MescrollMixin], // 浣跨敤mixin
data() {
return {
+ showBtn: true,
+ listStyles: {
+ "borderStyle": {
+ "width": "0", // 杈规瀹藉害
+ },
+ "border": false, // 鏄惁鏄剧ず杈规
+ "dividline": false
+ },
+
+ del: true,
scrollLeft: 0,
searchValue: '',
- formData: {},
NavBarColor: this.NavBarColor,
url: {
- stallList: "/eam/equipment/queryById"
+ fileList: 'eam/equipmentAttachment/list',
+ stallList: "/eam/equipment/queryById",
+ upload: "/eam/sysFiles/batch_upload",
+ add: 'eam/equipmentAttachment/add',
+ downloadFile: 'eam/equipmentAttachment/downloadFile'
},
+ uploading: false, // 鏄惁姝ｅ湪涓婁紶
+ selectedFiles: [],
+ formData: {
+ fileLists: []
+ },
+ fileLists: [],
id: '',
upOption: {
page: {
@@ -121,46 +178,268 @@
},
created() {
this.upCallback()
+ this.getFileList()
},
methods: {
- goHome() {
- uni.reLaunch({
- url: '/pages/index/index'
+ downloadFile(item) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佷笅杞藉悧',
+ cancelText: '鍙栨秷',
+ confirmText: '纭',
+ success: res => {
+ if (res.confirm) {
+ this.downFile(item)
+ }
+ }
})
+
+ },
+
+
+ downFile(item) {
+ this.$http.download(this.url.downloadFile, {
+ params: {
+ id: item.id
+ },
+ responseType: 'blob' // 纭繚鍝嶅簲绫诲瀷涓� blob
+ }).then(response => {
+ console.log('Response:', response); // 鏌ョ湅瀹屾暣鍝嶅簲缁撴瀯
+
+ // 鑾峰彇 tempFilePath锛圔lob URL锛�
+ const tempFilePath = response.tempFilePath;
+
+ if (!tempFilePath) {
+ uni.showToast({
+ title: '鏂囦欢涓嬭浇澶辫触',
+ icon: 'none'
+ });
+ return;
+ }
+
+ let fileName = item.fileName;
+
+ // 鍒涘缓 <a> 鏍囩骞惰Е鍙戜笅杞�
+ const link = document.createElement('a');
+ link.href = tempFilePath;
+ link.setAttribute('download', fileName);
+ link.style.display = 'none';
+
+ document.body.appendChild(link);
+ link.click();
+
+ // 娓呯悊璧勬簮
+ document.body.removeChild(link);
+
+ }).catch(err => {
+ console.error('Download error:', err);
+ uni.showToast({
+ title: '鏂囦欢涓嬭浇澶辫触',
+ icon: 'none'
+ });
+ });
+ },
+
+
+
+
+ // downFile(item) {
+ // this.$http.download(this.url.downloadFile, {
+ // params: {
+ // id:item.id
+ // },
+ // }).then(res => {
+ // if (!res) {
+ // this.$message.warning('鏂囦欢涓嬭浇澶辫触')
+ // return
+ // } else {
+ // let fileName = item.fileName;
+ // if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ // window.navigator.msSaveBlob(new Blob([res]), fileName);
+ // } else {
+ // let url = window.URL.createObjectURL(new Blob([res]));
+ // let link = document.createElement('a');
+ // link.style.display = 'none';
+ // link.href = url;
+ // link.setAttribute('download', fileName);
+ // document.body.appendChild(link);
+ // link.click()
+ // document.body.removeChild(link) //涓嬭浇瀹屾垚绉婚櫎鍏冪礌
+ // window.URL.revokeObjectURL(url) //閲婃斁鎺塨lob瀵硅薄
+ // }
+ // }
+ // }).catch((err) => {
+ // uni.showToast({
+ // title: '鑾峰彇鏂囦欢鍒楄〃澶辫触',
+ // icon: 'none'
+ // });
+ // });
+ // },
+
+
+ getFileList() {
+ this.$http.get(this.url.fileList, {
+ params: {
+ equipmentId: this.id,
+ pageNo: 1,
+ pageSize: 999,
+ column: 'createTime',
+ order: 'desc'
+ },
+ }).then(res => {
+ if (res.data.success) {
+ this.selectedFiles = res.data.result.records || [];
+
+ }
+ }).catch(() => {
+ uni.showToast({
+ title: '鑾峰彇鏂囦欢鍒楄〃澶辫触',
+ icon: 'none'
+ });
+ });
+ },
+ uploadFail(e) {
+ console.log('涓婁紶澶辫触锛�', e)
+ },
+
+
+
+ onFileSelect(e) {
+ const tempFilePaths = e.tempFilePaths;
+
+ uni.showLoading({
+ title: '涓婁紶涓�...'
+ });
+
+ const uploadPromises = tempFilePaths.map((filePath, index) => {
+ return new Promise((resolve, reject) => {
+ this.$http.upload(this.url.upload, {
+ filePath: filePath,
+ name: 'file'
+ })
+ .then(uploadRes => {
+ const serverFile = uploadRes.data.result[0];
+ console.log(serverFile);
+ // 鎻愬彇fileSuffix骞舵嫾鎺�
+ if (serverFile.fileSuffix && serverFile.fileName && !serverFile
+ .fileName.includes('.')) {
+ serverFile.fileName += '.' + serverFile.fileSuffix;
+ }
+ this.fileLists = [];
+ // 闃叉閲嶅娣诲姞锛堟牴鎹� id 鎴� fileName 鍒ゆ柇锛�
+ if (!this.fileLists.some(file => file.id === serverFile.id)) {
+ this.fileLists.push(serverFile);
+ }
+ resolve();
+ })
+ .catch(err => {
+ console.error(`鏂囦欢 ${index + 1} 涓婁紶澶辫触`, err);
+ uni.showToast({
+ title: `绗� ${index + 1} 涓枃浠朵笂浼犲け璐,
+ icon: 'none'
+ });
+ reject(err);
+ });
+ });
+ });
+
+ Promise.all(uploadPromises)
+ .then(() => {
+ uni.hideLoading();
+ uni.showToast({
+ title: '鍏ㄩ儴涓婁紶鎴愬姛锛屾鍦ㄦ彁浜�...'
+ });
+ this.submitFileList(); // 鑷姩鎻愪氦鎵�鏈夋枃浠�
+ })
+ .catch(() => {
+ uni.hideLoading();
+ uni.showToast({
+ title: '閮ㄥ垎涓婁紶澶辫触',
+ icon: 'none'
+ });
+ });
+ },
+ // 鏂囦欢鍒犻櫎鍥炶皟
+ onFileDelete(e) {
+ console.log('鍒犻櫎鏂囦欢:', e.index);
+ },
+
+ // 鍒犻櫎鍗曚釜鏂囦欢
+ deleteFile(index) {
+ this.fileLists.splice(index, 1);
+ },
+
+
+ submitFileList() {
+ if (!this.fileLists.length) {
+ uni.showToast({
+ title: '娌℃湁鍙彁浜ょ殑鏂囦欢',
+ icon: 'none'
+ });
+ return;
+ }
+ console.log(this.fileLists)
+ this.$http.post(this.url.add, {
+ equipmentId: this.id,
+ fileList: this.fileLists
+ }).then(res => {
+ if (res.data.success) {
+ uni.showToast({
+ title: '鎻愪氦鎴愬姛'
+ });
+ this.getFileList();
+ } else {
+ uni.showToast({
+ title: '鎻愪氦澶辫触',
+ icon: 'none'
+ });
+ }
+ }).catch(err => {
+ uni.showToast({
+ title: '鎻愪氦寮傚父',
+ icon: 'none'
+ });
+ console.error('鎻愪氦澶辫触:', err);
+ });
},
/**
* 鎶ヤ慨
*/
goReportRepair() {
console.log('getSera 鏂规硶琚皟鐢�');
- uni.navigateTo({
- url: `/pages/reportRepair/reportRepair?equipmentId=${encodeURIComponent(this.id)}`,
+ uni.redirectTo({
+ url: `/pages/reportRepair/reportRepair?equipmentId=${encodeURIComponent(this.id)}`
});
},
/**
* 鐐规
*/
goCheck() {
- uni.navigateTo({
- url: '/pages/checkList/checkList',
+ uni.redirectTo({
+ // url: '/pages/checkList/checkList',
+ url: `/pages/checkList/checkList?equipmentId=${encodeURIComponent(this.id)}`
});
},
/**
* 鍛ㄤ繚
*/
goBaoZhou() {
- uni.navigateTo({
- url: '/pages/baoZhou/baoZhou',
+ uni.redirectTo({
+ // url: '/pages/baoZhou/baoZhou',
+ url: `/pages/baoZhou/baoZhou?equipmentId=${encodeURIComponent(this.id)}`
});
},
/**
* 缁翠慨
*/
goMaintenance() {
- uni.navigateTo({
- url: '/pages/maintenanceReport/maintenanceReport',
+ uni.redirectTo({
+ // url: '/pages/maintenanceReport/maintenanceReport',
+ url: `/pages/maintenanceReport/maintenanceReport?equipmentId=${encodeURIComponent(this.id)}`
});
},
+
+
upCallback() {
this.$http.get(this.url.stallList, {
params: {
@@ -236,6 +515,25 @@
</script>
<style>
+ .file-list {
+ margin-top: 20px;
+ }
+
+ .file-item {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 10px;
+ border-bottom: 1px solid #eee;
+ }
+
+ .file-item text {
+ flex: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
.is-hover {
color: rgba(255, 255, 255, 0.6);
background-color: #55aaff;
@@ -256,4 +554,47 @@
margin-top: 85px;
height: auto;
}
+
+ .file-list {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+ }
+
+ .file-item {
+ display: flex;
+ align-items: center;
+ padding: 10px;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ }
+
+ .file-icon img {
+ width: 32px;
+ height: 32px;
+ margin-right: 10px;
+ }
+
+ .file-name {
+ flex: 1;
+ font-size: 16px;
+ }
+
+ .file-actions button {
+ background: none;
+ border: none;
+ cursor: pointer;
+ margin-left: 10px;
+ }
+
+ .file-actions .icon-download,
+ .file-actions .icon-delete {
+ font-size: 18px;
+ color: #555;
+ }
+
+ .file-actions .icon-download:hover,
+ .file-actions .icon-delete:hover {
+ color: #007bff;
+ }
</style>
\ No newline at end of file
diff --git a/pages/device/deviceWebDeils/deviceWebDeils.vue b/pages/device/deviceWebDeils/deviceWebDeils.vue
index 0a52107..f4502ee 100644
--- a/pages/device/deviceWebDeils/deviceWebDeils.vue
+++ b/pages/device/deviceWebDeils/deviceWebDeils.vue
@@ -168,32 +168,35 @@
*/
goReportRepair() {
console.log('getSera 鏂规硶琚皟鐢�');
- uni.navigateTo({
- url: `/pages/reportRepair/reportRepair?equipmentId=${encodeURIComponent(this.id)}`,
+ uni.redirectTo({
+ url: `/pages/reportRepair/reportRepair?equipmentId=${encodeURIComponent(this.id)}`
});
},
/**
* 鐐规
*/
goCheck() {
- uni.navigateTo({
- url: '/pages/checkList/checkList',
+ uni.redirectTo({
+ // url: '/pages/checkList/checkList',
+ url: `/pages/checkList/checkList?equipmentId=${encodeURIComponent(this.id)}`
});
},
/**
* 鍛ㄤ繚
*/
goBaoZhou() {
- uni.navigateTo({
- url: '/pages/baoZhou/baoZhou',
+ uni.redirectTo({
+ // url: '/pages/baoZhou/baoZhou',
+ url: `/pages/baoZhou/baoZhou?equipmentId=${encodeURIComponent(this.id)}`
});
},
/**
* 鍛ㄤ繚
*/
goMaintenance() {
- uni.navigateTo({
- url: '/pages/maintenanceReport/maintenanceReport',
+ uni.redirectTo({
+ // url: '/pages/maintenanceReport/maintenanceReport',
+ url: `/pages/maintenanceReport/maintenanceReport?equipmentId=${encodeURIComponent(this.id)}`
});
},
upCallback() {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index c20b129..5f4136a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,22 +2,23 @@
<view>
<scroll-view>
<!-- 杞挱 -->
- <swiper class="screen-swiper square-dot" :indicator-dots="true" :circular="true"
- :autoplay="true" interval="5000" duration="500" :style="[{animation: 'show 0.2s 1'}]">
+ <swiper class="screen-swiper square-dot" :indicator-dots="true" :circular="true" :autoplay="true"
+ interval="5000" duration="500" :style="[{animation: 'show 0.2s 1'}]">
<swiper-item v-for="(item,index) in swiperList" :key="index">
<image :src="item.url" mode="aspectFill" v-if="item.type=='image'"></image>
- <video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover" v-if="item.type=='video'"></video>
+ <video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false"
+ objectFit="cover" v-if="item.type=='video'"></video>
</swiper-item>
</swiper>
-
+
<!-- 璁惧缁翠慨 -->
<view class="cu-bar bg-white solid-bottom" :style="[{animation: 'show 0.5s 1'}]">
<view class="action">
<text class='cuIcon-title text-blue'></text>宸ヤ綔鍙�
</view>
</view>
-
- <view class="cu-list grid col-4 text-sm">
+
+ <!-- <view class="cu-list grid col-4 text-sm">
<view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.05 + 's'}]" v-for="(item,index) in usList" :key="index" @tap="goPage(item.page)">
<view class="padding text-center">
<image :src="item.icon" style="width:28px;height:28px;">
@@ -28,140 +29,229 @@
<view class="margin-top-xs">{{item.title}}</view>
</view>
</view>
+ </view> -->
+ <view class="cu-list grid col-4 text-sm">
+ <view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.05 + 's'}]"
+ v-for="(item, index) in usList" :key="index" @tap="goPage(item.page)">
+ <view class="padding text-center">
+ <image :src="item.icon" style="width:28px;height:28px;">
+ <view class="cu-tag badge margin-top-sm" style="margin-left:1.2em"
+ v-if="getTtemDotInfo(item)"></view>
+ </image>
+ <view class="margin-top-xs">{{ item.title }}</view>
+ </view>
+ </view>
</view>
-
+
<!-- 璁惧淇濆吇 -->
- <view class="cu-bar bg-white solid-bottom margin-top" :style="[{animation: 'show 0.6s 1'}]">
+ <view class="cu-bar bg-white solid-bottom margin-top" :style="[{animation: 'show 0.6s 1'}]">
<view class="action">
- <text class='cuIcon-title text-yellow'></text>淇濆吇
+ <text class='cuIcon-title text-yellow'></text>淇濆吇
</view>
</view>
<view class="cu-list grid col-4 text-sm">
- <view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.1 + 's'}]" v-for="(item,index) in osList" :key="index" @tap="goPage(item.page)">
+ <view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.1 + 's'}]"
+ v-for="(item,index) in osList" :key="index" @tap="goPage(item.page)">
<view class="padding text-center">
- <image :src="item.icon" style="width:28px;height:28px;"/>
+ <image :src="item.icon" style="width:28px;height:28px;" />
<view class="margin-top-xs">{{item.title}}</view>
</view>
</view>
</view>
-
-
+
+
<!-- 璁惧缁翠慨 -->
- <view class="cu-bar bg-white solid-bottom margin-top" :style="[{animation: 'show 0.6s 1'}]">
+ <view class="cu-bar bg-white solid-bottom margin-top" :style="[{animation: 'show 0.6s 1'}]">
<view class="action">
- <text class='cuIcon-title text-blue'></text>缁翠慨
+ <text class='cuIcon-title text-blue'></text>缁翠慨
</view>
</view>
<view class="cu-list grid col-4 text-sm">
- <view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.1 + 's'}]" v-for="(item,index) in wsList" :key="index" @tap="goPage(item.page)">
+ <view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.1 + 's'}]"
+ v-for="(item,index) in wsList" :key="index" @tap="goPage(item.page)">
<view class="padding text-center">
- <image :src="item.icon" style="width:28px;height:28px;"/>
+ <image :src="item.icon" style="width:28px;height:28px;" />
<view class="margin-top-xs">{{item.title}}</view>
</view>
</view>
</view>
-
+
</scroll-view>
<view class="cu-tabbar-height margin-top"></view>
</view>
</template>
<script>
- import { us,os,ws} from '@/common/util/work.js'
+ import {
+ ACCESS_TOKEN
+ } from '@/common/util/constants.js'
+ import {
+ us,
+ os,
+ ws
+ } from '@/common/util/work.js'
import socket from '@/common/js-sdk/socket/socket.js'
export default {
name: 'home',
- props:{
- cur:String,
+ props: {
+ cur: String,
},
watch: {
cur: {
immediate: true,
- handler:function(val,oldVal){
- console.log('cur',val,oldVal)
- this.initMenu()
+ handler: function(val, oldVal) {
+ console.log('cur', val, oldVal)
+ this.initMenu()
},
},
},
data() {
return {
- swiperList: [
- {id:1,type: 'image',url: '/static/banner/eam_banner1.png', link: ''},
- {id:2,type: 'image',url: '/static/banner/eam_banner2.png', link: ''},
- {id:3,type: 'image',url: '/static/banner/eam_banner3.png', link: ''},
- {id:4,type: 'image',url: '/static/banner/eam_banner4.png', link: ''},
+ url: {
+ bindingThirdPhone: '/sys/permission/getUserPermissionByToken',
+ countItem: '/assign/flow/taskCountBySelf'
+ },
+ swiperList: [{
+ id: 1,
+ type: 'image',
+ url: '/static/banner/eam_banner1.png',
+ link: ''
+ },
+ {
+ id: 2,
+ type: 'image',
+ url: '/static/banner/eam_banner2.png',
+ link: ''
+ },
+ {
+ id: 3,
+ type: 'image',
+ url: '/static/banner/eam_banner3.png',
+ link: ''
+ },
+ {
+ id: 4,
+ type: 'image',
+ url: '/static/banner/eam_banner4.png',
+ link: ''
+ },
],
- middleApps: [
- {icon: 'line2_icon1.png', title: '瀹℃壒', 'text': '涓汉瀹℃壒'},
- {icon: 'line2_icon2.png', title: '瀹℃壒绋�', 'text': '瀹℃壒鑽夌绠�'},
+ middleApps: [{
+ icon: 'line2_icon1.png',
+ title: '瀹℃壒',
+ 'text': '涓汉瀹℃壒'
+ },
+ {
+ icon: 'line2_icon2.png',
+ title: '瀹℃壒绋�',
+ 'text': '瀹℃壒鑽夌绠�'
+ },
],
- usList:us.data,
- osList:os.data,
- wsList:ws.data,
- msgCount:0,
- dot:{
- mailHome:false
+ usList: us.data,
+ osList: os.data,
+ wsList: ws.data,
+ msgCount: 0,
+ toDomsgCount: 0,
+
+ dot: {
+ mailHome: false
}
}
},
methods: {
- initMenu(){
+ initMenu() {
console.log("-----------home------------")
- this.onSocketOpen()
- this.onSocketReceive()
- this.loadCount(0);
+ this.onSocketOpen()
+ this.onSocketReceive()
+ this.saveClientId()
+ this.taskCountBySelf();
+ this.loadCount(0);
},
- goPage(page){
- if(!page){
+ goPage(page) {
+ if (!page) {
return false;
}
- if(page==='annotationList'){
- this.msgCount = 0
+ if (page === 'annotationList') {
+ this.msgCount = 0
}
- this.dot[page]=false
- this.$Router.push({name: page})
+ this.dot[page] = false
+ this.$Router.push({
+ name: page
+ })
},
// 鍚姩webSocket
onSocketOpen() {
socket.init('websocket');
},
onSocketReceive() {
- var _this=this
- socket.acceptMessage = function(res){
+ var _this = this
+ socket.acceptMessage = function(res) {
// console.log("椤甸潰鏀跺埌鐨勬秷鎭�", res);
- if(res.cmd == "topic"){
- //绯荤粺閫氱煡
- _this.loadCount('1')
- }else if(res.cmd == "user"){
- //鐢ㄦ埛娑堟伅
- _this.loadCount('2')
- } else if(res.cmd == 'email'){
- //閭欢娑堟伅
- _this.loadEmailCount()
+ if (res.cmd == "topic") {
+ //绯荤粺閫氱煡
+ _this.loadCount('1')
+ } else if (res.cmd == "user") {
+ //鐢ㄦ埛娑堟伅
+ _this.loadCount('2')
+ } else if (res.cmd == 'email') {
+ //閭欢娑堟伅
+ _this.loadEmailCount()
}
}
},
- loadCount(flag){
- console.log("loadCount::flag",flag)
- let url = '/sys/annountCement/listByUser';
- this.$http.get(url).then(res=>{
- console.log("res::",res)
- if(res.data.success){
- let msg1Count = res.data.result.anntMsgTotal;
- let msg2Count = res.data.result.sysMsgTotal;
- this.msgCount = msg1Count + msg2Count
- console.log("this.msgCount",this.msgCount)
- }
+
+ taskCountBySelf() {
+ let token = uni.getStorageSync(ACCESS_TOKEN)
+ this.$http.get(this.url.countItem).then(res => {
+ console.log("res::taskCountBySelf>", res)
+ this.toDomsgCount = res.data.result
})
},
- loadEmailCount(){
+ loadCount(flag) {
+ console.log("loadCount::flag", flag)
+ let url = '/sys/annountCement/listByUser';
+ this.$http.get(url).then(res => {
+ console.log("res::", res)
+ if (res.data.success) {
+ let msg1Count = res.data.result.anntMsgTotal;
+ let msg2Count = res.data.result.sysMsgTotal;
+ this.msgCount = msg1Count + msg2Count
+ console.log("this.msgCount", this.msgCount)
+ }
+ })
+ },
+ saveClientId() {
+ let token = uni.getStorageSync(ACCESS_TOKEN)
+ this.$http.get(this.url.bindingThirdPhone, {
+ params: {
+ token: token
+ }
+ }).then(res => {
+ const authData = res.data.result.auth
+
+ // 纭繚鏄暟缁�
+ if (!Array.isArray(authData)) {
+ console.warn('auth 涓嶆槸鏁扮粍:', authData)
+ return
+ }
+
+ // 瀛樺叆 store
+ this.$store.dispatch('saveAuth', authData)
+ console.log('褰撳墠 store 涓殑 auth:', this.$store.getters.getAuth)
+ }).catch(err => {
+ console.error("鑾峰彇 auth 澶辫触:", err)
+ })
+ },
+
+ loadEmailCount() {
this.dot.mailHome = true
},
- getTtemDotInfo(item){
- if(item.page==='annotationList' && this.msgCount>0){
- return this.msgCount
+ getTtemDotInfo(item) {
+ if (item.page === 'ToDoList' && this.toDomsgCount > 0) {
+ // return this.toDomsgCount
+ return true
}
- return '';
+ return false;
}
}
}
@@ -169,11 +259,11 @@
<style scoped>
.cu-list.grid>.cu-item {
- padding: 0px 0px;
+ padding: 0px 0px;
}
- .line2-icon {
- width: 60px;
- height: 60px;
- }
-
-</style>
+
+ .line2-icon {
+ width: 60px;
+ height: 60px;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/maintenanceReport/maintenanceReport.vue b/pages/maintenanceReport/maintenanceReport.vue
index dc80751..28d3333 100644
--- a/pages/maintenanceReport/maintenanceReport.vue
+++ b/pages/maintenanceReport/maintenanceReport.vue
@@ -63,7 +63,8 @@
<view class="flex">
<view class="flex-sub text-light bg-white padding-xs margin-xs radius">鎿嶄綔:</view>
- <view class="flex-sub bg-blue padding-xs margin-xs radius text-sm text-center"
+ <view v-if="authIncludes('eam:repair:collect')"
+ class="flex-sub bg-blue padding-xs margin-xs radius text-sm text-center"
@click.stop="handleStartWork(item)" hover-class="is-hover">棰嗗彇</view>
</view>
@@ -116,10 +117,17 @@
announcement1: [],
msg1Count: 0,
msg2Count: 0,
- msg1Title: ""
+ msg1Title: "",
+ equipmentId: ''
}
},
+ mounted() {
+ console.log('浠� store 鑾峰彇鐨� auth:', this.$store.getters.getAuth)
+ },
computed: {
+ authList() {
+ return this.$store.getters.getAuth || []
+ },
top() {
return this.CustomBar * 2 + 50
},
@@ -132,15 +140,26 @@
},
+
+
onShow() {
if (this.mescroll) {
this.mescroll.resetUpScroll()
}
},
-
+ onLoad: function(options) {
+ this.equipmentId = options.equipmentId ?
+ decodeURIComponent(options.equipmentId) :
+ '';
+ },
created() {},
methods: {
-
+ /**
+ * @param {Object} code鎸夐挳鏉冮檺
+ */
+ authIncludes(code) {
+ return this.authList.some(auth => auth.action === code)
+ },
/**
* 棰嗗彇
*/
@@ -204,7 +223,8 @@
pageSize: page.size,
order: 'desc',
column: 'createTime',
- reportStatus: 'WAIT_REPAIR'
+ reportStatus: 'WAIT_REPAIR',
+ equipmentId: this.equipmentId || ''
},
}).then(res => {
diff --git a/pages/reportRepair/reportRepair.vue b/pages/reportRepair/reportRepair.vue
index 4141107..5c506e0 100644
--- a/pages/reportRepair/reportRepair.vue
+++ b/pages/reportRepair/reportRepair.vue
@@ -46,7 +46,7 @@
<view class="padding flex flex-direction">
<view class="flex-sub bg-blue padding-sm margin-xl radius text-sm text-center text-white"
- @click.stop="ProductionTask()" hover-class="is-hover">鎻愪氦</view>
+ @click.stop="ProductionTask()" hover-class="is-hover">鎻愪氦</view>
</view>
@@ -57,6 +57,7 @@
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
export default {
mixins: [MescrollMixin], // 浣跨敤mixin
+
data() {
return {
// 鍥剧墖鍥炴樉
@@ -90,7 +91,7 @@
faultNameList: [],
faultName: '',
faultType: '',
- breakdownFlag: '',
+ breakdownFlag: '1',
loadTime: Date.now(),
faultDescription: ''
},
@@ -126,7 +127,9 @@
announcement1: [],
msg1Count: 0,
msg2Count: 0,
- msg1Title: ""
+ msg1Title: "",
+ equipmentId: '',
+ AuthLsit:[]
}
},
computed: {
@@ -164,7 +167,7 @@
this.getSera()
},
created() {
- // this.getEquipment();
+
this.getfaultReasonList();
},
methods: {
@@ -184,6 +187,7 @@
console.log(this.announcement1);
//璁剧疆鍒楄〃鏁版嵁
if (res.data.success) {
+ this.equipmentId = this.announcement1.id
this.formData.numSear = this.announcement1.equipmentCode + '[' + this.announcement1
.equipmentName +
']'
@@ -315,6 +319,14 @@
});
return false
}
+ if (this.formData.breakdownFlag == 0 || this.formData.breakdownFlag == undefined) {
+ uni.showToast({
+ icon: "none",
+ title: '鏄惁鍋滄満涓虹┖!',
+ duration: 2000
+ });
+ return false
+ }
// 璇锋眰寮�濮� 澧炲姞閬僵灞�
uni.showLoading({
mask: true,
@@ -338,16 +350,23 @@
title: '鎻愪氦鎴愬姛',
duration: 2000
});
- this.$Router.replaceAll({
- name: 'index'
+ console.log(this.equipmentId)
+ uni.reLaunch({
+ url: `/pages/reportRepair/reportRepairList/reportRepairList?equipmentId=${this.equipmentId}`
})
+ } else {
+ uni.showToast({
+ icon: "error",
+ title: res.data.message,
+ duration: 2000
+ });
}
}).catch(() => {
- this.$tip.loaded();
+ uni.hideLoading();
uni.showToast({
icon: "error",
- title: '鎻愪氦澶辫触',
+ title: '缃戠粶杩炴帴澶辫触',
duration: 2000
});
});
diff --git a/pages/reportRepair/reportRepairDeils/reportRepairDeils.vue b/pages/reportRepair/reportRepairDeils/reportRepairDeils.vue
index 7ec29f4..6049190 100644
--- a/pages/reportRepair/reportRepairDeils/reportRepairDeils.vue
+++ b/pages/reportRepair/reportRepairDeils/reportRepairDeils.vue
@@ -13,19 +13,32 @@
<uni-data-select v-model="formData.num" :localdata="equipmentList" @change="changeEquipmentList"
placeholder="璇烽�夋嫨" :disabled="true" />
</uni-forms-item>
-
- <uni-forms-item name="remark" :label-width="80" label="鏁呴殰绠�绉�:">
+ <!-- <uni-forms-item name="equipmentName" :label-width="80" label="璁惧鍚嶇О:">
+ <uni-easyinput v-model="formData.equipmentName" :disabled="true" />
+ </uni-forms-item> -->
+ <uni-forms-item name="reportStatus_dictText" :label-width="80" label="鎶ヤ慨鐘舵��:">
+ <uni-easyinput v-model="formData.reportStatus_dictText" :disabled="true" />
+ </uni-forms-item>
+
+ <uni-forms-item name="faultType" :label-width="80" label="鏁呴殰鍒嗙被:">
+ <uni-easyinput v-model="formData.faultType" :disabled="true" />
+ </uni-forms-item>
+ <uni-forms-item name="faultName" :label-width="80" label="鏁呴殰绠�绉�:">
<uni-easyinput v-model="formData.faultName" :disabled="true" />
</uni-forms-item>
- <uni-forms-item name="remark" :label-width="80" label="鏁呴殰寮�濮嬫椂闂�:">
+ <uni-forms-item name="faultStartTime" :label-width="80" label="鏁呴殰寮�濮嬫椂闂�:">
<uni-easyinput v-model="formData.faultStartTime" :disabled="true" />
</uni-forms-item>
- <uni-forms-item name="outNum" :label-width="80" label="鏄惁鍋滄満:">
+ <uni-forms-item name="breakdownFlag_dictText" :label-width="80" label="鏄惁鍋滄満:">
<uni-easyinput v-model="formData.breakdownFlag_dictText" :disabled="true" />
</uni-forms-item>
- <uni-forms-item name="outNum" :label-width="80" label="鏁呴殰鎻忚堪:">
+ <uni-forms-item name="faultDescription" :label-width="80" label="鏁呴殰鎻忚堪:">
<uni-easyinput v-model="formData.faultDescription" :disabled="true" />
</uni-forms-item>
+ <!-- <uni-forms-item name="installationPosition" :label-width="80" label="瀹夎浣嶇疆:">
+ <uni-easyinput v-model="formData.installationPosition" :disabled="true" />
+ </uni-forms-item> -->
+
<uni-forms-item name="remark" :label-width="80" label="澶囨敞:">
<uni-easyinput v-model="formData.remark" :disabled="true" />
</uni-forms-item>
@@ -34,9 +47,6 @@
<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"
:data-url="imgList[index]">
<image :src="imgList[index]" mode="aspectFill"></image>
- <view class="cu-tag bg-red radius" @tap.stop="DelImg" :data-index="index">
- <text class='cuIcon-close'></text>
- </view>
</view>
<view class="solids" v-if="imgList.length<1">
<text class='cuIcon-cameraadd'></text>
@@ -74,7 +84,7 @@
NavBarColor: this.NavBarColor,
url: {
stallList: "/eam/eamReportRepair/queryById",
- getEquipmentList:'eam/equipment/list'
+ getEquipmentList: 'eam/equipment/list'
// getEquipmentList: "eam/equipment/asyncLoadEquipment"
},
id: '',
@@ -131,7 +141,7 @@
order: 'desc',
column: 'createTime'
},
-
+
}).then(res => {
//璁剧疆鍒楄〃鏁版嵁
if (res.data.success) {
@@ -232,8 +242,12 @@
this.formData.faultDescription = this.announcement1.faultDescription
this.formData.faultName = this.announcement1.faultName
this.formData.remark = this.announcement1.remark
+ // this.formData.equipmentName=this.announcement1.equipmentName
this.formData.faultStartTime = this.announcement1.faultStartTime
this.formData.breakdownFlag_dictText = this.announcement1.breakdownFlag_dictText
+ this.formData.reportStatus_dictText=this.announcement1.reportStatus_dictText
+ // this.formData.installationPosition=this.announcement1.installationPosition
+ this.formData.faultType=this.announcement1.faultType
this.formData.avatar = this.announcement1.imageFiles
const imageObjects = JSON.parse(this.formData.avatar);
// 鎻愬彇 filePath 骞舵嫾鎺� IP 鍜岀鍙�
diff --git a/pages/reportRepair/reportRepairList/reportRepairList.vue b/pages/reportRepair/reportRepairList/reportRepairList.vue
index ac4c155..090d5c3 100644
--- a/pages/reportRepair/reportRepairList/reportRepairList.vue
+++ b/pages/reportRepair/reportRepairList/reportRepairList.vue
@@ -3,6 +3,11 @@
<cu-custom :bgColor="NavBarColor" :isBack="true" backRouterName="productionTask">
<block slot="backText">杩斿洖</block>
<block slot="content">鎶ヤ慨</block>
+ <block slot="right">
+ <view @click="search">
+ <image class="search" src="/static/icon/sear.png" style="width: 25px; height: 25px;" alt="" />
+ </view>
+ </block>
</cu-custom>
<view style="width: 100%;">
@@ -11,8 +16,9 @@
<!-- 鍩虹琛ㄥ崟鏍￠獙 -->
<uni-forms ref="form" :modelValue="formData" validate-trigger="bind" err-show-type="undertext">
<uni-group title="" top="0">
- <uni-forms-item name="numbers" label="棰嗘枡鐢宠鍗曞彿:">
- <uni-easyinput type="text" v-model="formData.num" placeholder="璇疯緭鍏ラ鏂欑敵璇峰崟鍙锋绱�" />
+ <uni-forms-item name="numbers" label="鎶ヤ慨鐘舵��:">
+ <uni-data-select v-model="formData.reportStatus" :localdata="reportStatusList"
+ @change="changetypeList" placeholder="璇烽�夋嫨鎶ヤ慨鐘舵��" />
</uni-forms-item>
<uni-forms-item name="name" label="棰嗘枡浜у搧:">
<uni-easyinput v-model="formData.partNumNameModel" placeholder="璇疯緭鍏ラ鏂欎骇鍝�" />
@@ -33,10 +39,10 @@
</view>
</uni-popup>
</view>
- <view class="flex">
+ <view class="flex" v-if="authIncludes('eam:reportRepair:add')">
<view
- class="cuIcon-add flex-sub bg-blue padding-sm margin-xs margin-left-lg margin-right-lg text-sm text-center"
+ class="cuIcon-add radius flex-sub bg-blue padding-sm margin-xs margin-left-lg margin-right-lg text-sm text-center"
@click="getAdd()">鏂板
</view>
</view>
@@ -49,7 +55,13 @@
<view class="flex">
<view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧缂栧彿:</view>
<view class="flex-sub bg-white padding-xs margin-xs text-bold radius text-right">
- {{item.equipmentId_dictText}}
+ {{item.equipmentCode}}
+ </view>
+ </view>
+ <view class="flex">
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧鍚嶇О:</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-bold radius text-right">
+ {{item.equipmentName}}
</view>
</view>
<view class="flex">
@@ -70,7 +82,12 @@
{{item.breakdownFlag_dictText}}
</view>
</view>
-
+ <view class="flex">
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">瀹夎浣嶇疆:</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-blue radius text-right">
+ {{item.installationPosition}}
+ </view>
+ </view>
<!-- <view class="flex">
<view class="flex-sub text-light bg-white padding-xs margin-xs radius">鎿嶄綔:</view>
<view class="flex-sub bg-blue padding-xs margin-xs radius text-sm text-center"
@@ -91,16 +108,19 @@
mixins: [MescrollMixin], // 浣跨敤mixin
data() {
return {
+
type: 'top',
scrollLeft: 0,
formData: {
- num: '',
- partNumNameModel: ''
+ reportStatus: ''
+
},
+ reportStatusList: [],
NavBarColor: this.NavBarColor,
activeColor: '#5277A6',
url: {
- stallList: "/eam/eamReportRepair/list"
+ stallList: "/eam/eamReportRepair/list",
+ flowType: "/sys/dict/getDictItems/report_repair_status",
},
upOption: {
@@ -125,10 +145,17 @@
announcement1: [],
msg1Count: 0,
msg2Count: 0,
- msg1Title: ""
+ msg1Title: "",
+ equipmentId: ''
}
},
+ mounted() {
+ console.log('浠� store 鑾峰彇鐨� auth:', this.$store.getters.getAuth)
+ },
computed: {
+ authList() {
+ return this.$store.getters.getAuth || []
+ },
top() {
return this.CustomBar * 2 + 100
},
@@ -147,8 +174,48 @@
}
},
- created() {},
+ onLoad: function(option) {
+ console.log(option)
+ let queryData = {};
+ try {
+ queryData = JSON.parse(option.query);
+ } catch (e) {
+ console.error('瑙ｆ瀽 query 澶辫触', e);
+ }
+
+ const equipmentId = queryData.equipmentId;
+
+ console.log('璁惧ID:', equipmentId);
+
+ // 浣犲彲浠ュ湪杩欓噷缁х画浣跨敤 equipmentId 璇锋眰鏁版嵁鎴栬祴鍊肩粰 data
+ this.equipmentId = equipmentId;
+ },
+ created() {
+ this.getTypeList()
+ },
methods: {
+ authIncludes(code) {
+ return this.authList.some(auth => auth.action === code)
+ },
+
+ /**
+ * 鎶ヤ慨鐘舵�佸垪琛ㄤ簨浠�
+ */
+ getTypeList() {
+ this.$http.get(this.url.flowType).then(res => {
+ //璁剧疆鍒楄〃鏁版嵁
+ if (res.data.success) {
+ console.log(res)
+ this.reportStatusList = res.data.result
+ }
+ }).catch(() => {
+ //鑱旂綉澶辫触, 缁撴潫鍔犺浇
+ })
+
+ },
+ changetypeList(e) {
+ this.formData.reportStatus = e;
+ },
getAdd() {
uni.redirectTo({
url: '/pages/reportRepair/reportRepair'
@@ -178,8 +245,8 @@
pageNo: page.num,
pageSize: page.size,
order: 'asc',
- column: 'createTime'
-
+ column: 'createTime',
+ equipmentId: this.equipmentId
},
}).then(res => {
@@ -200,9 +267,13 @@
this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
}
- }).catch(() => {
+ }).catch((err) => {
//鑱旂綉澶辫触, 缁撴潫鍔犺浇
this.mescroll.endErr();
+ uni.showToast({
+ title: '缃戠粶寮傚父锛岃绋嶅悗鍐嶈瘯',
+ icon: 'none'
+ });
})
},
@@ -218,125 +289,43 @@
/* 妫�绱� */
getSera() {
this.$refs.popup.close();
- let keyword = this.TabCur
this.msgList = [];
+ this.$http.get(this.url.stallList, {
+ params: {
+ pageNo: 1,
+ pageSize: 9999,
+ order: "desc",
+ column: "createTime",
+ reportStatus: this.formData.reportStatus
+ }
+ }).then(res => {
+ //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
- if (keyword == 0) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*',
- status: 'published'
+ this.announcement1 = res.data.result.records
+ this.mescroll.endSuccess(this.announcement1.length);
+ console.log("url", res)
+ //璁剧疆鍒楄〃鏁版嵁
+ if (res.data.success) {
+ console.log("res", res.data)
+ this.msg1Count = res.data.result.total
+ this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
+ for (let annItem of this.announcement1) {
+ this.msgList.push(annItem)
}
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
+ }
+ if (page.num == 1) {
+ this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
+ this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
+ }
- this.announcement1 = res.data.result.records
- this.mescroll.endSuccess(this.announcement1.length);
- console.log("url", res)
- //璁剧疆鍒楄〃鏁版嵁
- if (res.data.success) {
- console.log("res", res.data)
- this.msg1Count = res.data.result.total
- this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
- for (let annItem of this.announcement1) {
- this.msgList.push(annItem)
- }
- }
- if (page.num == 1) {
- this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- }
-
- }).catch(() => {
- //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- this.mescroll.endErr();
- })
-
- } else if (keyword == 1) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- status: 'training',
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*'
-
- }
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
-
- this.announcement1 = res.data.result.records
- this.mescroll.endSuccess(this.announcement1.length);
- console.log("url", res)
- //璁剧疆鍒楄〃鏁版嵁
- if (res.data.success) {
- console.log("res", res.data)
- this.msg1Count = res.data.result.total
- this.msg2Title = "閫氱煡(" + res.data.result.total + ")";
- for (let annItem of this.announcement1) {
- this.msgList.push(annItem)
- }
- }
- if (page.num == 1) {
- this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- }
-
- }).catch(() => {
- //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- this.mescroll.endErr();
- })
-
- } else if (keyword == 2) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- status: 'completed',
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*'
-
- }
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
-
- this.announcement1 = res.data.result.records
- this.mescroll.endSuccess(this.announcement1.length);
- console.log("url", res)
- //璁剧疆鍒楄〃鏁版嵁
- if (res.data.success) {
- console.log("res", res.data)
- this.msg3Count = res.data.result.total
- this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
- for (let annItem of this.announcement1) {
- this.msgList.push(annItem)
- }
- }
- if (page.num == 1) {
- this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- }
-
- }).catch(() => {
- //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- this.mescroll.endErr();
- })
-
- }
-
-
-
-
-
+ }).catch((err) => {
+ //鑱旂綉澶辫触, 缁撴潫鍔犺浇
+ this.mescroll.endErr();
+ uni.showToast({
+ title: '缃戠粶寮傚父锛岃绋嶅悗鍐嶈瘯',
+ icon: 'none'
+ });
+ })
},
@@ -367,7 +356,7 @@
}
.popupView {
- margin-top: 85px;
+ margin-top: 50px;
height: auto;
}
</style>
\ No newline at end of file
diff --git a/static/icon_del.png b/static/icon_del.png
new file mode 100644
index 0000000..aa89d11
--- /dev/null
+++ b/static/icon_del.png
Binary files differ
diff --git a/static/icon_down.png b/static/icon_down.png
new file mode 100644
index 0000000..e6b8a2b
--- /dev/null
+++ b/static/icon_down.png
Binary files differ
diff --git a/static/icon_file.png b/static/icon_file.png
new file mode 100644
index 0000000..19b9f0c
--- /dev/null
+++ b/static/icon_file.png
Binary files differ
diff --git a/store/index.js b/store/index.js
index 4d6b657..f17bbd6 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,125 +1,173 @@
import Vue from 'vue'
import Vuex from 'vuex'
import api from "@/api/api"
-import MinCache from'@/common/util/MinCache.js'
-import { ACCESS_TOKEN,USER_NAME,USER_INFO,X_TENANT_ID } from "@/common/util/constants"
+import MinCache from '@/common/util/MinCache.js'
+import {
+ ACCESS_TOKEN,
+ USER_NAME,
+ USER_INFO,
+ X_TENANT_ID
+} from "@/common/util/constants"
Vue.use(Vuex)
export default new Vuex.Store({
- state: {
- token: '',
- userid:'',
- username: '',
- realname: '',
- welcome: '',
- avatar: ''
- },
- mutations: {
- SET_TOKEN: (state, token) => {
- state.token = token
- },
- SET_NAME: (state, { username, realname, welcome }) => {
- state.username = username
- state.realname = realname
- state.welcome = welcome
- },
- SET_AVATAR: (state, avatar) => {
- state.avatar = avatar
- }
- },
- actions: {
- // 鐧诲綍
- mLogin({ commit }, userInfo) {
- return new Promise((resolve, reject) => {
- api.login(userInfo).then(response => {
- if(response.data.code ==200){
- const result = response.data.result
- const userInfo = result.userInfo
- uni.setStorageSync(ACCESS_TOKEN,result.token);
- uni.setStorageSync("isLogin",true);
- uni.setStorageSync("userId", userInfo.id);
- uni.setStorageSync(USER_INFO,userInfo);
- commit('SET_TOKEN', result.token)
- commit('SET_AVATAR', userInfo.avatar)
- commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname})
- resolve(response)
- }else{
- resolve(response)
- }
- }).catch(error => {
- console.log("catch===>response",response)
- reject(error)
- })
- })
- },
- //鎵嬫満鍙风櫥褰�
- PhoneLogin({ commit }, userInfo) {
- return new Promise((resolve, reject) => {
- api.phoneNoLogin(userInfo).then(response => {
- if(response.data.code ==200){
- const result = response.data.result
- const userInfo = result.userInfo
- uni.setStorageSync(ACCESS_TOKEN,result.token);
- uni.setStorageSync(USER_INFO,userInfo);
- commit('SET_TOKEN', result.token)
- commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname})
- commit('SET_AVATAR', userInfo.avatar)
- resolve(response)
- }else{
- reject(response)
- }
- }).catch(error => {
- reject(error)
- })
- })
- },
- // 绗笁鏂圭櫥褰�
- ThirdLogin({ commit }, param) {
- return new Promise((resolve, reject) => {
- api.thirdLogin(param.token,param.thirdType,param.tenantId).then(response => {
- if(response.data.code =='200'){
- const result = response.data.result
- const userInfo = result.userInfo
- uni.setStorageSync(ACCESS_TOKEN,result.token);
- uni.setStorageSync(USER_INFO,userInfo);
- uni.setStorageSync(X_TENANT_ID,userInfo.loginTenantId);
+ state: {
+ auth: [],
+ token: '',
+ userid: '',
+ username: '',
+ realname: '',
+ welcome: '',
+ avatar: ''
+ },
+ mutations: {
+ SET_AUTH(state, auth) {
+ state.auth = auth
+ },
+ SET_TOKEN: (state, token) => {
+ state.token = token
+ },
+ SET_NAME: (state, {
+ username,
+ realname,
+ welcome
+ }) => {
+ state.username = username
+ state.realname = realname
+ state.welcome = welcome
+ },
+ SET_AVATAR: (state, avatar) => {
+ state.avatar = avatar
+ }
+ },
+ actions: {
+ // 鐧诲綍
+ mLogin({
+ commit
+ }, userInfo) {
+ return new Promise((resolve, reject) => {
+ api.login(userInfo).then(response => {
+ if (response.data.code == 200) {
+ const result = response.data.result
+ const userInfo = result.userInfo
+ uni.setStorageSync(ACCESS_TOKEN, result.token);
+ uni.setStorageSync("isLogin", true);
+ uni.setStorageSync("userId", userInfo.id);
+ uni.setStorageSync(USER_INFO, userInfo);
+ commit('SET_TOKEN', result.token)
+ commit('SET_AVATAR', userInfo.avatar)
+ commit('SET_NAME', {
+ username: userInfo.username,
+ realname: userInfo.realname
+ })
+ resolve(response)
+ } else {
+ resolve(response)
+ }
+ }).catch(error => {
+ console.log("catch===>response", response)
+ reject(error)
+ })
+ })
+ },
+ //鎵嬫満鍙风櫥褰�
+ PhoneLogin({
+ commit
+ }, userInfo) {
+ return new Promise((resolve, reject) => {
+ api.phoneNoLogin(userInfo).then(response => {
+ if (response.data.code == 200) {
+ const result = response.data.result
+ const userInfo = result.userInfo
+ uni.setStorageSync(ACCESS_TOKEN, result.token);
+ uni.setStorageSync(USER_INFO, userInfo);
+ commit('SET_TOKEN', result.token)
+ commit('SET_NAME', {
+ username: userInfo.username,
+ realname: userInfo.realname
+ })
+ commit('SET_AVATAR', userInfo.avatar)
+ resolve(response)
+ } else {
+ reject(response)
+ }
+ }).catch(error => {
+ reject(error)
+ })
+ })
+ },
+ // 绗笁鏂圭櫥褰�
+ ThirdLogin({
+ commit
+ }, param) {
+ return new Promise((resolve, reject) => {
+ api.thirdLogin(param.token, param.thirdType, param.tenantId).then(response => {
+ if (response.data.code == '200') {
+ const result = response.data.result
+ const userInfo = result.userInfo
+ uni.setStorageSync(ACCESS_TOKEN, result.token);
+ uni.setStorageSync(USER_INFO, userInfo);
+ uni.setStorageSync(X_TENANT_ID, userInfo.loginTenantId);
- commit('SET_TOKEN', result.token)
- commit('SET_AVATAR', userInfo.avatar)
- commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname })
- commit('SET_ID', userInfo.id)
- commit('SET_INFO', userInfo)
- commit('SET_TENANTID', userInfo.loginTenantId)
- resolve(response)
- }else{
- reject(response)
- }
- }).catch(error => {
- reject(error)
- })
- })
- },
- // 鐧诲嚭
- Logout({ commit, state }) {
- return new Promise((resolve) => {
- let logoutToken = state.token;
- commit('SET_TOKEN', '')
- uni.removeStorageSync(ACCESS_TOKEN)
- api.logout(logoutToken).then(() => {
- resolve()
- }).catch(() => {
- resolve()
- })
- })
- },
-
- },
- getters:{
- token: state => state.token,
- username: state => {state.userid=uni.getStorageSync(USER_INFO).username; return state.username},
- nickname: state => {state.userid=uni.getStorageSync(USER_INFO).realname; return state.user.realname},
- avatar: state => {state.userid=uni.getStorageSync(USER_INFO).avatar; return state.user.avatar},
- userid:state => {state.userid=uni.getStorageSync(USER_INFO).id; return state.userid},
- }
-})
+ commit('SET_TOKEN', result.token)
+ commit('SET_AVATAR', userInfo.avatar)
+ commit('SET_NAME', {
+ username: userInfo.username,
+ realname: userInfo.realname
+ })
+ commit('SET_ID', userInfo.id)
+ commit('SET_INFO', userInfo)
+ commit('SET_TENANTID', userInfo.loginTenantId)
+ resolve(response)
+ } else {
+ reject(response)
+ }
+ }).catch(error => {
+ reject(error)
+ })
+ })
+ },
+ // 鐧诲嚭
+ Logout({
+ commit,
+ state
+ }) {
+ return new Promise((resolve) => {
+ let logoutToken = state.token;
+ commit('SET_TOKEN', '')
+ uni.removeStorageSync(ACCESS_TOKEN)
+ api.logout(logoutToken).then(() => {
+ resolve()
+ }).catch(() => {
+ resolve()
+ })
+ })
+ },
+ saveAuth({
+ commit
+ }, auth) {
+ commit('SET_AUTH', auth)
+ }
+ },
+ getters: {
+ getAuth: state => state.auth,
+ token: state => state.token,
+ username: state => {
+ state.userid = uni.getStorageSync(USER_INFO).username;
+ return state.username
+ },
+ nickname: state => {
+ state.userid = uni.getStorageSync(USER_INFO).realname;
+ return state.user.realname
+ },
+ avatar: state => {
+ state.userid = uni.getStorageSync(USER_INFO).avatar;
+ return state.user.avatar
+ },
+ userid: state => {
+ state.userid = uni.getStorageSync(USER_INFO).id;
+ return state.userid
+ },
+ }
+})
\ No newline at end of file
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index 686c1d0..a3cde5a 100644
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -481,7 +481,7 @@
}
.uni-select__selector__disabled {
- opacity: 0.4;
+ opacity: 0.2;
cursor: default;
}
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
index 93506d6..5ed6295 100644
--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -666,7 +666,7 @@
.is-disabled {
background-color: #f7f6f6;
- color: #d5d5d5;
+ color: #878787;
.uni-easyinput__placeholder-class {
color: #d5d5d5;
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
index 785c7eb..7b45a83 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -16,7 +16,7 @@
</upload-image>
<upload-file v-if="fileMediatype !== 'image' || showType !== 'grid'" :readonly="readonly"
:list-styles="listStyles" :files-list="filesList" :showType="showType" :delIcon="delIcon"
- @uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
+ @uploadFiles="uploadFiles" @choose="choose" @delFile="delFile" @downloadFile="downloadFile">
<slot><button type="primary" size="mini">閫夋嫨鏂囦欢</button></slot>
</upload-file>
</view>
@@ -87,7 +87,7 @@
options: {
virtualHost: true
},
- emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'],
+ emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input', 'downloadFile'],
props: {
modelValue: {
type: [Array, Object],
@@ -183,7 +183,7 @@
sourceType: {
type: Array,
default () {
- return ['album', 'camera']
+ return ['album', 'camera']
}
},
provider: {
@@ -254,366 +254,417 @@
}
},
methods: {
- /**
- * 鍏紑鐢ㄦ埛浣跨敤锛屾竻绌烘枃浠�
- * @param {Object} index
- */
- clearFiles(index) {
- if (index !== 0 && !index) {
- this.files = []
- this.$nextTick(() => {
- this.setEmit()
- })
- } else {
- this.files.splice(index, 1)
- }
- this.$nextTick(() => {
- this.setEmit()
- })
- },
- /**
- * 鍏紑鐢ㄦ埛浣跨敤锛岀户缁笂浼�
- */
- upload() {
- let files = []
- this.files.forEach((v, index) => {
- if (v.status === 'ready' || v.status === 'error') {
- files.push(Object.assign({}, v))
- }
- })
- return this.uploadFiles(files)
- },
- async setValue(newVal, oldVal) {
- const newData = async (v) => {
- const reg = /cloud:\/\/([\w.]+\/?)\S*/
- let url = ''
- if(v.fileID){
- url = v.fileID
- }else{
- url = v.url
- }
- if (reg.test(url)) {
- v.fileID = url
- v.url = await this.getTempFileURL(url)
- }
- if(v.url) v.path = v.url
- return v
- }
- if (this.returnType === 'object') {
- if (newVal) {
- await newData(newVal)
- } else {
- newVal = {}
- }
- } else {
- if (!newVal) newVal = []
- for(let i =0 ;i < newVal.length ;i++){
- let v = newVal[i]
- await newData(v)
- }
- }
- this.localValue = newVal
- if (this.form && this.formItem &&!this.is_reset) {
- this.is_reset = false
- this.formItem.setValue(this.localValue)
- }
- let filesData = Object.keys(newVal).length > 0 ? newVal : [];
- this.files = [].concat(filesData)
- },
- /**
- * 閫夋嫨鏂囦欢
- */
- choose() {
- if (this.disabled) return
- if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType ===
- 'array') {
+ downloadFile(item) {
+ console.log('鍑嗗涓嬭浇:', item);
+
+ if (!item.url) {
uni.showToast({
- title: `鎮ㄦ渶澶氶�夋嫨 ${this.limitLength} 涓枃浠禶,
+ title: '鏂囦欢涓嶅彲涓嬭浇',
icon: 'none'
- })
- return
+ });
+ return;
}
- this.chooseFiles()
- },
- /**
- * 閫夋嫨鏂囦欢骞朵笂浼�
- */
- chooseFiles() {
- const _extname = get_extname(this.fileExtname)
- // 鑾峰彇鍚庣紑
- uniCloud
- .chooseAndUploadFile({
- type: this.fileMediatype,
- compressed: false,
- sizeType: this.sizeType,
- sourceType: this.sourceType,
- // TODO 濡傛灉涓虹┖锛寁ideo 鏈夐棶棰�
- extension: _extname.length > 0 ? _extname : undefined,
- count: this.limitLength - this.files.length, //榛樿9
- onChooseFile: this.chooseFileCallback,
- onUploadProgress: progressEvent => {
- this.setProgress(progressEvent, progressEvent.index)
+ // #ifdef H5
+ const a = document.createElement('a');
+ a.href = item.url;
+ a.download = item.name || 'file';
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
+ // #endif
+
+ // #ifndef H5
+ uni.downloadFile({
+ url: item.url,
+ success: (res) => {
+ if (res.statusCode === 200) {
+ uni.openDocument({
+ filePath: res.tempFilePath,
+ success: () => {
+ console.log('鎵撳紑鏂囨。鎴愬姛');
+ },
+ fail: () => {
+ uni.showToast({
+ title: '鏃犳硶鎵撳紑姝ゆ枃妗ｇ被鍨�',
+ icon: 'none'
+ });
+ }
+ });
}
- })
- .then(result => {
- this.setSuccessAndError(result.tempFiles)
- })
- .catch(err => {
- console.log('閫夋嫨澶辫触', err)
- })
- },
-
- /**
- * 閫夋嫨鏂囦欢鍥炶皟
- * @param {Object} res
- */
- async chooseFileCallback(res) {
- const _extname = get_extname(this.fileExtname)
- const is_one = (Number(this.limitLength) === 1 &&
- this.disablePreview &&
- !this.disabled) ||
- this.returnType === 'object'
- // 濡傛灉杩欐湁涓�涓枃浠� 锛岄渶瑕佹竻绌烘湰鍦扮紦瀛樻暟鎹�
- if (is_one) {
- this.files = []
- }
-
- let {
- filePaths,
- files
- } = get_files_and_is_max(res, _extname)
- if (!(_extname && _extname.length > 0)) {
- filePaths = res.tempFilePaths
- files = res.tempFiles
- }
-
- let currentData = []
- for (let i = 0; i < files.length; i++) {
- if (this.limitLength - this.files.length <= 0) break
- files[i].uuid = Date.now()
- let filedata = await get_file_data(files[i], this.fileMediatype)
- filedata.progress = 0
- filedata.status = 'ready'
- this.files.push(filedata)
- currentData.push({
- ...filedata,
- file: files[i]
- })
- }
- this.$emit('select', {
- tempFiles: currentData,
- tempFilePaths: filePaths
- })
- res.tempFiles = files
- // 鍋滄鑷姩涓婁紶
- if (!this.autoUpload || this.noSpace) {
- res.tempFiles = []
- }
- res.tempFiles.forEach((fileItem, index) => {
- this.provider && (fileItem.provider = this.provider);
- const fileNameSplit = fileItem.name.split('.')
- const ext = fileNameSplit.pop()
- const fileName = fileNameSplit.join('.').replace(/[\s\/\?<>\\:\*\|":]/g, '_')
- fileItem.cloudPath = fileName + '_' + Date.now() + '_' + index + '.' + ext
- })
- },
-
- /**
- * 鎵逛紶
- * @param {Object} e
- */
- uploadFiles(files) {
- files = [].concat(files)
- return uploadCloudFiles.call(this, files, 5, res => {
- this.setProgress(res, res.index, true)
- })
- .then(result => {
- this.setSuccessAndError(result)
- return result;
- })
- .catch(err => {
- console.log(err)
- })
- },
-
- /**
- * 鎴愬姛鎴栧け璐�
- */
- async setSuccessAndError(res, fn) {
- let successData = []
- let errorData = []
- let tempFilePath = []
- let errorTempFilePath = []
- for (let i = 0; i < res.length; i++) {
- const item = res[i]
- const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
-
- if (index === -1 || !this.files) break
- if (item.errMsg === 'request:fail') {
- this.files[index].url = item.path
- this.files[index].status = 'error'
- this.files[index].errMsg = item.errMsg
- // this.files[index].progress = -1
- errorData.push(this.files[index])
- errorTempFilePath.push(this.files[index].url)
- } else {
- this.files[index].errMsg = ''
- this.files[index].fileID = item.url
- const reg = /cloud:\/\/([\w.]+\/?)\S*/
- if (reg.test(item.url)) {
- this.files[index].url = await this.getTempFileURL(item.url)
- }else{
- this.files[index].url = item.url
- }
-
- this.files[index].status = 'success'
- this.files[index].progress += 1
- successData.push(this.files[index])
- tempFilePath.push(this.files[index].fileID)
+ },
+ fail: () => {
+ uni.showToast({
+ title: '涓嬭浇澶辫触',
+ icon: 'none'
+ });
}
- }
-
- if (successData.length > 0) {
- this.setEmit()
- // 鐘舵�佹敼鍙樿繑鍥�
- this.$emit('success', {
- tempFiles: this.backObject(successData),
- tempFilePaths: tempFilePath
- })
- }
-
- if (errorData.length > 0) {
- this.$emit('fail', {
- tempFiles: this.backObject(errorData),
- tempFilePaths: errorTempFilePath
- })
- }
+ });
+ // #endif
},
+
- /**
- * 鑾峰彇杩涘害
- * @param {Object} progressEvent
- * @param {Object} index
- * @param {Object} type
- */
- setProgress(progressEvent, index, type) {
- const fileLenth = this.files.length
- const percentNum = (index / fileLenth) * 100
- const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
- let idx = index
- if (!type) {
- idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
- }
- if (idx === -1 || !this.files[idx]) return
- // fix by mehaotian 100 灏变細娑堝け锛�-1 鏄负浜嗚杩涘害鏉℃秷澶�
- this.files[idx].progress = percentCompleted - 1
- // 涓婁紶涓�
- this.$emit('progress', {
- index: idx,
- progress: parseInt(percentCompleted),
- tempFile: this.files[idx]
- })
- },
-
- /**
- * 鍒犻櫎鏂囦欢
- * @param {Object} index
- */
- delFile(index) {
- this.$emit('delete', {
- index,
- tempFile: this.files[index],
- tempFilePath: this.files[index].url
- })
- this.files.splice(index, 1)
+ /**
+ * 鍏紑鐢ㄦ埛浣跨敤锛屾竻绌烘枃浠�
+ * @param {Object} index
+ */
+ clearFiles(index) {
+ if (index !== 0 && !index) {
+ this.files = []
this.$nextTick(() => {
this.setEmit()
})
- },
-
- /**
- * 鑾峰彇鏂囦欢鍚嶅拰鍚庣紑
- * @param {Object} name
- */
- getFileExt(name) {
- const last_len = name.lastIndexOf('.')
- const len = name.length
- return {
- name: name.substring(0, last_len),
- ext: name.substring(last_len + 1, len)
- }
- },
-
- /**
- * 澶勭悊杩斿洖浜嬩欢
- */
- setEmit() {
- let data = []
- if (this.returnType === 'object') {
- data = this.backObject(this.files)[0]
- this.localValue = data?data:null
- } else {
- data = this.backObject(this.files)
- if (!this.localValue) {
- this.localValue = []
- }
- this.localValue = [...data]
- }
- // #ifdef VUE3
- this.$emit('update:modelValue', this.localValue)
- // #endif
- // #ifndef VUE3
- this.$emit('input', this.localValue)
- // #endif
- },
-
- /**
- * 澶勭悊杩斿洖鍙傛暟
- * @param {Object} files
- */
- backObject(files) {
- let newFilesData = []
- files.forEach(v => {
- newFilesData.push({
- extname: v.extname,
- fileType: v.fileType,
- image: v.image,
- name: v.name,
- path: v.path,
- size: v.size,
- fileID:v.fileID,
- url: v.url,
- // 淇敼鍒犻櫎涓�涓枃浠跺悗涓嶈兘鍐嶄笂浼犵殑bug, #694
- uuid: v.uuid,
- status: v.status,
- cloudPath: v.cloudPath
- })
- })
- return newFilesData
- },
- async getTempFileURL(fileList) {
- fileList = {
- fileList: [].concat(fileList)
- }
- const urls = await uniCloud.getTempFileURL(fileList)
- return urls.fileList[0].tempFileURL || ''
- },
- /**
- * 鑾峰彇鐖跺厓绱犲疄渚�
- */
- getForm(name = 'uniForms') {
- let parent = this.$parent;
- let parentName = parent.$options.name;
- while (parentName !== name) {
- parent = parent.$parent;
- if (!parent) return false;
- parentName = parent.$options.name;
- }
- return parent;
+ } else {
+ this.files.splice(index, 1)
}
+ this.$nextTick(() => {
+ this.setEmit()
+ })
+ },
+ /**
+ * 鍏紑鐢ㄦ埛浣跨敤锛岀户缁笂浼�
+ */
+ upload() {
+ let files = []
+ this.files.forEach((v, index) => {
+ if (v.status === 'ready' || v.status === 'error') {
+ files.push(Object.assign({}, v))
+ }
+ })
+ return this.uploadFiles(files)
+ },
+ async setValue(newVal, oldVal) {
+ const newData = async (v) => {
+ const reg = /cloud:\/\/([\w.]+\/?)\S*/
+ let url = ''
+ if (v.fileID) {
+ url = v.fileID
+ } else {
+ url = v.url
+ }
+ if (reg.test(url)) {
+ v.fileID = url
+ v.url = await this.getTempFileURL(url)
+ }
+ if (v.url) v.path = v.url
+ return v
+ }
+ if (this.returnType === 'object') {
+ if (newVal) {
+ await newData(newVal)
+ } else {
+ newVal = {}
+ }
+ } else {
+ if (!newVal) newVal = []
+ for (let i = 0; i < newVal.length; i++) {
+ let v = newVal[i]
+ await newData(v)
+ }
+ }
+ this.localValue = newVal
+ if (this.form && this.formItem && !this.is_reset) {
+ this.is_reset = false
+ this.formItem.setValue(this.localValue)
+ }
+ let filesData = Object.keys(newVal).length > 0 ? newVal : [];
+ this.files = [].concat(filesData)
+ },
+
+ /**
+ * 閫夋嫨鏂囦欢
+ */
+ choose() {
+ if (this.disabled) return
+ if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType ===
+ 'array') {
+ uni.showToast({
+ title: `鎮ㄦ渶澶氶�夋嫨 ${this.limitLength} 涓枃浠禶,
+ icon: 'none'
+ })
+ return
+ }
+ this.chooseFiles()
+ },
+
+ /**
+ * 閫夋嫨鏂囦欢骞朵笂浼�
+ */
+ chooseFiles() {
+ const _extname = get_extname(this.fileExtname)
+ // 鑾峰彇鍚庣紑
+ uniCloud
+ .chooseAndUploadFile({
+ type: this.fileMediatype,
+ compressed: false,
+ sizeType: this.sizeType,
+ sourceType: this.sourceType,
+ // TODO 濡傛灉涓虹┖锛寁ideo 鏈夐棶棰�
+ extension: _extname.length > 0 ? _extname : undefined,
+ count: this.limitLength - this.files.length, //榛樿9
+ onChooseFile: this.chooseFileCallback,
+ onUploadProgress: progressEvent => {
+ this.setProgress(progressEvent, progressEvent.index)
+ }
+ })
+ .then(result => {
+ this.setSuccessAndError(result.tempFiles)
+ })
+ .catch(err => {
+ console.log('閫夋嫨澶辫触', err)
+ })
+ },
+
+ /**
+ * 閫夋嫨鏂囦欢鍥炶皟
+ * @param {Object} res
+ */
+ async chooseFileCallback(res) {
+ const _extname = get_extname(this.fileExtname)
+ const is_one = (Number(this.limitLength) === 1 &&
+ this.disablePreview &&
+ !this.disabled) ||
+ this.returnType === 'object'
+ // 濡傛灉杩欐湁涓�涓枃浠� 锛岄渶瑕佹竻绌烘湰鍦扮紦瀛樻暟鎹�
+ if (is_one) {
+ this.files = []
+ }
+
+ let {
+ filePaths,
+ files
+ } = get_files_and_is_max(res, _extname)
+ if (!(_extname && _extname.length > 0)) {
+ filePaths = res.tempFilePaths
+ files = res.tempFiles
+ }
+
+ let currentData = []
+ for (let i = 0; i < files.length; i++) {
+ if (this.limitLength - this.files.length <= 0) break
+ files[i].uuid = Date.now()
+ let filedata = await get_file_data(files[i], this.fileMediatype)
+ filedata.progress = 0
+ filedata.status = 'ready'
+ this.files.push(filedata)
+ currentData.push({
+ ...filedata,
+ file: files[i]
+ })
+ }
+ this.$emit('select', {
+ tempFiles: currentData,
+ tempFilePaths: filePaths
+ })
+ res.tempFiles = files
+ // 鍋滄鑷姩涓婁紶
+ if (!this.autoUpload || this.noSpace) {
+ res.tempFiles = []
+ }
+ res.tempFiles.forEach((fileItem, index) => {
+ this.provider && (fileItem.provider = this.provider);
+ const fileNameSplit = fileItem.name.split('.')
+ const ext = fileNameSplit.pop()
+ const fileName = fileNameSplit.join('.').replace(/[\s\/\?<>\\:\*\|":]/g, '_')
+ fileItem.cloudPath = fileName + '_' + Date.now() + '_' + index + '.' + ext
+ })
+ },
+
+ /**
+ * 鎵逛紶
+ * @param {Object} e
+ */
+ uploadFiles(files) {
+ files = [].concat(files)
+ return uploadCloudFiles.call(this, files, 5, res => {
+ this.setProgress(res, res.index, true)
+ })
+ .then(result => {
+ this.setSuccessAndError(result)
+ return result;
+ })
+ .catch(err => {
+ console.log(err)
+ })
+ },
+
+ /**
+ * 鎴愬姛鎴栧け璐�
+ */
+ async setSuccessAndError(res, fn) {
+ let successData = []
+ let errorData = []
+ let tempFilePath = []
+ let errorTempFilePath = []
+ for (let i = 0; i < res.length; i++) {
+ const item = res[i]
+ const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
+
+ if (index === -1 || !this.files) break
+ if (item.errMsg === 'request:fail') {
+ this.files[index].url = item.path
+ this.files[index].status = 'error'
+ this.files[index].errMsg = item.errMsg
+ // this.files[index].progress = -1
+ errorData.push(this.files[index])
+ errorTempFilePath.push(this.files[index].url)
+ } else {
+ this.files[index].errMsg = ''
+ this.files[index].fileID = item.url
+ const reg = /cloud:\/\/([\w.]+\/?)\S*/
+ if (reg.test(item.url)) {
+ this.files[index].url = await this.getTempFileURL(item.url)
+ } else {
+ this.files[index].url = item.url
+ }
+
+ this.files[index].status = 'success'
+ this.files[index].progress += 1
+ successData.push(this.files[index])
+ tempFilePath.push(this.files[index].fileID)
+ }
+ }
+
+ if (successData.length > 0) {
+ this.setEmit()
+ // 鐘舵�佹敼鍙樿繑鍥�
+ this.$emit('success', {
+ tempFiles: this.backObject(successData),
+ tempFilePaths: tempFilePath
+ })
+ }
+
+ if (errorData.length > 0) {
+ this.$emit('fail', {
+ tempFiles: this.backObject(errorData),
+ tempFilePaths: errorTempFilePath
+ })
+ }
+ },
+
+ /**
+ * 鑾峰彇杩涘害
+ * @param {Object} progressEvent
+ * @param {Object} index
+ * @param {Object} type
+ */
+ setProgress(progressEvent, index, type) {
+ const fileLenth = this.files.length
+ const percentNum = (index / fileLenth) * 100
+ const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
+ let idx = index
+ if (!type) {
+ idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
+ }
+ if (idx === -1 || !this.files[idx]) return
+ // fix by mehaotian 100 灏变細娑堝け锛�-1 鏄负浜嗚杩涘害鏉℃秷澶�
+ this.files[idx].progress = percentCompleted - 1
+ // 涓婁紶涓�
+ this.$emit('progress', {
+ index: idx,
+ progress: parseInt(percentCompleted),
+ tempFile: this.files[idx]
+ })
+ },
+
+ /**
+ * 鍒犻櫎鏂囦欢
+ * @param {Object} index
+ */
+ delFile(index) {
+ this.$emit('delete', {
+ index,
+ tempFile: this.files[index],
+ tempFilePath: this.files[index].url
+ })
+ this.files.splice(index, 1)
+ this.$nextTick(() => {
+ this.setEmit()
+ })
+ },
+
+ /**
+ * 鑾峰彇鏂囦欢鍚嶅拰鍚庣紑
+ * @param {Object} name
+ */
+ getFileExt(name) {
+ const last_len = name.lastIndexOf('.')
+ const len = name.length
+ return {
+ name: name.substring(0, last_len),
+ ext: name.substring(last_len + 1, len)
+ }
+ },
+
+ /**
+ * 澶勭悊杩斿洖浜嬩欢
+ */
+ setEmit() {
+ let data = []
+ if (this.returnType === 'object') {
+ data = this.backObject(this.files)[0]
+ this.localValue = data ? data : null
+ } else {
+ data = this.backObject(this.files)
+ if (!this.localValue) {
+ this.localValue = []
+ }
+ this.localValue = [...data]
+ }
+ // #ifdef VUE3
+ this.$emit('update:modelValue', this.localValue)
+ // #endif
+ // #ifndef VUE3
+ this.$emit('input', this.localValue)
+ // #endif
+ },
+
+ /**
+ * 澶勭悊杩斿洖鍙傛暟
+ * @param {Object} files
+ */
+ backObject(files) {
+ let newFilesData = []
+ files.forEach(v => {
+ newFilesData.push({
+ extname: v.extname,
+ fileType: v.fileType,
+ image: v.image,
+ name: v.name,
+ path: v.path,
+ size: v.size,
+ fileID: v.fileID,
+ url: v.url,
+ // 淇敼鍒犻櫎涓�涓枃浠跺悗涓嶈兘鍐嶄笂浼犵殑bug, #694
+ uuid: v.uuid,
+ status: v.status,
+ cloudPath: v.cloudPath
+ })
+ })
+ return newFilesData
+ },
+ async getTempFileURL(fileList) {
+ fileList = {
+ fileList: [].concat(fileList)
+ }
+ const urls = await uniCloud.getTempFileURL(fileList)
+ return urls.fileList[0].tempFileURL || ''
+ },
+ /**
+ * 鑾峰彇鐖跺厓绱犲疄渚�
+ */
+ getForm(name = 'uniForms') {
+ let parent = this.$parent;
+ let parentName = parent.$options.name;
+ while (parentName !== name) {
+ parent = parent.$parent;
+ if (!parent) return false;
+ parentName = parent.$options.name;
+ }
+ return parent;
}
+ }
}
</script>
@@ -665,4 +716,4 @@
position: absolute;
transform: rotate(90deg);
}
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue b/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
index 625d92e..d133b7f 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
@@ -7,28 +7,28 @@
<view v-if="list.length > 0" class="uni-file-picker__lists is-text-box" :style="borderStyle">
<!-- ,'is-list-card':showType === 'list-card' -->
- <view class="uni-file-picker__lists-box" v-for="(item ,index) in list" :key="index" :class="{
- 'files-border':index !== 0 && styles.dividline}"
- :style="index !== 0 && styles.dividline &&borderLineStyle">
+ <!-- <view class="uni-file-picker__lists-box" v-for="(item ,index) in list" :key="index" :class="{
+ 'files-border':index !== 0 && styles.dividline}" :style="index !== 0 && styles.dividline &&borderLineStyle">
<view class="uni-file-picker__item">
- <!-- :class="{'is-text-image':showType === 'list'}" -->
- <!-- <view class="files__image is-text-image">
- <image class="header-image" :src="item.logo" mode="aspectFit"></image>
- </view> -->
+
+ <view class="files__image is-text-image">
+ <image class="cuIcon-down icon-down" @click.stop="downloadFile(item,index)"></image>
+ </view>
<view class="files__name">{{item.name}}</view>
<view v-if="delIcon&&!readonly" class="icon-del-box icon-files" @click="delFile(index)">
<view class="icon-del icon-files"></view>
<view class="icon-del rotate"></view>
</view>
</view>
- <view v-if="(item.progress && item.progress !== 100) ||item.progress===0 " class="file-picker__progress">
- <progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress" stroke-width="4"
- :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
+ <view v-if="(item.progress && item.progress !== 100) ||item.progress===0 "
+ class="file-picker__progress">
+ <progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress"
+ stroke-width="4" :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
</view>
<view v-if="item.status === 'error'" class="file-picker__mask" @click.stop="uploadFiles(item,index)">
鐐瑰嚮閲嶈瘯
</view>
- </view>
+ </view> -->
</view>
</view>
@@ -37,7 +37,7 @@
<script>
export default {
name: "uploadFile",
- emits:['uploadFiles','choose','delFile'],
+ emits: ['uploadFiles', 'choose', 'delFile','downloadFile'],
props: {
filesList: {
type: Array,
@@ -70,15 +70,16 @@
}
}
},
- readonly:{
- type:Boolean,
- default:false
+ readonly: {
+ type: Boolean,
+ default: false
}
},
computed: {
list() {
let files = []
this.filesList.forEach(v => {
+ console.log(v);
files.push(v)
})
return files
@@ -157,6 +158,13 @@
index
})
},
+
+ downloadFile(item,index){
+ this.$emit("downloadFile", {
+ item,
+ index
+ })
+ },
choose() {
this.$emit("choose")
},
@@ -176,6 +184,10 @@
</script>
<style lang="scss">
+.icon-down {
+margin-top: 7px;
+}
+
.uni-file-picker__files {
/* #ifndef APP-NVUE */
display: flex;
@@ -322,4 +334,4 @@
}
/* #endif */
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3