设备监控修改

acs/nladmin-ui/src/assets/icons/svg/clear.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660786702479" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9117" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M736 128l-32-64H320l-32 64H128v128h768V128H736zM192 896a64 64 0 0 0 64 64h512a64 64 0 0 0 64-64V320H192z" p-id="9118" fill="#000000"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/downAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785745738" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4619" width="200" height="200" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 896h896v64H64z" fill="#000000" p-id="4620"></path><path d="M192 832V64h256v768z" fill="#000000" p-id="4621"></path><path d="M576 832V320h256v512z" fill="#000000" p-id="4622"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/horizontalAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660787363495" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11210" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 480h896v64H64z" fill="#000000" p-id="11211"></path><path d="M832 256v512H576V256z" fill="#000000" p-id="11212"></path><path d="M448 128v768H192V128z" fill="#000000" p-id="11213"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/horizontalDistribution.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660786338362" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6924" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M768 938.666667V85.333333h59.733333v853.333334zM196.266667 938.666667V85.333333H256v853.333334z m251.733333-128A64 64 0 0 1 384 746.666667v-469.333334A64 64 0 0 1 448 213.333333h128A64 64 0 0 1 640 277.333333v469.333334a64 64 0 0 1-64 64z" p-id="6925" fill="#000000"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/leftAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785822800" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5157" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 64h64v896H64z" fill="#000000" p-id="5158"></path><path d="M192 192h515v256H192z" fill="#000000" p-id="5159"></path><path d="M192 576h768v256H192z" fill="#000000" p-id="5160"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/rightAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785927475" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5880" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M896 64h64v896h-64z" fill="#000000" p-id="5881"></path><path d="M320 192h512v256H320z" fill="#000000" p-id="5882"></path><path d="M64 576h768v256H64z" fill="#000000" p-id="5883"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/save.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660786920066" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10198" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M643.85952427 262.90530987c-18.01693867 0-32.75707733 14.614528-32.75707734 32.48401066v81.20456534c0 17.86948267 14.74013867 32.489472 32.75707734 32.489472s32.75707733-14.61998933 32.75707733-32.489472v-81.20456534c0-17.86948267-14.74013867-32.48401067-32.75707733-32.48401066z" fill="#2c2c2c" p-id="10199"></path><path d="M910.47417173 313.84644267l-145.784832-207.89111467c-13.09627733-17.86948267-34.39547733-29.23451733-58.966016-30.86199467H175.01825707c-36.03933867 0-65.519616 29.23451733-65.519616 64.96802134v745.49930666c0 35.733504 29.48027733 63.34600533 65.519616 63.34600534h689.586176c36.03933867 0 63.88667733-29.23997867 63.88667733-63.34600534v-526.23223466c1.6384-17.86948267-6.54813867-34.111488-18.01693867-45.481984zM205.0555904 171.87908267h517.59786667v220.889088c0 30.85653333-26.2144 58.46903467-58.966016 58.46903466H264.0216064c-32.76253867 0-58.966016-25.985024-58.966016-58.46903466V171.87908267z m544.25572693 665.059328h-462.60770133c-24.6382592 0-44.61253973-20.29431467-44.61253973-45.32906667s19.97318827-45.32906667 44.61253973-45.32906667h462.60770133c24.6382592 0 44.61253973 20.29431467 44.61253974 45.32906667s-19.97428053 45.32906667-44.61253974 45.32906667z m0.00109227-167.10587734H286.70252373c-24.6382592 0-44.61253973-20.29431467-44.61253973-45.32906666s19.97318827-45.32906667 44.61253973-45.32906667h462.61097814c24.6382592 0 44.61253973 20.29431467 44.61253973 45.32906667s-19.97428053 45.32906667-44.613632 45.32906666z" fill="#000000" p-id="10200"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/upAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785897716" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5639" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 64h896v64H64z" fill="#000000" p-id="5640"></path><path d="M192 960V192h256v768z" fill="#000000" p-id="5641"></path><path d="M576 704V192h256v512z" fill="#000000" p-id="5642"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/verticalAlign.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660785982322" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6318" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M480 64h64v896h-64z" fill="#000000" p-id="6319"></path><path d="M256 192h512v256H256z" fill="#000000" p-id="6320"></path><path d="M128 576h768v256H128z" fill="#000000" p-id="6321"></path></svg>

