装饰部分（）未完成

report-ui/src/assets/iconfont/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe646;</span>
+                <div class="name">个性装扮</div>
+                <div class="code-name">&amp;#xe646;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe72e;</span>
                 <div class="name">仪表盘-抄表</div>
@@ -678,9 +684,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1624933667537') format('woff2'),
+  src: url('iconfont.woff2?t=1624957634973') format('woff2'),
-       url('iconfont.woff?t=1624933667537') format('woff'),
+       url('iconfont.woff?t=1624957634973') format('woff'),
-       url('iconfont.ttf?t=1624933667537') format('truetype');
+       url('iconfont.ttf?t=1624957634973') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -706,6 +712,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icongexingzhuangban"></span>
+            <div class="name">
+              个性装扮
+            </div>
+            <div class="code-name">.icongexingzhuangban
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont iconyibiaopan-chaobiao"></span>
             <div class="name">
@@ -1642,6 +1657,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icongexingzhuangban"></use>
+                </svg>
+                <div class="name">个性装扮</div>
+                <div class="code-name">#icongexingzhuangban</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#iconyibiaopan-chaobiao"></use>

report-ui/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1513211 */
-  src: url('iconfont.woff2?t=1624933667537') format('woff2'),
+  src: url('iconfont.woff2?t=1624957634973') format('woff2'),
-       url('iconfont.woff?t=1624933667537') format('woff'),
+       url('iconfont.woff?t=1624957634973') format('woff'),
-       url('iconfont.ttf?t=1624933667537') format('truetype');
+       url('iconfont.ttf?t=1624957634973') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icongexingzhuangban:before {
+  content: "\e646";
+}
+
 .iconyibiaopan-chaobiao:before {
   content: "\e72e";
 }

report-ui/src/assets/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "13087633",
+      "name": "个性装扮",
+      "font_class": "gexingzhuangban",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
     {
       "icon_id": "16466332",
       "name": "仪表盘-抄表",

report-ui/src/views/report/bigscreen/designer/index.vue

@@ -6,23 +6,21 @@
  !-->
 <template>
   <div class="layout">
-    <div
+    <div v-if="toolIsShow"
-      v-if="toolIsShow"
+         class="layout-left"
-      class="layout-left"
+         :style="{ width: widthLeftForTools + 'px' }">
-      :style="{ width: widthLeftForTools + 'px' }"
+      <el-tabs type="border-card"
-    >
+               :stretch="true">
-      <el-tabs type="border-card" :stretch="true">
         <!-- 左侧组件栏-->
         <el-tab-pane label="工具栏">
           <!-- <el-divider content-position="center">html</el-divider>-->
-          <draggable
+          <draggable v-for="widget in widgetTools"
-            v-for="widget in widgetTools"
+                     :key="widget.code"
-            :key="widget.code"
+                     @end="evt => widgetOnDragged(evt, widget.code)">
-            @end="evt => widgetOnDragged(evt, widget.code)"
-          >
             <div class="tools-item">
               <span class="tools-item-icon">
-                <i class="iconfont" :class="widget.icon"></i>
+                <i class="iconfont"
+                   :class="widget.icon"></i>
               </span>
               <span class="tools-item-text">{{ widget.label }}</span>
             </div>
@@ -30,15 +28,14 @@
         </el-tab-pane>
         <!-- 左侧图层-->
         <el-tab-pane label="图层">
-          <div
+          <div v-for="(item, index) in layerWidget"
-            v-for="(item, index) in layerWidget"
+               :key="index"
-            :key="index"
+               class="tools-item"
-            class="tools-item"
+               :class="widgetIndex == index ? 'is-active' : ''"
-            :class="widgetIndex == index ? 'is-active' : ''"
+               @click="layerClick(index)">
-            @click="layerClick(index)"
-          >
             <span class="tools-item-icon">
-              <i class="iconfont" :class="item.icon"></i>
+              <i class="iconfont"
+                 :class="item.icon"></i>
             </span>
             <span class="tools-item-text">{{ item.label }}</span>
           </div>
@@ -46,61 +43,78 @@
       </el-tabs>
     </div>
 
-    <div
+    <div class="layout-left-fold"
-      class="layout-left-fold"
+         :style="{ width: widthLeftForToolsHideButton + 'px' }"
-      :style="{ width: widthLeftForToolsHideButton + 'px' }"
+         @click="toolIsShow = !toolIsShow">
-      @click="toolIsShow = !toolIsShow"
-    >
       <i class="iconfont iconzhankai" />
     </div>
 
-    <div
+    <div class="layout-middle"
-      class="layout-middle"
+         :style="{ width: middleWidth + 'px', height: middleHeight + 'px' }">
-      :style="{ width: middleWidth + 'px', height: middleHeight + 'px' }"
-    >
       <div class="top-button">
+        <span class="btn border-right">
+          <ul class="nav">
+            <li><i class="el-icon-brush"></i>
+              <ul>
+                <li>
+                  <div><i class="el-icon-full-screen mr10"></i>边框 <i class="el-icon-arrow-right ml20"></i></div>
+                  <ul class="three-level">
+                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">三级菜单项</a></li>
+                  </ul>
+                </li>
+                <li>
+                  <div><i class="el-icon-magic-stick mr10"></i>装饰<i class="el-icon-arrow-right ml20"></i></div>
+                  <ul class="three-level">
+                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">三级菜单项</a></li>
+                  </ul>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </span>
         <span class="btn">
-          <el-tooltip
+          <el-tooltip class="item"
-            class="item"
+                      effect="dark"
-            effect="dark"
+                      content="保存"
-            content="保存"
+                      placement="bottom">
-            placement="bottom"
+            <i class="iconfont iconsave"
-          >
+               @click="saveData"></i>
-            <i class="iconfont iconsave" @click="saveData"></i>
           </el-tooltip>
         </span>
         <span class="btn">
-          <el-tooltip
+          <el-tooltip class="item"
-            class="item"
+                      effect="dark"
-            effect="dark"
+                      content="预览"
-            content="预览"
+                      placement="bottom">
-            placement="bottom"
+            <i class="iconfont iconyulan"
-          >
+               @click="viewScreen"></i>
-            <i class="iconfont iconyulan" @click="viewScreen"></i>
           </el-tooltip>
         </span>
       </div>
-      <div
+      <div class="workbench-container"
-        class="workbench-container"
+           :style="{
-        :style="{
           width: bigscreenWidthInWorkbench + 'px',
           height: bigscreenHeightInWorkbench + 'px'
         }"
