diff --git a/acs/qd/src/assets/icons/svg/clear.svg b/acs/qd/src/assets/icons/svg/clear.svg new file mode 100644 index 0000000..add284f --- /dev/null +++ b/acs/qd/src/assets/icons/svg/clear.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/acs/qd/src/assets/icons/svg/downAlign.svg b/acs/qd/src/assets/icons/svg/downAlign.svg new file mode 100644 index 0000000..d02dce2 --- /dev/null +++ b/acs/qd/src/assets/icons/svg/downAlign.svg @@ -0,0 +1,2 @@ + diff --git a/acs/qd/src/assets/icons/svg/horizontalAlign.svg b/acs/qd/src/assets/icons/svg/horizontalAlign.svg new file mode 100644 index 0000000..ed79e1a --- /dev/null +++ b/acs/qd/src/assets/icons/svg/horizontalAlign.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/acs/qd/src/assets/icons/svg/horizontalDistribution.svg b/acs/qd/src/assets/icons/svg/horizontalDistribution.svg new file mode 100644 index 0000000..b4af40e --- /dev/null +++ b/acs/qd/src/assets/icons/svg/horizontalDistribution.svg @@ -0,0 +1,2 @@ + diff --git a/acs/qd/src/assets/icons/svg/leftAlign.svg b/acs/qd/src/assets/icons/svg/leftAlign.svg new file mode 100644 index 0000000..b373ac3 --- /dev/null +++ b/acs/qd/src/assets/icons/svg/leftAlign.svg @@ -0,0 +1,2 @@ + diff --git a/acs/qd/src/assets/icons/svg/rightAlign.svg b/acs/qd/src/assets/icons/svg/rightAlign.svg new file mode 100644 index 0000000..b0670ba --- /dev/null +++ b/acs/qd/src/assets/icons/svg/rightAlign.svg @@ -0,0 +1,2 @@ + diff --git a/acs/qd/src/assets/icons/svg/save.svg b/acs/qd/src/assets/icons/svg/save.svg new file mode 100644 index 0000000..e9e05e3 --- /dev/null +++ b/acs/qd/src/assets/icons/svg/save.svg @@ -0,0 +1,2 @@ + diff --git a/acs/qd/src/assets/icons/svg/upAlign.svg b/acs/qd/src/assets/icons/svg/upAlign.svg new file mode 100644 index 0000000..29645dd --- /dev/null +++ b/acs/qd/src/assets/icons/svg/upAlign.svg @@ -0,0 +1,2 @@ + diff --git a/acs/qd/src/assets/icons/svg/verticalAlign.svg b/acs/qd/src/assets/icons/svg/verticalAlign.svg new file mode 100644 index 0000000..a3646a0 --- /dev/null +++ b/acs/qd/src/assets/icons/svg/verticalAlign.svg @@ -0,0 +1,2 @@ + diff --git a/acs/qd/src/assets/icons/svg/verticalDistribution.svg b/acs/qd/src/assets/icons/svg/verticalDistribution.svg new file mode 100644 index 0000000..e628a9e --- /dev/null +++ b/acs/qd/src/assets/icons/svg/verticalDistribution.svg @@ -0,0 +1,2 @@ + diff --git a/acs/qd/src/views/monitor/logback/index.vue b/acs/qd/src/views/monitor/logback/index.vue index 5736855..2b83e17 100644 --- a/acs/qd/src/views/monitor/logback/index.vue +++ b/acs/qd/src/views/monitor/logback/index.vue @@ -295,7 +295,7 @@ export default { queryParam.end = (new Date(this.timeRange[1]).getTime() * 1000000).toString() } if (this.text !== '') { - queryParam.text = this.text + queryParam.text = this.text.replace(/^\s*|\s*$/g,'') } if (this.limits !== '') { console.log(this.limits) diff --git a/acs/qd/src/views/system/logicflow/editor/components/DiagramToolbar.vue b/acs/qd/src/views/system/logicflow/editor/components/DiagramToolbar.vue index ac24070..fcede31 100644 --- a/acs/qd/src/views/system/logicflow/editor/components/DiagramToolbar.vue +++ b/acs/qd/src/views/system/logicflow/editor/components/DiagramToolbar.vue @@ -24,40 +24,40 @@
- 锁定 +
- 解锁 +
- 垂直居中 +
- 水平居中 +
- 向左对齐 +
- 向右对齐 +
- 向上对齐 +
- 向下对齐 +
- 水平分布 +
- 垂直分布 +
- 清空画布 +
- 保存 +
@@ -71,7 +71,7 @@
舞台: - +
设备绑定 - + + + + {{ item.device_code }} + {{ item.device_name }} + +
旋转角度 @@ -152,6 +168,7 @@
设备选择 _ + i * 0.5), // imageUrl: '', - imageUrlOptions: [] + imageUrlOptions: [], + deviceCodeOptions: [] } }, watch: { @@ -222,6 +241,7 @@ export default { }, created() { this.initStageIconList() + this.initDevicesList() }, methods: { initStageIconList() { // 初始化图标数据 @@ -232,6 +252,12 @@ export default { this.imageUrlOptions = data }) }, + initDevicesList() { + crudDevice.selectDeviceList().then(res => { + console.log('devices:', res) + this.deviceCodeOptions = res + }) + }, setStyle(item) { this.$emit('setStyle', item) }, diff --git a/acs/qd/src/views/system/logicflow/editor/components/node/html/htmlNode.js b/acs/qd/src/views/system/logicflow/editor/components/node/html/htmlNode.js index bbd4d84..4ea3fe1 100644 --- a/acs/qd/src/views/system/logicflow/editor/components/node/html/htmlNode.js +++ b/acs/qd/src/views/system/logicflow/editor/components/node/html/htmlNode.js @@ -64,11 +64,18 @@ class ButtonNode extends HtmlResize.view { const el = document.createElement('div') el.className = 'uml-wrapper' // el.id = 'uml-app' + /** + * 以下分为：状态显示（设备左上的小圆点） + * 托盘图标 + * 故障图标 + * 设备图片 + * @type {string} + */ const html = `
- - + +
` diff --git a/acs/qd/src/views/system/logicflow/monitor/index.vue b/acs/qd/src/views/system/logicflow/monitor/index.vue index 4671d1c..7dff5ca 100644 --- a/acs/qd/src/views/system/logicflow/monitor/index.vue +++ b/acs/qd/src/views/system/logicflow/monitor/index.vue @@ -9,7 +9,7 @@ title="设备信息" class="newDialog" :visible.sync="dialogDeviceMsgVisible" - width="18%" + width="22%" :top="tops" :show-close="false" :modal="false" @@ -186,6 +186,7 @@ export default { backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")', backgroundRepeat: 'repeat' }, + isSilentMode: true, adjustEdge: false, adjustEdgeMiddle: false, adjustEdgeStartAndEnd: false,