root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备图片上传更新与编辑功能提示

Browse Source
This commit is contained in:
lyd
2022-08-18 17:21:04 +08:00
parent 861cdfea72
commit a326fe39aa
8 changed files with 134 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/qd/src/store/modules/api.js
View File

@@ -9,7 +9,8 @@ const api = {
// 实时控制台
socketApi: baseUrl + '/websocket?token=kl',
// 图片上传
imagesUploadApi: baseUrl + '/api/localStorage/pictures',
// imagesUploadApi: baseUrl + '/api/localStorage/pictures',
imagesUploadApi: baseUrl + '/api/stageImage/pictures',
// 修改头像
updateAvatarApi: baseUrl + '/api/users/updateAvatar',
// 上传文件到七牛云

48
acs/qd/src/views/system/logicflow/editor/components/DiagramToolbar.vue
View File

@@ -24,40 +24,64 @@
<step-foward size="18" />
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="lock" @click="$_lock"/>
<el-tooltip class="item" effect="dark" content="锁定" placement="top">
<svg-icon class="toolbar-item" icon-class="lock" @click="$_lock"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="unlock" @click="$_unlock"/>
<el-tooltip class="item" effect="dark" content="解锁" placement="top">
<svg-icon class="toolbar-item" icon-class="unlock" @click="$_unlock"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="verticalAlign" @click="$_verticalAlign"/>
<el-tooltip class="item" effect="dark" content="垂直对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="verticalAlign" @click="$_verticalAlign"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="horizontalAlign" @click="$_horizontalAlign"/>
<el-tooltip class="item" effect="dark" content="水平对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="horizontalAlign" @click="$_horizontalAlign"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="leftAlign" @click="$_leftAlign"/>
<el-tooltip class="item" effect="dark" content="左边对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="leftAlign" @click="$_leftAlign"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="rightAlign" @click="$_rightAlign"/>
<el-tooltip class="item" effect="dark" content="右边对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="rightAlign" @click="$_rightAlign"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="upAlign" @click="$_upAlign"/>
<el-tooltip class="item" effect="dark" content="顶部对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="upAlign" @click="$_upAlign"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="downAlign" @click="$_downAlign"/>
<el-tooltip class="item" effect="dark" content="底部对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="downAlign" @click="$_downAlign"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="horizontalDistribution" @click="$_horizontalDistribution"/>
<el-tooltip class="item" effect="dark" content="水平分布" placement="top">
<svg-icon class="toolbar-item" icon-class="verticalDistribution" @click="$_horizontalDistribution"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="verticalDistribution" @click="$_verticalDistribution"/>
<el-tooltip class="item" effect="dark" content="垂直分布" placement="top">
<svg-icon class="toolbar-item" icon-class="horizontalDistribution" @click="$_verticalDistribution"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="clear" @click="$_cleanGraph"/>
<el-tooltip class="item" effect="dark" content="清空画布" placement="top">
<svg-icon class="toolbar-item" icon-class="clear" @click="$_cleanGraph"/>
</el-tooltip>
</div>
<div style="margin-right: 5px">
<svg-icon class="toolbar-item" icon-class="save" @click="$_saveGraph"/>
<el-tooltip class="item" effect="dark" content="保存" placement="top">
<svg-icon class="toolbar-item" icon-class="save" @click="$_saveGraph"/>
</el-tooltip>
</div>
<div>
<el-select v-model="linetype" size="mini" style="width: 80px" @change="$_changeLineType">

3
acs/qd/src/views/system/logicflow/editor/components/PropertyPanel.vue
View File

@@ -135,7 +135,6 @@
</div>
<div class="setting-item">
<span>设备绑定</span>
<!-- <el-input v-model="style.device" placeholder="输入设备号" size="small" @change="$_changeDevice" />-->
<el-select
filterable
v-model="style.device"
@@ -189,7 +188,7 @@
import { Sketch } from 'vue-color'
import { shortStyles, borderStyles, fontFamilies } from '../constant'
import crudStageImage from '@/api/logicflow/stageImage'
import crudDevice, {selectDeviceList} from '@/api/acs/device/device'
import crudDevice from '@/api/acs/device/device'
export default {
components: {

1
acs/qd/src/views/system/logicflow/editor/components/node/html/htmlNode.js
View File

@@ -40,6 +40,7 @@ class ButtonNode extends HtmlResize.view {
let faultDisplay = 'none'
if (properties.imageUrl) { // 与图片尾部拼接
imageUrl = baseUrl + '/file/图片/' + properties.imageUrl
console.log('图片地址：', imageUrl)
}
if (!properties.transform) { // 如果没有值，设置默认为0度
properties.transform = 0