汪菘 2 years ago
parent
commit
cc2fda6ad6
  1. 4
      acs/qd/src/views/acs/route/routeLine/index.vue
  2. 2
      acs/qd/src/views/monitor/logback/index.vue
  3. 2
      acs/qd/src/views/system/logicflow/editor/components/Diagram.vue
  4. 26
      acs/qd/src/views/system/logicflow/editor/components/DiagramToolbar.vue
  5. 4
      acs/qd/src/views/system/logicflow/editor/components/PropertyPanel.vue
  6. 4
      acs/qd/src/views/system/logicflow/monitor/index.vue

4
acs/qd/src/views/acs/route/routeLine/index.vue

@ -90,7 +90,7 @@
v-model="form.device_code" v-model="form.device_code"
filterable filterable
clearable clearable
reserveKeyword reserve-keyword
multiple multiple
placeholder="请选择" placeholder="请选择"
style="width: 370px;" style="width: 370px;"
@ -110,7 +110,7 @@
filterable filterable
clearable clearable
multiple multiple
reserveKeyword reserve-keyword
placeholder="请选择" placeholder="请选择"
style="width: 370px;" style="width: 370px;"
> >

2
acs/qd/src/views/monitor/logback/index.vue

@ -29,7 +29,7 @@
<el-radio label="forward">forward</el-radio> <el-radio label="forward">forward</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="时间范围" style="margin-left: 10px" v-show="!showOptions"> <el-form-item v-show="!showOptions" label="时间范围" style="margin-left: 10px">
<el-date-picker <el-date-picker
v-model="timeRange" v-model="timeRange"
size="mini" size="mini"

2
acs/qd/src/views/system/logicflow/editor/components/Diagram.vue

@ -1,8 +1,8 @@
<template> <template>
<div class="diagram"> <div class="diagram">
<diagram-toolbar <diagram-toolbar
style="z-index: 1"
v-if="lf" v-if="lf"
style="z-index: 1"
class="diagram-toolbar" class="diagram-toolbar"
:lf="lf" :lf="lf"
:active-edges="activeEdges" :active-edges="activeEdges"

26
acs/qd/src/views/system/logicflow/editor/components/DiagramToolbar.vue

@ -25,62 +25,62 @@
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="锁定" placement="top"> <el-tooltip class="item" effect="dark" content="锁定" placement="top">
<svg-icon class="toolbar-item" icon-class="lock" @click="$_lock"/> <svg-icon class="toolbar-item" icon-class="lock" @click="$_lock" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="解锁" placement="top"> <el-tooltip class="item" effect="dark" content="解锁" placement="top">
<svg-icon class="toolbar-item" icon-class="unlock" @click="$_unlock"/> <svg-icon class="toolbar-item" icon-class="unlock" @click="$_unlock" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="垂直对齐" placement="top"> <el-tooltip class="item" effect="dark" content="垂直对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="verticalAlign" @click="$_verticalAlign"/> <svg-icon class="toolbar-item" icon-class="verticalAlign" @click="$_verticalAlign" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="水平对齐" placement="top"> <el-tooltip class="item" effect="dark" content="水平对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="horizontalAlign" @click="$_horizontalAlign"/> <svg-icon class="toolbar-item" icon-class="horizontalAlign" @click="$_horizontalAlign" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="左边对齐" placement="top"> <el-tooltip class="item" effect="dark" content="左边对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="leftAlign" @click="$_leftAlign"/> <svg-icon class="toolbar-item" icon-class="leftAlign" @click="$_leftAlign" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="右边对齐" placement="top"> <el-tooltip class="item" effect="dark" content="右边对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="rightAlign" @click="$_rightAlign"/> <svg-icon class="toolbar-item" icon-class="rightAlign" @click="$_rightAlign" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="顶部对齐" placement="top"> <el-tooltip class="item" effect="dark" content="顶部对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="upAlign" @click="$_upAlign"/> <svg-icon class="toolbar-item" icon-class="upAlign" @click="$_upAlign" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="底部对齐" placement="top"> <el-tooltip class="item" effect="dark" content="底部对齐" placement="top">
<svg-icon class="toolbar-item" icon-class="downAlign" @click="$_downAlign"/> <svg-icon class="toolbar-item" icon-class="downAlign" @click="$_downAlign" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="水平分布" placement="top"> <el-tooltip class="item" effect="dark" content="水平分布" placement="top">
<svg-icon class="toolbar-item" icon-class="verticalDistribution" @click="$_horizontalDistribution"/> <svg-icon class="toolbar-item" icon-class="verticalDistribution" @click="$_horizontalDistribution" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="垂直分布" placement="top"> <el-tooltip class="item" effect="dark" content="垂直分布" placement="top">
<svg-icon class="toolbar-item" icon-class="horizontalDistribution" @click="$_verticalDistribution"/> <svg-icon class="toolbar-item" icon-class="horizontalDistribution" @click="$_verticalDistribution" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="清空画布" placement="top"> <el-tooltip class="item" effect="dark" content="清空画布" placement="top">
<svg-icon class="toolbar-item" icon-class="clear" @click="$_cleanGraph"/> <svg-icon class="toolbar-item" icon-class="clear" @click="$_cleanGraph" />
</el-tooltip> </el-tooltip>
</div> </div>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<el-tooltip class="item" effect="dark" content="保存" placement="top"> <el-tooltip class="item" effect="dark" content="保存" placement="top">
<svg-icon class="toolbar-item" icon-class="save" @click="$_saveGraph"/> <svg-icon class="toolbar-item" icon-class="save" @click="$_saveGraph" />
</el-tooltip> </el-tooltip>
</div> </div>
<div> <div>
@ -95,7 +95,7 @@
</div> </div>
<div> <div>
<span style="font-size: 14px; margin-left: 5px">舞台:</span> <span style="font-size: 14px; margin-left: 5px">舞台:</span>
<el-select v-model="stage_code" placeholder="请选择" @change="$_changeStage" size="mini"> <el-select v-model="stage_code" placeholder="请选择" size="mini" @change="$_changeStage">
<el-option <el-option
v-for="item in stageSelectList" v-for="item in stageSelectList"
:key="item.stage_code" :key="item.stage_code"

4
acs/qd/src/views/system/logicflow/editor/components/PropertyPanel.vue

@ -37,9 +37,9 @@
<div class="setting-item"> <div class="setting-item">
<span>设备绑定</span> <span>设备绑定</span>
<el-select <el-select
v-model="style.device"
filterable filterable
clearable clearable
v-model="style.device"
size="mini" size="mini"
@change="$_changeDevice" @change="$_changeDevice"
> >
@ -70,9 +70,9 @@
<div v-if="showChoice" class="setting-item"> <div v-if="showChoice" class="setting-item">
<span>设备选择</span> <span>设备选择</span>
<el-select <el-select
v-model="style.imageUrl"
filterable filterable
clearable clearable
v-model="style.imageUrl"
size="mini" size="mini"
@change="$_changeImageUrl" @change="$_changeImageUrl"
> >

4
acs/qd/src/views/system/logicflow/monitor/index.vue

@ -1,7 +1,7 @@
<template> <template>
<div style="overflow: hidden" > <div style="overflow: hidden">
<el-row> <el-row>
<div id="container" className="container" style="min-height: 100%"/> <div id="container" className="container" style="min-height: 100%" />
</el-row> </el-row>
<!--点击设备显示信息--> <!--点击设备显示信息-->
<el-dialog <el-dialog

Loading…
Cancel
Save