diff --git a/package.json b/package.json index afc4e53b..809cadbc 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "print-js": "^1.0.63", "serialize-javascript": "^6.0.0", "sortablejs": "^1.12.0", - "spritejs": "^3.8.0", "vue-draggable-resizable": "^2.3.0", "vue-json-editor": "^1.4.3", "vue-okr-tree": "^1.0.10", diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue index cc3c8add..d63b2251 100644 --- a/packages/wxwork/AppMassNotification/components/Add.vue +++ b/packages/wxwork/AppMassNotification/components/Add.vue @@ -81,23 +81,6 @@ - @@ -210,8 +193,6 @@ export default { this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => { if (res?.data) { this.data = res.data - // this.images = [{url: res.data.fileList.filter(e => e.contentType == "image").map().accessUrl}] - // this.fileDownLoad = [{url: res.data.fileList.filter(e => e.contentType == "file")[0]?.accessUrl}] this.images = res.data.fileList.filter(e => e.contentType == "image")?.map(i => { return { url: i.accessUrl @@ -274,7 +255,7 @@ export default { } }) } - + this.form.fileList = [...contentList, ...this.imgs, ...this.videos, ...this.files] this.instance.post(`/app/pushmessage/addOrUpdate`, { diff --git a/project/dvui/components/AiSprite.vue b/project/dvui/components/AiSprite.vue new file mode 100644 index 00000000..f44b52e2 --- /dev/null +++ b/project/dvui/components/AiSprite.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/project/dvui/layout/AiDvWrapper/AiDvWrapper.vue b/project/dvui/layout/AiDvWrapper/AiDvWrapper.vue index 6eff97c1..ecba7876 100644 --- a/project/dvui/layout/AiDvWrapper/AiDvWrapper.vue +++ b/project/dvui/layout/AiDvWrapper/AiDvWrapper.vue @@ -23,7 +23,7 @@
-
+ {{ title }}
@@ -57,13 +57,13 @@ import {fullScreenContainer} from '@jiaminghi/data-view' import Vue from "vue"; import RightTopBorder from "./rightTopBorder"; -import {Arc, Scene} from 'spritejs' +import AiSprite from "../../components/AiSprite"; Vue.use(fullScreenContainer) export default { name: "AiDvWrapper", - components: {RightTopBorder}, + components: {AiSprite, RightTopBorder}, model: { prop: 'value', event: 'change' @@ -124,45 +124,35 @@ export default { cfs.call(el) } }, - initFly() { + initFly({layer, lib: {Arc}}) { const rand = (min, max) => min + (max - min) * Math.random() - const initScene = (count = 0) => { - const container = document.querySelector('#fly') - if (container) { - const scene = new Scene({container, width: 600, height: 90}), - layer = scene.layer() - const startFly = (p) => { - let scaleNum = rand(1, 3) - const pos = [rand(0, 600), 90 - rand(8, 50)] - p.attr({ - pos, - scale: [scaleNum, scaleNum], - radius: 1, - fillColor: '#0aa5ff', - filter: 'drop-shadow( 0, 2px, 2px, #0aa5ff)' - }) - p.animate([ - pos, - {y: 0} - ], { - opacity: 0, - duration: rand(1, 1.5) * 1000, - iterations: Infinity, - easing: 'ease-out' - }) - setTimeout(() => layer.append(p), rand(1, 5) * 1000) - } - //初始化标题萤火效果 - let numP = 70; - for (let i = 0; i <= numP; i++) { - const p = new Arc() - startFly(p) - } - } else if (count == 20) { - - } else setTimeout(() => initScene(++count), 500) + const startFly = (p) => { + let scaleNum = rand(1, 3) + const pos = [rand(0, 600), 90 - rand(8, 50)] + p.attr({ + pos, + scale: [scaleNum, scaleNum], + radius: 1, + fillColor: '#0aa5ff', + filter: 'drop-shadow( 0, 2px, 2px, #0aa5ff)' + }) + p.animate([ + pos, + {y: 0} + ], { + opacity: 0, + duration: rand(1, 1.5) * 1000, + iterations: Infinity, + easing: 'ease-out' + }) + setTimeout(() => layer.append(p), rand(1, 5) * 1000) + } + //初始化标题萤火效果 + let numP = 70; + for (let i = 0; i <= numP; i++) { + const p = new Arc() + startFly(p) } - initScene() }, handleSetting() { if (this.setting.timer) clearInterval(this.setting.timer) @@ -184,9 +174,6 @@ export default { this.currentTime = this.$moment().format("YYYY/MM/DD HH:mm:ss") }, 1000) }, - mounted() { - this.initFly() - } } @@ -363,11 +350,6 @@ export default { left: 50%; transform: translateX(-50%); z-index: 3; - - & > div { - width: 0; - box-shadow: 0 0 1px 1px #0aa5ff; - } } } } diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue index eba582eb..59f202a1 100644 --- a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue +++ b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue @@ -44,6 +44,7 @@ size="small" unlink-panels placeholder="选择结束日期" + :picker-options="{start: search.createTimeStart, minTime: search.createTimeStart}" @change="search.current = 1, getList()" />