acs/nladmin-ui/src/assets/icons/svg/verticalDistribution.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660786309837" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6643" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M85.333333 827.733333V768h853.333334v59.733333zM277.333333 640A64 64 0 0 1 213.333333 576v-128A64 64 0 0 1 277.333333 384h469.333334a64 64 0 0 1 64 64v128a64 64 0 0 1-64 64zM85.333333 256V196.266667h853.333334V256z" p-id="6644" fill="#000000"></path></svg>

acs/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="diagram">
     <diagram-toolbar
+      style="z-index: 1"
       v-if="lf"
       class="diagram-toolbar"
       :lf="lf"
@@ -37,6 +38,7 @@
       :only-edge="activeNodes.length === 0"
       :elements-style="properties"
       :show-choice="showChoice"
+      :node="nodeObj"
       @setStyle="$_setStyle"
       @setZIndex="$_setZIndex"
     />
@@ -92,7 +94,8 @@ export default {
       nodeSize: {
         width: '',
         heigh: ''
-      }
+      },
+      nodeObj: {} // 给子组件传递信息 -- 下拉框实时更新信息
     }
   },
   mounted() {
@@ -144,29 +147,6 @@ export default {
       registerCustomElement(lf)
       lf.setDefaultEdgeType('pro-polyline')
 
-      // 为菜单追加选项（必须在 lf.render() 之前设置）
-      lf.extension.menu.addMenuConfig({
-        nodeMenu: [
-          {
-            text: '绑定设备号',
-            callback(node) {
-              console.log(lf.graphModel.getNodeModelById(node.id))
-              lf.graphModel.getNodeModelById(node.id).draggable = false
-            }
-          },
-          {
-            text: '属性',
-            callback(node) {
-              alert(`
-                节点ID：${node.id}
-                节点类型：${node.type}
-                节点坐标：(x: ${node.x}, y: ${node.y})`
-              )
-            }
-          }
-        ],
-        edgeMenu: []
-      })
       lf.render(data)
       this.lf = lf
       this.lf.on('selection:selected,node:click,blank:click,edge:click', () => { // 选择/点击事件
@@ -187,6 +167,8 @@ export default {
       console.log('选中的节点', nodes)
       // const graphModel = this.lf.graphModel
       // console.log(graphModel)
+      // 只传第一个,以第一个为显示是否绑定设备等信息，其余显示正常不用处理
+      this.nodeObj = nodes[0]
       nodes.forEach(node => {
         if (node.type === 'html-node') {
           this.showChoice = true

acs/nladmin-ui/src/views/system/logicflow/editor/components/DiagramToolbar.vue

@@ -24,40 +24,64 @@
       <step-foward size="18" />
     </div>
     <div style="margin-right: 5px">
-      <el-button size="mini" type="primary" @click="$_lock">锁定</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_unlock">解锁</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_verticalAlign">垂直居中</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_horizontalAlign">水平居中</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_leftAlign">向左对齐</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_rightAlign">向右对齐</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_upAlign">向上对齐</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_downAlign">向下对齐</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_horizontalDistribution">水平分布</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_verticalDistribution">垂直分布</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_cleanGraph">清空画布</el-button>
+      <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">
-      <el-button size="mini" type="primary" @click="$_saveGraph">保存</el-button>
+      <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" @change="$_changeLineType" style="width: 80px">

acs/nladmin-ui/src/views/system/logicflow/editor/components/PropertyPanel.vue

@@ -34,6 +34,56 @@
           <div slot="reference" class="border-color" :style="{'backgroundColor': style.gradientColor}" />
         </el-popover>
       </div>
+      <div class="setting-item">
+        <span>设备绑定</span>
+        <el-select
+          filterable
+          clearable
+          v-model="style.device"
+          size="mini"
+          @change="$_changeDevice"
+        >
+          <el-option
+            v-for="item in deviceCodeOptions"
+            :key="item.device_id"
+            :value="item.device_code"
+            :label="item.device_code"
+          >
+            <span style="float: left">{{ item.device_code }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.device_name }}</span>
+          </el-option>
+        </el-select>
+      </div>
+      <div class="setting-item">
+        <span>旋转角度</span>
+        <el-input-number
+          v-model="style.transform"
+          controls-position="right"
+          size="mini"
+          :min="0"
+          :max="360"
+          :step="90"
+          @change="$_changeTransform"
+        />
+        <span>度</span>
+      </div>
+      <div v-if="showChoice" class="setting-item">
+        <span>设备选择</span>
+        <el-select
+          filterable
+          clearable
+          v-model="style.imageUrl"
+          size="mini"
+          @change="$_changeImageUrl"
+        >
+          <el-option
+            v-for="item in imageUrlOptions"
+            :key="item.image_uuid"
+            :value="item.image_code"
+            :label="item.image_name"
+          />
+        </el-select>
+      </div>
       <div class="setting-item">
         <span>线条样式</span>
         <el-select v-model="style.borderStyle" size="small" @change="$_selectBorder">
@@ -133,37 +183,6 @@
         <el-button size="small" @click="$emit('setZIndex', 'top')">置为顶部</el-button>
         <el-button size="small" @click="$emit('setZIndex', 'bottom')">置为底部</el-button>
       </div>
-      <div class="setting-item">
-        <span>设备绑定</span>
-        <el-input v-model="style.device" placeholder="输入设备号" size="small" @change="$_changeDevice" />
-      </div>
-      <div class="setting-item">
-        <span>旋转角度</span>
-        <el-input-number
-          v-model="style.transform"
-          controls-position="right"
-          size="mini"
-          :min="0"
-          :max="360"
-          @change="$_changeTransform"
-        />
-        <span>度</span>
-      </div>
-      <div v-if="showChoice" class="setting-item">
-        <span>设备选择</span>
-        <el-select
-          v-model="style.imageUrl"
-          size="mini"
-          @change="$_changeImageUrl"
-        >
-          <el-option
-            v-for="item in imageUrlOptions"
-            :key="item.image_uuid"
-            :value="item.image_code"
-            :label="item.image_name"
-          />
-        </el-select>
-      </div>
     </div>
   </div>
 </template>
@@ -172,6 +191,7 @@
 import { Sketch } from 'vue-color'
 import { shortStyles, borderStyles, fontFamilies } from '../constant'
 import crudStageImage from '@/api/logicflow/stageImage'
+import crudDevice from '@/api/acs/device/device'
 
 export default {
   components: {
@@ -180,7 +200,8 @@ export default {
   props: {
     elementsStyle: Object,
     onlyEdge: Boolean, // 是否是只设置边的属性，当只设置边的属性时，隐藏快捷样式和背景色设置
-    showChoice: Boolean
+    showChoice: Boolean,
+    node: Object // 父组件传来的对象
   },
   data() {
     return {
@@ -209,7 +230,8 @@ export default {
       fontWeight: '', // 文本加粗
       lineHeightOptions: Array(5).fill(1).map((_, i) => _ + i * 0.5),
       // imageUrl: '',
-      imageUrlOptions: []
+      imageUrlOptions: [],
+      deviceCodeOptions: []
     }
   },
   watch: {
@@ -218,10 +240,16 @@ export default {
         this.style = { ...this.style, ...val }
       },
       immediate: true
+    },
+    node(newVal, oldVal) {
+      // newVal是新值，oldVal是旧值
+      this.node = newVal
+      this.cleanParam()
     }
   },
   created() {
     this.initStageIconList()
+    this.initDevicesList()
   },
   methods: {
     initStageIconList() { // 初始化图标数据
@@ -232,6 +260,12 @@ export default {
         this.imageUrlOptions = data
       })
     },
+    initDevicesList() {
+      crudDevice.selectDeviceList().then(res => {
+        console.log('devices:', res)
+        this.deviceCodeOptions = res
+      })
+    },
     setStyle(item) {
       this.$emit('setStyle', item)
     },
@@ -319,6 +353,17 @@ export default {
       this.$emit('setStyle', {
         device: val
       })
+    },
+    cleanParam() { // 判断来清空下拉框
+      if (this.node.properties.device === undefined) {
+        this.style.device = ''
+      }
+      if (this.node.properties.imageUrl === undefined) {
+        this.style.imageUrl = ''
+      }
+      if (this.node.properties.transform === undefined) {
+        this.style.transform = 0
+      }
     }
   }
 }

acs/nladmin-ui/src/views/system/monitor/device/index.vue

@@ -20,7 +20,7 @@ export default {
   name: 'MonitorDevice',
   data() {
     return {
-      stageParam: 'test', // 舞台参数
+      stageParam: 'YY', // 舞台参数
       dialogDeviceMsgVisible: false,
       device_code: null,
       tops: '20vh',

lms/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java

@@ -37,7 +37,7 @@ import java.util.Map;
  */
 @Slf4j
 @RestController
-@RequestMapping("/mobile/auth")
+@RequestMapping("/api/pda")
 @RequiredArgsConstructor
 @Api(tags = "手持：系统授权接口")
 public class MobileAuthorizationController {

lms/nladmin-system/src/main/java/org/nl/wms/pda/login/rest/HandLoginController.java

@@ -1,136 +0,0 @@
-//
-//package org.nl.wms.pda.login.rest;
-//
-//
-//import cn.hutool.core.map.MapUtil;
-//import cn.hutool.core.util.StrUtil;
-//import com.alibaba.fastjson.JSONObject;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.RequiredArgsConstructor;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
-//import org.nl.modules.common.config.RsaProperties;
-//import org.nl.modules.common.exception.BadRequestException;
-//import org.nl.modules.common.utils.RsaUtils;
-//import org.nl.modules.common.utils.SecurityUtils;
-//import org.nl.modules.logging.annotation.Log;
-//import org.nl.modules.security.service.OnlineUserService;
-//
-//import org.nl.modules.system.service.UserService;
-//import org.nl.modules.system.service.dto.UserDto;
-//
-//import org.nl.wms.pda.login.service.HandLoginService;
-//import org.springframework.http.HttpStatus;
-//import org.springframework.http.ResponseEntity;
-//
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.util.Map;
-//
-///**
-// * @author ldjun
-// * @date 2021-07-26
-// **/
-//@RestController
-//@RequiredArgsConstructor
-//@Api(tags = "手持登陆")
-//@RequestMapping("api/pda")
-//@Slf4j
-//public class HandLoginController {
-//    private final HandLoginService handLoginService;
-//    private final UserService userService;
-//    private final OnlineUserService onlineUserService;
-//
-//    @PostMapping("/handlogin")
-//    @Log("手持登陆验证")
-//    @ApiOperation("手持登陆验证")
-//    public ResponseEntity<Object> handlogin(@RequestBody Map<String, String> whereJson, HttpServletRequest request) {
-//        JSONObject resultJson = new JSONObject();
-//        MapUtil.getStr(whereJson, "user");
-//        String user = MapUtil.getStr(whereJson, "user");
-//        String password = MapUtil.getStr(whereJson, "password");
-//        String nick_name = "";
-//        if (StrUtil.isEmpty(user)) {
-//            throw new BadRequestException("用户不能为空");
-//
-//        }
-//        if (StrUtil.isEmpty("device_id")) {
-//            resultJson.put("code", "0");
-//            resultJson.put("desc", "设备不能为空");
-//            // return resultJson;
-//        }
-//        if (StrUtil.isEmpty(password)) {
-//            throw new BadRequestException("密码不能为空！");
-//        }
-//        boolean is_match = false;
-//        Long account_id = 0L;
-//        try {
-//            String pwd = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, password);
-//            UserDto userDto = userService.findByName(user);
-//            account_id = userDto.getId();
-//            nick_name =userDto.getNickName();
-//            is_match = passwordEncoder.matches(pwd, userDto.getPassword());
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//
-//        if (is_match) {
-//            resultJson.put("code", "1");
-//            resultJson.put("desc", "登陆成功");
-//        } else {
-//            resultJson.put("code", "0");
-//            resultJson.put("desc", "登陆失败！");
-//        }
-//        UserDetails userDetails = userDetailsService.loadUserByUsername(user);
-//        Authentication authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
-//        SecurityContextHolder.getContext().setAuthentication(authentication);
-//        String token = tokenProvider.createToken(authentication);
-//        final JwtUserDto jwtUserDto = (JwtUserDto) authentication.getPrincipal();
-//        // 保存在线信息
-//        onlineUserService.save(jwtUserDto, token, request);
-//
-//        JSONObject jo = new JSONObject();
-//        jo.put("user_name", user);
-//        jo.put("nick_name", nick_name);
-//        jo.put("token", properties.getTokenStartWith() + token);
-//        jo.put("account_id", account_id.toString());
-//        resultJson.put("result", jo);
-//
-//        return new ResponseEntity<>(resultJson, HttpStatus.OK);
-//    }
-//
-//    @PostMapping("/authority")
-//    @Log("手持登陆查询权限")
-//    @ApiOperation("手持登陆查询权限")
-//    public ResponseEntity<Object> queryAuthority(@RequestBody Map<String, String> whereJson) {
-//        return new ResponseEntity<>(handLoginService.queryAuthority(whereJson), HttpStatus.OK);
-//    }
-//
-//    @ApiOperation("修改密码")
-//    @Log("手持修改密码")
-//    @PostMapping(value = "/updatePass")
-//    public ResponseEntity<Object> updatePass(@RequestBody Map<String, String> whereJson) throws Exception {
-//        String RfoldPass = MapUtil.getStr(whereJson, "RfoldPass");
-//        String RfnewPass = MapUtil.getStr(whereJson, "RfnewPass");
-//        String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, RfoldPass);
-//        String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, RfnewPass);
-//        UserDto user = userService.findByName(SecurityUtils.getCurrentUsername());
-//        if (!passwordEncoder.matches(oldPass, user.getPassword())) {
-//            throw new BadRequestException("修改失败，旧密码错误");
-//        }
-//        if (passwordEncoder.matches(newPass, user.getPassword())) {
-//            throw new BadRequestException("新密码不能与旧密码相同");
-//        }
-//        userService.updatePass(user.getUsername(), passwordEncoder.encode(newPass));
-//        JSONObject returnjo = new JSONObject();
-//        returnjo.put("code", "1");
-//        returnjo.put("desc", "修改密码成功！");
-//        return new ResponseEntity<>(returnjo, HttpStatus.OK);
-//    }
-//}

lms/nladmin-system/src/main/java/org/nl/wms/pda/login/service/HandLoginService.java

@@ -1,22 +0,0 @@
-//package org.nl.wms.pda.login.service;
-//
-//import java.util.Map;
-//
-//public interface HandLoginService {
-//    /**
-//     * 手持登陆
-//     *
-//     * @param jsonObject 条件
-//     * @return Map<String, Object>
-//     */
-//    Map<String, Object> handleLogin(Map<String, String> jsonObject);
-//
-//    /**
-//     * 手持登陆查询权限
-//     *
-//     * @param jsonObject 条件
-//     * @return Map<String, Object>
-//     */
-//    Map<String, Object> queryAuthority(Map<String, String> jsonObject);
-//
-//}

lms/nladmin-system/src/main/java/org/nl/wms/pda/login/service/impl/HandLoginServiceImpl.java

@@ -1,112 +0,0 @@
-//package org.nl.wms.pda.login.service.impl;
-//
-//import cn.hutool.core.util.StrUtil;
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import lombok.RequiredArgsConstructor;
-//import lombok.SneakyThrows;
-//import lombok.extern.slf4j.Slf4j;
-//
-//
-//import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
-//import org.nl.modules.common.config.RsaProperties;
-//import org.nl.modules.common.utils.SecurityUtils;
-//import org.nl.modules.security.service.OnlineUserService;
-//
-//import org.nl.modules.system.service.UserService;
-//import org.nl.modules.system.service.dto.UserDto;
-//import org.nl.modules.wql.WQL;
-//import org.nl.utils.RsaUtils;
-//
-//import org.nl.wms.pda.login.service.HandLoginService;
-//
-//
-//
-//
-//import org.springframework.stereotype.Service;
-//
-//import java.util.Map;
-//
-//@Service
-//@RequiredArgsConstructor
-//@Slf4j
-//public class HandLoginServiceImpl implements HandLoginService {
-//
-//    private final UserService userService;
-//
-//    private final OnlineUserService onlineUserService;
-//
-//    @SneakyThrows
-//    @Override
-//    public Map<String, Object> handleLogin(Map<String, String> jsonObject) {
-//        JSONObject resultJson = new JSONObject();
-//        String user = jsonObject.get("user");
-//        String password = jsonObject.get("password");
-//        boolean is_match = false;
-//        Long account_id = 0L;
-//        try {
-//            String pwd = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, password);
-//            UserDto userDto = userService.findByName(user);
-//            account_id = userDto.getId();
-//            is_match = passwordEncoder.matches(pwd, userDto.getPassword());
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//
-//        if (is_match) {
-//            resultJson.put("code", "1");
-//            resultJson.put("desc", "登陆成功");
-//        } else {
-//            resultJson.put("code", "0");
-//            resultJson.put("desc", "登陆失败！");
-//        }
-//        UserDetails userDetails = userDetailsService.loadUserByUsername(user);
-//        Authentication authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
-//        SecurityContextHolder.getContext().setAuthentication(authentication);
-//        String token = tokenProvider.createToken(authentication);
-//        final JwtUserDto jwtUserDto = (JwtUserDto) authentication.getPrincipal();
-//        // 保存在线信息
-//        onlineUserService.save(jwtUserDto, token, null);
-//        JSONObject jo = new JSONObject();
-//        jo.put("user_name", user);
-//        jo.put("token", properties.getTokenStartWith() + token);
-//        jo.put("account_id", account_id.toString());
-//        resultJson.put("result", jo);
-//        return resultJson;
-//
-//    }
-//
-//    @Override
-//    public Map<String, Object> queryAuthority(Map<String, String> jsonObject) {
-//        String accountId = String.valueOf(SecurityUtils.getCurrentUserId());
-//        JSONObject returnjo = new JSONObject();
-//        if (StrUtil.isEmpty(accountId)) {
-//            returnjo.put("code", "0");
-//            returnjo.put("desc", "用户id不能为空！");
-//            returnjo.put("result", new JSONArray());
-//        }
-//        //查询一级
-//        JSONObject result = WQL.getWO("QPADSTSETSERVICE").addParam("flag", "4").addParam("accountId", accountId).addParam("component", "0").process().uniqueResult(0);
-//
-//        //查询二级
-//        //JSONArray SecondResults = WQL.getWO("QPADSTSETSERVICE").addParam("flag", "4").addParam("accountId", accountId).addParam("component", "1").process().getResultJSONArray(0);
-//        //查询三级
-//    /*    JSONArray roleTree = new JSONArray();
-//        for (int i = 0; i < SecondResults.size(); i++) {
-//            JSONObject row = SecondResults.getJSONObject(i);
-//            String menu_id = row.getString("menu_id");
-//            JSONArray ThirdResults = WQL.getWO("QPADSTSETSERVICE").addParam("flag", "4").addParam("accountId", accountId).addParam("component", "2").addParam("pid", menu_id).process().getResultJSONArray(0);
-//            row.put("sonTree", ThirdResults);
-//            roleTree.add(row);
-//        }*/
-//        JSONArray ThirdResults = WQL.getWO("QPADSTSETSERVICE").addParam("flag", "4").addParam("accountId", accountId).addParam("component", "2").process().getResultJSONArray(0);
-//
-//        result.put("sonTree", ThirdResults);
-//
-//        returnjo.put("code", "1");
-//        returnjo.put("desc", "查询成功！");
-//        returnjo.put("result", result);
-//        return returnjo;
-//    }
-//}

lms/nladmin-system/src/main/java/org/nl/wms/pda/login/test.java

@@ -0,0 +1,9 @@
+package org.nl.wms.pda.login;
+
+/**
+ * @author: lyd
+ * @description:
+ * @Date: 2022/10/22
+ */
+public class test {
+}

lms/nladmin-ui/src/views/loki/view/index.vue

@@ -325,6 +325,7 @@ export default {
         }
         var ansi_up = new AnsiUp()
         logOperation.getLogData(queryParam).then(res => {
+          console.log(res)
           this.showEmpty = false
           if (res.data.result.length === 1) {
             const log = res.data.result[0].values