-        @mousedown="handleMouseDown"
+           @mousedown="handleMouseDown">
-      >
+        <vue-ruler-tool v-model="dashboard.presetLine"
-        <vue-ruler-tool
+                        class="vueRuler"
-          v-model="dashboard.presetLine"
+                        :step-length="50"
-          class="vueRuler"
+                        :parent="true"
-          :step-length="50"
+                        :position="'relative'"
-          :parent="true"
+                        :is-scale-revise="true"
-          :position="'relative'"
+                        :visible.sync="dashboard.presetLineVisible">
-          :is-scale-revise="true"
+          <div id="workbench"
-          :visible.sync="dashboard.presetLineVisible"
+               class="workbench"
-        >
+               :style="{
-          <div
-            id="workbench"
-            class="workbench"
-            :style="{
               transform: workbenchTransform,
               width: bigscreenWidth + 'px',
               height: bigscreenHeight + 'px',
@@ -113,70 +127,56 @@
               'background-origin': 'initial',
               'background-clip': 'initial'
             }"
-            @click.self="setOptionsOnClickScreen"
+               @click.self="setOptionsOnClickScreen">
-          >
+            <widget ref="widgets"
-            <widget
+                    v-for="(widget, index) in widgets"
-              ref="widgets"
+                    :key="index"
-              v-for="(widget, index) in widgets"
+                    v-model="widget.value"
-              :key="index"
+                    :index="index"
-              v-model="widget.value"
+                    :type="widget.type"
-              :index="index"
+                    :bigscreen="{ bigscreenWidth, bigscreenHeight }"
-              :type="widget.type"
+                    @onActivated="setOptionsOnClickWidget"
-              :bigscreen="{ bigscreenWidth, bigscreenHeight }"
+                    @contextmenu.prevent.native="rightClick($event, index)"
-              @onActivated="setOptionsOnClickWidget"
+                    @mousedown.prevent.native="widgetsClick(index)" />
-              @contextmenu.prevent.native="rightClick($event, index)"
-              @mousedown.prevent.native="widgetsClick(index)"
-            />
           </div>
         </vue-ruler-tool>
       </div>
     </div>
 
