diff --git a/App.vue b/App.vue index dfe843f..eb33ca0 100644 --- a/App.vue +++ b/App.vue @@ -1,15 +1,36 @@ + \ No newline at end of file diff --git a/components/dateSelection/dateSelection.vue b/components/dateSelection/dateSelection.vue index f158fd7..0ab59ca 100644 --- a/components/dateSelection/dateSelection.vue +++ b/components/dateSelection/dateSelection.vue @@ -19,7 +19,7 @@ - {{item}} + {{item}} @@ -84,11 +84,14 @@ Props.modelValue=false; adssEmits("update:modelValue",false) } - function settime(time){ - chooseday.value=time; - adssEmits("change",time) - Props.modelValue=false; - adssEmits("update:modelValue",false) + function settime(time,type){ + if(!type){ + chooseday.value=time; + adssEmits("change",time) + Props.modelValue=false; + adssEmits("update:modelValue",false) + } + } function reset(){ // chooseday.value=daydata.value.day[0]; diff --git a/components/pageanimation/pageanimation.vue b/components/pageanimation/pageanimation.vue index bbc7850..8719ac7 100644 --- a/components/pageanimation/pageanimation.vue +++ b/components/pageanimation/pageanimation.vue @@ -60,6 +60,8 @@ left: 100%; background: #E7E7ED; transition:0.3s; + box-sizing: border-box; + padding-bottom: 1rpx; &.showon{ left: 0%; } diff --git a/hybrid/html/.history/index_20250825141035.html b/hybrid/html/.history/index_20250825141035.html deleted file mode 100644 index e69de29..0000000 diff --git a/hybrid/html/.history/index_20250825141115.html b/hybrid/html/.history/index_20250825141115.html deleted file mode 100644 index d01f779..0000000 --- a/hybrid/html/.history/index_20250825141115.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Document - - - - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825141148.html b/hybrid/html/.history/index_20250825141148.html deleted file mode 100644 index ac3136c..0000000 --- a/hybrid/html/.history/index_20250825141148.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Document - - -
-
设备001
-
- - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825141722.html b/hybrid/html/.history/index_20250825141722.html deleted file mode 100644 index 75e894f..0000000 --- a/hybrid/html/.history/index_20250825141722.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Document - - - -
-
设备001
-
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825141808.html b/hybrid/html/.history/index_20250825141808.html deleted file mode 100644 index 2fc9e4c..0000000 --- a/hybrid/html/.history/index_20250825141808.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Document - - - - -
-
设备001
-
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825141833.html b/hybrid/html/.history/index_20250825141833.html deleted file mode 100644 index debc133..0000000 --- a/hybrid/html/.history/index_20250825141833.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - Document - - - - -
-
设备001
-
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825141859.html b/hybrid/html/.history/index_20250825141859.html deleted file mode 100644 index ec9ea49..0000000 --- a/hybrid/html/.history/index_20250825141859.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - Document - - - - -
-
设备001
-
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825141921.html b/hybrid/html/.history/index_20250825141921.html deleted file mode 100644 index 8a9a3a2..0000000 --- a/hybrid/html/.history/index_20250825141921.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - Document - - - - -
-
设备001
-
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142000.html b/hybrid/html/.history/index_20250825142000.html deleted file mode 100644 index ec57515..0000000 --- a/hybrid/html/.history/index_20250825142000.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142005.html b/hybrid/html/.history/index_20250825142005.html deleted file mode 100644 index 67f5ca9..0000000 --- a/hybrid/html/.history/index_20250825142005.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142013.html b/hybrid/html/.history/index_20250825142013.html deleted file mode 100644 index 0fb8754..0000000 --- a/hybrid/html/.history/index_20250825142013.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142017.html b/hybrid/html/.history/index_20250825142017.html deleted file mode 100644 index 1629794..0000000 --- a/hybrid/html/.history/index_20250825142017.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142128.html b/hybrid/html/.history/index_20250825142128.html deleted file mode 100644 index 8ebbf83..0000000 --- a/hybrid/html/.history/index_20250825142128.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142346.html b/hybrid/html/.history/index_20250825142346.html deleted file mode 100644 index 038eb15..0000000 --- a/hybrid/html/.history/index_20250825142346.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142501.html b/hybrid/html/.history/index_20250825142501.html deleted file mode 100644 index c5c5a36..0000000 --- a/hybrid/html/.history/index_20250825142501.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142516.html b/hybrid/html/.history/index_20250825142516.html deleted file mode 100644 index f263eae..0000000 --- a/hybrid/html/.history/index_20250825142516.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142724.html b/hybrid/html/.history/index_20250825142724.html deleted file mode 100644 index 0f00f62..0000000 --- a/hybrid/html/.history/index_20250825142724.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142750.html b/hybrid/html/.history/index_20250825142750.html deleted file mode 100644 index 23e9c9b..0000000 --- a/hybrid/html/.history/index_20250825142750.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825142831.html b/hybrid/html/.history/index_20250825142831.html deleted file mode 100644 index 182cb30..0000000 --- a/hybrid/html/.history/index_20250825142831.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825164941.html b/hybrid/html/.history/index_20250825164941.html deleted file mode 100644 index 3d7103a..0000000 --- a/hybrid/html/.history/index_20250825164941.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825164950.html b/hybrid/html/.history/index_20250825164950.html deleted file mode 100644 index 4386eac..0000000 --- a/hybrid/html/.history/index_20250825164950.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165000.html b/hybrid/html/.history/index_20250825165000.html deleted file mode 100644 index be3b880..0000000 --- a/hybrid/html/.history/index_20250825165000.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165004.html b/hybrid/html/.history/index_20250825165004.html deleted file mode 100644 index f85a319..0000000 --- a/hybrid/html/.history/index_20250825165004.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165007.html b/hybrid/html/.history/index_20250825165007.html deleted file mode 100644 index 9f04b39..0000000 --- a/hybrid/html/.history/index_20250825165007.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165027.html b/hybrid/html/.history/index_20250825165027.html deleted file mode 100644 index 4716107..0000000 --- a/hybrid/html/.history/index_20250825165027.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165032.html b/hybrid/html/.history/index_20250825165032.html deleted file mode 100644 index 23a2ef8..0000000 --- a/hybrid/html/.history/index_20250825165032.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165038.html b/hybrid/html/.history/index_20250825165038.html deleted file mode 100644 index ae07413..0000000 --- a/hybrid/html/.history/index_20250825165038.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165049.html b/hybrid/html/.history/index_20250825165049.html deleted file mode 100644 index b926022..0000000 --- a/hybrid/html/.history/index_20250825165049.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165118.html b/hybrid/html/.history/index_20250825165118.html deleted file mode 100644 index 4d56f07..0000000 --- a/hybrid/html/.history/index_20250825165118.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- - - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165128.html b/hybrid/html/.history/index_20250825165128.html deleted file mode 100644 index 040a48b..0000000 --- a/hybrid/html/.history/index_20250825165128.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- - - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165136.html b/hybrid/html/.history/index_20250825165136.html deleted file mode 100644 index cac3cce..0000000 --- a/hybrid/html/.history/index_20250825165136.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- - - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165221.html b/hybrid/html/.history/index_20250825165221.html deleted file mode 100644 index e0ec6c8..0000000 --- a/hybrid/html/.history/index_20250825165221.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- - - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165240.html b/hybrid/html/.history/index_20250825165240.html deleted file mode 100644 index c744dfc..0000000 --- a/hybrid/html/.history/index_20250825165240.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- - - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165303.html b/hybrid/html/.history/index_20250825165303.html deleted file mode 100644 index c744dfc..0000000 --- a/hybrid/html/.history/index_20250825165303.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- - - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165314.html b/hybrid/html/.history/index_20250825165314.html deleted file mode 100644 index 4feff18..0000000 --- a/hybrid/html/.history/index_20250825165314.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- - - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165316.html b/hybrid/html/.history/index_20250825165316.html deleted file mode 100644 index 4feff18..0000000 --- a/hybrid/html/.history/index_20250825165316.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- - - -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165339.html b/hybrid/html/.history/index_20250825165339.html deleted file mode 100644 index a986f99..0000000 --- a/hybrid/html/.history/index_20250825165339.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165348.html b/hybrid/html/.history/index_20250825165348.html deleted file mode 100644 index ec80a71..0000000 --- a/hybrid/html/.history/index_20250825165348.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165355.html b/hybrid/html/.history/index_20250825165355.html deleted file mode 100644 index 5188553..0000000 --- a/hybrid/html/.history/index_20250825165355.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165359.html b/hybrid/html/.history/index_20250825165359.html deleted file mode 100644 index 5188553..0000000 --- a/hybrid/html/.history/index_20250825165359.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165402.html b/hybrid/html/.history/index_20250825165402.html deleted file mode 100644 index b54d14e..0000000 --- a/hybrid/html/.history/index_20250825165402.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165406.html b/hybrid/html/.history/index_20250825165406.html deleted file mode 100644 index 118f7b2..0000000 --- a/hybrid/html/.history/index_20250825165406.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165409.html b/hybrid/html/.history/index_20250825165409.html deleted file mode 100644 index 6cac63a..0000000 --- a/hybrid/html/.history/index_20250825165409.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165411.html b/hybrid/html/.history/index_20250825165411.html deleted file mode 100644 index a4e10dc..0000000 --- a/hybrid/html/.history/index_20250825165411.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165414.html b/hybrid/html/.history/index_20250825165414.html deleted file mode 100644 index 828dee7..0000000 --- a/hybrid/html/.history/index_20250825165414.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165419.html b/hybrid/html/.history/index_20250825165419.html deleted file mode 100644 index c998f07..0000000 --- a/hybrid/html/.history/index_20250825165419.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165427.html b/hybrid/html/.history/index_20250825165427.html deleted file mode 100644 index 3891671..0000000 --- a/hybrid/html/.history/index_20250825165427.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165449.html b/hybrid/html/.history/index_20250825165449.html deleted file mode 100644 index ffda887..0000000 --- a/hybrid/html/.history/index_20250825165449.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/.history/index_20250825165453.html b/hybrid/html/.history/index_20250825165453.html deleted file mode 100644 index f793f80..0000000 --- a/hybrid/html/.history/index_20250825165453.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/dom-to-image.min.js b/hybrid/html/dom-to-image.min.js deleted file mode 100644 index bc73227..0000000 --- a/hybrid/html/dom-to-image.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! dom-to-image 10-06-2017 */ -!function(a){"use strict";function b(a,b){function c(a){return b.bgcolor&&(a.style.backgroundColor=b.bgcolor),b.width&&(a.style.width=b.width+"px"),b.height&&(a.style.height=b.height+"px"),b.style&&Object.keys(b.style).forEach(function(c){a.style[c]=b.style[c]}),a}return b=b||{},g(b),Promise.resolve(a).then(function(a){return i(a,b.filter,!0)}).then(j).then(k).then(c).then(function(c){return l(c,b.width||q.width(a),b.height||q.height(a))})}function c(a,b){return h(a,b||{}).then(function(b){return b.getContext("2d").getImageData(0,0,q.width(a),q.height(a)).data})}function d(a,b){return h(a,b||{}).then(function(a){return a.toDataURL()})}function e(a,b){return b=b||{},h(a,b).then(function(a){return a.toDataURL("image/jpeg",b.quality||1)})}function f(a,b){return h(a,b||{}).then(q.canvasToBlob)}function g(a){"undefined"==typeof a.imagePlaceholder?v.impl.options.imagePlaceholder=u.imagePlaceholder:v.impl.options.imagePlaceholder=a.imagePlaceholder,"undefined"==typeof a.cacheBust?v.impl.options.cacheBust=u.cacheBust:v.impl.options.cacheBust=a.cacheBust}function h(a,c){function d(a){var b=document.createElement("canvas");if(b.width=c.width||q.width(a),b.height=c.height||q.height(a),c.bgcolor){var d=b.getContext("2d");d.fillStyle=c.bgcolor,d.fillRect(0,0,b.width,b.height)}return b}return b(a,c).then(q.makeImage).then(q.delay(100)).then(function(b){var c=d(a);return c.getContext("2d").drawImage(b,0,0),c})}function i(a,b,c){function d(a){return a instanceof HTMLCanvasElement?q.makeImage(a.toDataURL()):a.cloneNode(!1)}function e(a,b,c){function d(a,b,c){var d=Promise.resolve();return b.forEach(function(b){d=d.then(function(){return i(b,c)}).then(function(b){b&&a.appendChild(b)})}),d}var e=a.childNodes;return 0===e.length?Promise.resolve(b):d(b,q.asArray(e),c).then(function(){return b})}function f(a,b){function c(){function c(a,b){function c(a,b){q.asArray(a).forEach(function(c){b.setProperty(c,a.getPropertyValue(c),a.getPropertyPriority(c))})}a.cssText?b.cssText=a.cssText:c(a,b)}c(window.getComputedStyle(a),b.style)}function d(){function c(c){function d(a,b,c){function d(a){var b=a.getPropertyValue("content");return a.cssText+" content: "+b+";"}function e(a){function b(b){return b+": "+a.getPropertyValue(b)+(a.getPropertyPriority(b)?" !important":"")}return q.asArray(a).map(b).join("; ")+";"}var f="."+a+":"+b,g=c.cssText?d(c):e(c);return document.createTextNode(f+"{"+g+"}")}var e=window.getComputedStyle(a,c),f=e.getPropertyValue("content");if(""!==f&&"none"!==f){var g=q.uid();b.className=b.className+" "+g;var h=document.createElement("style");h.appendChild(d(g,c,e)),b.appendChild(h)}}[":before",":after"].forEach(function(a){c(a)})}function e(){a instanceof HTMLTextAreaElement&&(b.innerHTML=a.value),a instanceof HTMLInputElement&&b.setAttribute("value",a.value)}function f(){b instanceof SVGElement&&(b.setAttribute("xmlns","http://www.w3.org/2000/svg"),b instanceof SVGRectElement&&["width","height"].forEach(function(a){var c=b.getAttribute(a);c&&b.style.setProperty(a,c)}))}return b instanceof Element?Promise.resolve().then(c).then(d).then(e).then(f).then(function(){return b}):b}return c||!b||b(a)?Promise.resolve(a).then(d).then(function(c){return e(a,c,b)}).then(function(b){return f(a,b)}):Promise.resolve()}function j(a){return s.resolveAll().then(function(b){var c=document.createElement("style");return a.appendChild(c),c.appendChild(document.createTextNode(b)),a})}function k(a){return t.inlineAll(a).then(function(){return a})}function l(a,b,c){return Promise.resolve(a).then(function(a){return a.setAttribute("xmlns","http://www.w3.org/1999/xhtml"),(new XMLSerializer).serializeToString(a)}).then(q.escapeXhtml).then(function(a){return''+a+""}).then(function(a){return''+a+""}).then(function(a){return"data:image/svg+xml;charset=utf-8,"+a})}function m(){function a(){var a="application/font-woff",b="image/jpeg";return{woff:a,woff2:a,ttf:"application/font-truetype",eot:"application/vnd.ms-fontobject",png:"image/png",jpg:b,jpeg:b,gif:"image/gif",tiff:"image/tiff",svg:"image/svg+xml"}}function b(a){var b=/\.([^\.\/]*?)$/g.exec(a);return b?b[1]:""}function c(c){var d=b(c).toLowerCase();return a()[d]||""}function d(a){return a.search(/^(data:)/)!==-1}function e(a){return new Promise(function(b){for(var c=window.atob(a.toDataURL().split(",")[1]),d=c.length,e=new Uint8Array(d),f=0;f - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/hybrid/html/map.png b/hybrid/html/map.png deleted file mode 100644 index 37222a3..0000000 Binary files a/hybrid/html/map.png and /dev/null differ diff --git a/manifest.json b/manifest.json index b2736e6..09bd751 100644 --- a/manifest.json +++ b/manifest.json @@ -71,6 +71,54 @@ } }, "statics" : {} + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + } + }, + "nativePlugins" : { + "hk-preview" : { + "__plugin_info__" : { + "name" : "海康视频实时预览插件", + "description" : "海康摄像头录像机直连插件,实现设备视频预览和云台控制", + "platforms" : "Android", + "url" : "https://ext.dcloud.net.cn/plugin?id=1981", + "android_package_name" : "blyc.qjcs.com", + "ios_bundle_id" : "", + "isCloud" : true, + "bought" : 1, + "pid" : "1981", + "parameters" : {} + } } } }, @@ -98,6 +146,16 @@ }, "vueVersion" : "3", "h5" : { + "devServer" : { + //配置跨域 + "proxy" : { + "/api" : { + "target" : "http://192.168.1.7:8566", + "changeOrigin" : true, + "secure" : false + } + } + }, "sdkConfigs" : { "maps" : {} } diff --git a/pages/go.vue b/pages/go.vue index 453fcff..fed5369 100644 --- a/pages/go.vue +++ b/pages/go.vue @@ -1,9 +1,14 @@ - \ No newline at end of file diff --git a/pages/index.vue b/pages/index.vue index b623f77..05c068e 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,10 +1,14 @@ - - - -
-
设备001
- - - - - - Document - - - - -
-
设备001
- - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/static/html/.history/index_20250825151913.html b/static/html/.history/index_20250825151913.html deleted file mode 100644 index 30ebf34..0000000 --- a/static/html/.history/index_20250825151913.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/static/html/.history/index_20250825152013.html b/static/html/.history/index_20250825152013.html deleted file mode 100644 index 30ebf34..0000000 --- a/static/html/.history/index_20250825152013.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - Document - - - - -
-
设备001
- - -
- - - \ No newline at end of file diff --git a/static/html/dom-to-image.min.js b/static/html/dom-to-image.min.js deleted file mode 100644 index bc73227..0000000 --- a/static/html/dom-to-image.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! dom-to-image 10-06-2017 */ -!function(a){"use strict";function b(a,b){function c(a){return b.bgcolor&&(a.style.backgroundColor=b.bgcolor),b.width&&(a.style.width=b.width+"px"),b.height&&(a.style.height=b.height+"px"),b.style&&Object.keys(b.style).forEach(function(c){a.style[c]=b.style[c]}),a}return b=b||{},g(b),Promise.resolve(a).then(function(a){return i(a,b.filter,!0)}).then(j).then(k).then(c).then(function(c){return l(c,b.width||q.width(a),b.height||q.height(a))})}function c(a,b){return h(a,b||{}).then(function(b){return b.getContext("2d").getImageData(0,0,q.width(a),q.height(a)).data})}function d(a,b){return h(a,b||{}).then(function(a){return a.toDataURL()})}function e(a,b){return b=b||{},h(a,b).then(function(a){return a.toDataURL("image/jpeg",b.quality||1)})}function f(a,b){return h(a,b||{}).then(q.canvasToBlob)}function g(a){"undefined"==typeof a.imagePlaceholder?v.impl.options.imagePlaceholder=u.imagePlaceholder:v.impl.options.imagePlaceholder=a.imagePlaceholder,"undefined"==typeof a.cacheBust?v.impl.options.cacheBust=u.cacheBust:v.impl.options.cacheBust=a.cacheBust}function h(a,c){function d(a){var b=document.createElement("canvas");if(b.width=c.width||q.width(a),b.height=c.height||q.height(a),c.bgcolor){var d=b.getContext("2d");d.fillStyle=c.bgcolor,d.fillRect(0,0,b.width,b.height)}return b}return b(a,c).then(q.makeImage).then(q.delay(100)).then(function(b){var c=d(a);return c.getContext("2d").drawImage(b,0,0),c})}function i(a,b,c){function d(a){return a instanceof HTMLCanvasElement?q.makeImage(a.toDataURL()):a.cloneNode(!1)}function e(a,b,c){function d(a,b,c){var d=Promise.resolve();return b.forEach(function(b){d=d.then(function(){return i(b,c)}).then(function(b){b&&a.appendChild(b)})}),d}var e=a.childNodes;return 0===e.length?Promise.resolve(b):d(b,q.asArray(e),c).then(function(){return b})}function f(a,b){function c(){function c(a,b){function c(a,b){q.asArray(a).forEach(function(c){b.setProperty(c,a.getPropertyValue(c),a.getPropertyPriority(c))})}a.cssText?b.cssText=a.cssText:c(a,b)}c(window.getComputedStyle(a),b.style)}function d(){function c(c){function d(a,b,c){function d(a){var b=a.getPropertyValue("content");return a.cssText+" content: "+b+";"}function e(a){function b(b){return b+": "+a.getPropertyValue(b)+(a.getPropertyPriority(b)?" !important":"")}return q.asArray(a).map(b).join("; ")+";"}var f="."+a+":"+b,g=c.cssText?d(c):e(c);return document.createTextNode(f+"{"+g+"}")}var e=window.getComputedStyle(a,c),f=e.getPropertyValue("content");if(""!==f&&"none"!==f){var g=q.uid();b.className=b.className+" "+g;var h=document.createElement("style");h.appendChild(d(g,c,e)),b.appendChild(h)}}[":before",":after"].forEach(function(a){c(a)})}function e(){a instanceof HTMLTextAreaElement&&(b.innerHTML=a.value),a instanceof HTMLInputElement&&b.setAttribute("value",a.value)}function f(){b instanceof SVGElement&&(b.setAttribute("xmlns","http://www.w3.org/2000/svg"),b instanceof SVGRectElement&&["width","height"].forEach(function(a){var c=b.getAttribute(a);c&&b.style.setProperty(a,c)}))}return b instanceof Element?Promise.resolve().then(c).then(d).then(e).then(f).then(function(){return b}):b}return c||!b||b(a)?Promise.resolve(a).then(d).then(function(c){return e(a,c,b)}).then(function(b){return f(a,b)}):Promise.resolve()}function j(a){return s.resolveAll().then(function(b){var c=document.createElement("style");return a.appendChild(c),c.appendChild(document.createTextNode(b)),a})}function k(a){return t.inlineAll(a).then(function(){return a})}function l(a,b,c){return Promise.resolve(a).then(function(a){return a.setAttribute("xmlns","http://www.w3.org/1999/xhtml"),(new XMLSerializer).serializeToString(a)}).then(q.escapeXhtml).then(function(a){return''+a+""}).then(function(a){return''+a+""}).then(function(a){return"data:image/svg+xml;charset=utf-8,"+a})}function m(){function a(){var a="application/font-woff",b="image/jpeg";return{woff:a,woff2:a,ttf:"application/font-truetype",eot:"application/vnd.ms-fontobject",png:"image/png",jpg:b,jpeg:b,gif:"image/gif",tiff:"image/tiff",svg:"image/svg+xml"}}function b(a){var b=/\.([^\.\/]*?)$/g.exec(a);return b?b[1]:""}function c(c){var d=b(c).toLowerCase();return a()[d]||""}function d(a){return a.search(/^(data:)/)!==-1}function e(a){return new Promise(function(b){for(var c=window.atob(a.toDataURL().split(",")[1]),d=c.length,e=new Uint8Array(d),f=0;f - - - - - Document - - - - -
-
-
设备001
- -
- -
- -
- - - \ No newline at end of file diff --git a/static/html/map.png b/static/html/map.png deleted file mode 100644 index 37222a3..0000000 Binary files a/static/html/map.png and /dev/null differ diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js index 7b8168f..e4829f5 100644 --- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js +++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js @@ -57,6 +57,9 @@ const cfe = { yAxisFormatDemo:function (value, index) { return value + '元'; }, + "percentage":function(val, index, series, opts){ + return val+'%' + }, seriesFormatDemo:function(res){ return res.name + '年' + res.value + '元'; } diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js index 17b28b3..d3d9f7b 100644 --- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js +++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js @@ -59,6 +59,10 @@ const cfu = { "xAxisDemo1":function(val, index, opts){return val+'年';}, "xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')}, "seriesDemo1":function(val, index, series, opts){return val+'元'}, + + "percentage":function(val, index, series, opts){ + return val+'%' + }, "tooltipDemo1":function(item, category, index, opts){ if(index==0){ return '随便用'+item.data+'年' diff --git a/utils/base64ToFile.js b/utils/base64ToFile.js deleted file mode 100644 index dae0cc4..0000000 --- a/utils/base64ToFile.js +++ /dev/null @@ -1,50 +0,0 @@ -export default function lzFileWriter(id, fn) { - - plus.io.resolveLocalFileSystemURL('/static/html/index.html', function(entry) { - let _we = plus.webview.create(entry.toLocalURL()); - _we.evalJS(`settitle("${id}");`) - plus.globalEvent.addEventListener('plusMessage', (e) => { - if(e.data.id==id){ - geturl(e.data.img, e.data.id + ".png",e.data.id) - _we.close() - } - - }) - }) - - function geturl(base64, fileName,imgid) { - plus.io.requestFileSystem(plus.io.PRIVATE_DOC, function(fs) { - fs.root.getFile(fileName, { - create: true - }, function(fileEntry) { - // 获得平台绝对路径 - var fullPath = fileEntry.fullPath; - - // 引入安卓原生类 - var Base64 = plus.android.importClass("android.util.Base64"); - var FileOutputStream = plus.android.importClass("java.io.FileOutputStream"); - //如果文件不存在则创建文件,如果文件存在则删除文件后重新创建文件 - var out = new FileOutputStream(fullPath); - /** - * 此处需要把base64前缀去除,在写入字节流数组 - * 去除头部data:image/jpg;base64,留下base64编码后的字符串 - **/ - let index = base64.indexOf(',') - let base64Str = base64.slice(index + 1, base64.length) - //base64解密得到字节流bytes; - var bytes = Base64.decode(base64Str, 0); - try { - out.write(bytes); // byte 数组写入此文件输出流中。 - out.flush(); //刷新写入文件中去。 - out.close(); //关闭此文件输出流并释放与此流有关的所有系统资源。 - uni.setStorageSync(imgid,fullPath) - fn(fullPath) - } catch (e) { - console.log(e.message); - } - }); - }); - } - - -} \ No newline at end of file diff --git a/utils/requestbaidumap.js b/utils/requestbaidumap.js deleted file mode 100644 index 9d67643..0000000 --- a/utils/requestbaidumap.js +++ /dev/null @@ -1,20 +0,0 @@ -export default function(url,data,method="get"){ - return new Promise((resolve, reject)=>{ - uni.request({ - url: 'https://api.map.baidu.com/direction/v2/'+url, //仅为示例,并非真实接口地址。 - data: { - ak:"23rLBU4tBLeNEMsxCCnXXw6aYyuOJCwY", - ...data - }, - method:method, - success: (res) => { - console.log(res.data) - if(res.data.status==0){ - resolve(res.data.result) - } - - } - }); - - }) -} \ No newline at end of file