-    <div class="layout-right" :style="{ width: widthLeftForOptions + 'px' }">
+    <div class="layout-right"
-      <el-tabs v-model="activeName" type="border-card" :stretch="true">
+         :style="{ width: widthLeftForOptions + 'px' }">
-        <el-tab-pane
+      <el-tabs v-model="activeName"
-          v-if="
+               type="border-card"
+               :stretch="true">
+        <el-tab-pane v-if="
             isNotNull(widgetOptions.setup) || isNotNull(widgetOptions.collapse)
           "
-          name="first"
+                     name="first"
-          label="配置"
+                     label="配置">
-        >
+          <dynamicForm ref="formData"
-          <dynamicForm
+                       :options="widgetOptions.setup"
-            ref="formData"
+                       @onChanged="val => widgetValueChanged('setup', val)" />
-            :options="widgetOptions.setup"
-            @onChanged="val => widgetValueChanged('setup', val)"
-          />
         </el-tab-pane>
-        <el-tab-pane
+        <el-tab-pane v-if="isNotNull(widgetOptions.data)"
-          v-if="isNotNull(widgetOptions.data)"
+                     name="second"
-          name="second"
+                     label="数据">
-          label="数据"
+          <dynamicForm ref="formData"
-        >
+                       :options="widgetOptions.data"
-          <dynamicForm
+                       @onChanged="val => widgetValueChanged('data', val)" />
-            ref="formData"
-            :options="widgetOptions.data"
-            @onChanged="val => widgetValueChanged('data', val)"
-          />
         </el-tab-pane>
-        <el-tab-pane
+        <el-tab-pane v-if="isNotNull(widgetOptions.position)"
-          v-if="isNotNull(widgetOptions.position)"
+                     name="third"
-          name="third"
+                     label="坐标">
-          label="坐标"
+          <dynamicForm ref="formData"
-        >
+                       :options="widgetOptions.position"
-          <dynamicForm
+                       @onChanged="val => widgetValueChanged('position', val)" />
-            ref="formData"
-            :options="widgetOptions.position"
-            @onChanged="val => widgetValueChanged('position', val)"
-          />
         </el-tab-pane>
       </el-tabs>
     </div>
 
-    <content-menu
+    <content-menu :visible.sync="visibleContentMenu"
-      :visible.sync="visibleContentMenu"
+                  :style-obj="styleObj"
-      :style-obj="styleObj"
+                  @deletelayer="deletelayer" />
-      @deletelayer="deletelayer"
-    />
   </div>
 </template>
 
@@ -197,7 +197,7 @@ export default {
     dynamicForm,
     contentMenu
   },
-  data() {
+  data () {
     return {
       layerWidget: [],
       widgetTools: widgetTools, // 左侧工具栏的组件图标，将js变量加入到当前作用域
@@ -264,7 +264,7 @@ export default {
   },
   computed: {
     // 左侧折叠切换时，动态计算中间区的宽度
-    middleWidth() {
+    middleWidth () {
       var widthLeftAndRight = 0;
       if (this.toolIsShow) {
         widthLeftAndRight += this.widthLeftForTools; // 左侧工具栏宽度
@@ -275,37 +275,36 @@ export default {
       var middleWidth = this.bodyWidth - widthLeftAndRight;
       return middleWidth;
     },
-    middleHeight() {
+    middleHeight () {
       return this.bodyHeight;
     },
     // 设计台按大屏的缩放比例
-    bigscreenScaleInWorkbench() {
+    bigscreenScaleInWorkbench () {
       var widthScale = this.middleWidth / this.bigscreenWidth;
       var heightScale = this.middleHeight / this.bigscreenHeight;
       return Math.min(widthScale, heightScale);
     },
-    workbenchTransform() {
+    workbenchTransform () {
-      return `scale(${this.bigscreenScaleInWorkbench}, ${
+      return `scale(${this.bigscreenScaleInWorkbench}, ${this.bigscreenScaleInWorkbench
-        this.bigscreenScaleInWorkbench
+        })`;
-      })`;
     },
     // 大屏在设计模式的大小
-    bigscreenWidthInWorkbench() {
+    bigscreenWidthInWorkbench () {
       return this.getPXUnderScale(this.bigscreenWidth);
     },
-    bigscreenHeightInWorkbench() {
+    bigscreenHeightInWorkbench () {
       return this.getPXUnderScale(this.bigscreenHeight);
     }
   },
   watch: {
     widgets: {
-      handler(val) {
+      handler (val) {
         this.handlerLayerWidget(val);
       },
       deep: true
     }
   },
-  mounted() {
+  mounted () {
     // 一进入时，加载屏幕配置属性
     this.setOptionsOnClickScreen();
 
@@ -314,7 +313,7 @@ export default {
     this.widgets = [];
   },
   methods: {
-    handlerLayerWidget(val) {
+    handlerLayerWidget (val) {
       const layerWidgetArr = [];
       for (let i = 0; i < val.length; i++) {
         const obj = {};
@@ -329,7 +328,7 @@ export default {
       }
       this.layerWidget = layerWidgetArr;
     },
-    async initEchartData() {
+    async initEchartData () {
       const reportCode = this.$route.query.reportCode;
       const { code, data } = await detailDashboard(reportCode);
       if (code != 200) return;
@@ -338,7 +337,7 @@ export default {
       this.widgets = processData;
       this.dashboard = screenData;
     },
-    handleBigScreen(data) {
+    handleBigScreen (data) {
       const optionScreen = this.deepClone(getToolByCode("screen").options);
       const setup = optionScreen.setup;
       for (const key in data) {
@@ -356,7 +355,7 @@ export default {
         width: data.width
       };
     },
-    handleInitEchartsData(data) {
+    handleInitEchartsData (data) {
       const widgets = data.dashboard.widgets;
       const widgetsData = [];
       for (let i = 0; i < widgets.length; i++) {
@@ -376,7 +375,7 @@ export default {
       }
       return widgetsData;
     },
-    handleOptionsData(data, option) {
+    handleOptionsData (data, option) {
       for (const key in data.setup) {
         for (let i = 0; i < option.setup.length; i++) {
           let item = option.setup[i];
@@ -415,7 +414,7 @@ export default {
       return option;
     },
     // 保存数据
-    async saveData() {
+    async saveData () {
       if (!this.widgets || this.widgets.length == 0) {
         this.$message.error("请添加组件");
         return;
@@ -437,7 +436,7 @@ export default {
       }
     },
     // 预览
-    viewScreen() {
+    viewScreen () {
       var routeUrl = this.$router.resolve({
         path: "/bigscreen/viewer",
         query: { reportCode: this.$route.query.reportCode }
@@ -445,12 +444,12 @@ export default {
       window.open(routeUrl.href, "_blank");
     },
     // 在缩放模式下的大小
-    getPXUnderScale(px) {
+    getPXUnderScale (px) {
       return this.bigscreenScaleInWorkbench * px;
     },
 
     // 拖动一个组件放到工作区中去，在拖动结束时，放到工作区对应的坐标点上去
-    widgetOnDragged(evt, widgetCode) {
+    widgetOnDragged (evt, widgetCode) {
       var widgetType = widgetCode;
 
       // 获取结束坐标和列名
@@ -491,7 +490,7 @@ export default {
     },
 
     // 对组件默认值处理
-    handleDefaultValue(widgetJson) {
+    handleDefaultValue (widgetJson) {
       for (const key in widgetJson) {
         if (key == "options") {
           // collapse、data、position、setup
@@ -531,12 +530,12 @@ export default {
       }
       return widgetJson;
     },
-    layerClick(index) {
+    layerClick (index) {
       this.widgetIndex = index;
       this.widgetsClick(index);
     },
     // 如果是点击大屏设计器中的底层，加载大屏底层属性
-    setOptionsOnClickScreen() {
+    setOptionsOnClickScreen () {
       this.screenCode = "screen";
       // 选中不同的组件 右侧都显示第一栏
       this.activeName = "first";
@@ -544,7 +543,7 @@ export default {
     },
 
     // 如果是点击某个组件，获取该组件的配置项
-    setOptionsOnClickWidget(obj) {
+    setOptionsOnClickWidget (obj) {
       this.screenCode = "";
       if (typeof obj == "number") {
         this.widgetOptions = this.deepClone(this.widgets[obj]["options"]);
@@ -564,7 +563,7 @@ export default {
       });
       this.widgetOptions = this.deepClone(this.widgets[obj.index]["options"]);
     },
-    widgetsClick(index) {
+    widgetsClick (index) {
       const draggableArr = this.$refs.widgets;
       for (let i = 0; i < draggableArr.length; i++) {
         if (i == index) {
@@ -575,14 +574,14 @@ export default {
       }
       this.setOptionsOnClickWidget(index);
     },
-    handleMouseDown() {
+    handleMouseDown () {
       const draggableArr = this.$refs.widgets;
       for (let i = 0; i < draggableArr.length; i++) {
         this.$refs.widgets[i].$refs.draggable.setActive(false);
       }
     },
     // 将当前选中的组件，右侧属性值更新
-    widgetValueChanged(key, val) {
+    widgetValueChanged (key, val) {
       if (this.screenCode == "screen") {
         this.dashboard = this.deepClone(val);
       } else {
@@ -594,7 +593,7 @@ export default {
         }
       }
     },
-    rightClick(event, index) {
+    rightClick (event, index) {
       this.rightClickIndex = index;
       const left = event.clientX;
       const top = event.clientY;
@@ -608,10 +607,10 @@ export default {
       this.visibleContentMenu = true;
       return false;
     },
-    deletelayer() {
+    deletelayer () {
       this.widgets.splice(this.rightClickIndex, 1);
     },
-    setDefaultValue(options, val) {
+    setDefaultValue (options, val) {
       for (let i = 0; i < options.length; i++) {
         if (Object.prototype.toString.call(options[i]) == "[object Object]") {
           for (const k in val) {
@@ -640,6 +639,15 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.mr10 {
+  margin-right: 10px;
+}
+.ml20 {
+  margin-left: 20px;
+}
+.border-right {
+  border-right: 1px solid #566876;
+}
 .is-active {
   background: #31455d !important;
   color: #bfcbd9 !important;
@@ -833,4 +841,80 @@ export default {
     }
   }
 }
+ul,
+li {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+.nav {
+}
+.nav > li {
+  display: inline-block;
+  position: relative;
+}
+.nav > li > a {
+  text-decoration: none;
+}
+.nav > li:hover > a {
+  color: rgb(0, 136, 214);
+}
+.nav a {
+  color: #cde8ff;
+  display: block;
+  text-decoration: none;
+}
+
+.nav ul {
+  display: none;
+  background: #00113a;
+  position: absolute;
+  z-index: 10000;
+  width: 120px;
+  margin-left: -20px;
+}
+.nav ul li {
+  position: relative;
+  font-size: 12px;
+}
+.nav > li:hover > ul {
+  display: block;
+}
+.nav > li > .three-level > li > a {
+  width: 10em;
+  padding-left: 1em;
+  padding-right: 1em;
+  background-color: #0f2030;
+}
+// .nav li .three-level li {
+//   display: none;
+// }
+.nav > li > ul > li:hover > a {
+  display: block;
+  background-color: #182e42;
+  color: #fff;
+}
+.nav > li > ul > li > ul {
+  left: 100%;
+  top: 0;
+}
+.nav > li:last-child > ul > li > ul {
+  left: -100%;
+  top: 0;
+}
+.nav > li > ul > li:hover > ul {
+  display: block;
+}
+.nav > li > ul > li > ul > li > a {
+  padding-top: 0.4em;
+  padding-bottom: 0.4em;
+  width: 10em;
+  padding-left: 1em;
+  padding-right: 1em;
+  background-color: rgb(50, 50, 50);
+}
+.nav > li > ul > li > ul > li:hover > a {
+  background-color: rgb(255, 255, 0);
+  color: rgb(0, 0, 0);
+}
 </style>