处理大屏设计页面拖拽失效及配置表单部分样式缺失问题

zkqy-ui/package.json

@@ -43,6 +43,7 @@
     "@bpmn-io/properties-panel": "^0.20.3",
     "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
+    "@smallwei/avue": "^2.8.23",
     "@tinymce/tinymce-vue": "^3.2.0",
     "amfe-flexible": "^2.2.1",
     "ant-design-vue": "^1.7.8",

zkqy-ui/src/assets/styles/index.scss

@@ -199,3 +199,156 @@ aside {
 .app-container {
   background: #fff;
 }
+// aj-report 样式 start
+// 谷歌浏览器去滚动条
+html::-webkit-scrollbar {
+  display: none;
+}
+.el-image-viewer__close {
+  color: #fff;
+}
+.collapse-input-style {
+  .el-input__inner,
+  .el-textarea__inner {
+    background: #263445 !important;
+    border: 1px solid #3f5673;
+    color: #a8e3ff;
+  }
+  .el-slider__runway {
+    height: 2px;
+    background-color: #5e6b82;
+  }
+  .el-slider__bar {
+    height: 2px;
+  }
+  .el-slider__button-wrapper {
+    top: -17px;
+  }
+  .el-slider__button {
+    width: 14px;
+    height: 14px;
+  }
+  .el-switch__core {
+    background-color: #5e6b82;
+    border: 1px solid #3f5673;
+  }
+  .el-input-group__append,
+  .el-input-group__prepend {
+    background: #5e6b82 !important;
+    border: 1px solid #3f5673;
+    color: #a8e3ff;
+  }
+  .el-input-number__increase,
+  .el-input-number__decrease {
+    background: #5e6b82 !important;
+    border: 1px solid #3f5673;
+    color: #a8e3ff;
+  }
+  .el-input-number.is-controls-right .el-input-number__increase {
+    height: 15px;
+    border-bottom: 1px solid #3f5673;
+  }
+  .el-input-number.is-controls-right .el-input-number__decrease {
+    border-left: 1px solid #3f5673;
+  }
+  .el-form-item__label {
+    font-size: 12px;
+    color: #bfcbd9 !important;
+    font-weight: normal !important;
+  }
+}
+// 大屏展示 的一些样式
+.my-dialog {
+  .el-dialog {
+    background: #062b69;
+    border: 1px solid #5ddaf6;
+  }
+  .el-dialog__header {
+    border-bottom: 1px solid #5ddaf6;
+    text-align: center;
+  }
+  .el-dialog__title {
+    color: #5cdcf9;
+  }
+  .el-input__inner {
+    background: #091e43;
+    border-color: #254e97;
+  }
+  .el-date-editor .el-range__icon {
+    color: #5cdcf9;
+  }
+  input {
+    background: #091e43;
+  }
+  .el-date-editor .el-range-input {
+    color: #5cdcf9;
+  }
+  .form-handle {
+    .el-form-item__label {
+      color: #5cdcf9;
+      font-weight: 500;
+    }
+  }
+  .el-form-item {
+    margin-bottom: 10px;
+  }
+  .el-textarea__inner,
+  .el-select:hover .el-input__inner {
+    background-color: #091e43;
+    border-color: #254e97;
+    border-bottom: 1px solid #254e97;
+  }
+  .el-button--blue {
+    color: #fff;
+    background-color: #224788;
+    border-color: #224788;
+  }
+  .el-button--green {
+    color: #fff;
+    background-color: #2092ad;
+    border-color: #2092ad;
+  }
+}
+/*日志折叠面板定制*/
+.log .el-collapse {
+  border-top: 0;
+  border-bottom: 0;
+}
+.log .el-collapse-item__header {
+  height: 40px;
+  line-height: 40px;
+  cursor: pointer;
+  border: 1px solid #fff;
+  background: rgba(145, 163, 177, 0.15);
+  font-size: 14px;
+  color: #666;
+  -webkit-transition: border-bottom-color 0.3s;
+  transition: border-bottom-color 0.3s;
+  outline: 0;
+  padding: 0 20px;
+}
+.log .el-collapse-item__wrap {
+  will-change: height;
+  overflow: hidden;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border-bottom: 1px solid #fff;
+  background: #263c7c;
+}
+.log .el-collapse-item__content {
+  font-size: 14px;
+  color: #ffffff;
+  padding: 20px;
+}
+.log .el-collapse-item__arrow {
+  margin-top: 14px;
+  float: right;
+  margin-right: -77px;
+}
+.log .icon-btn_style,
+.log .icon-btn_style:hover {
+  background: none;
+  border: 0;
+  padding: 0;
+}
+// aj-report 样式 end

zkqy-ui/src/main.js

@@ -111,6 +111,10 @@ import 'echarts/lib/component/tooltip'
 Vue.component('v-chart', ECharts)
 import dataV from '@jiaminghi/data-view'
 Vue.use(dataV)
+
+import Avue from '@smallwei/avue';
+import '@smallwei/avue/lib/index.css';
+Vue.use(Avue);
 // 数据报表相关  end
 
 

zkqy-ui/src/views/system/report/bigscreenDesigner/designer/components/dynamicForm.vue

@@ -511,7 +511,7 @@ export default {
   border-top: none;
   border-bottom: none;
 }
-::v-deep.el-collapse-item__header {
+::v-deep .el-collapse-item__header {
   height: 40px;
   line-height: 40px;
   background: transparent;
@@ -520,11 +520,11 @@ export default {
   font-size: 12px;
   border-color: #282e3a;
 }
-::v-deep.el-collapse-item__wrap {
+::v-deep .el-collapse-item__wrap {
   background: transparent;
   border: none;
 }
-::v-deep.el-collapse-item__content {
+::v-deep .el-collapse-item__content {
   padding-bottom: 0;
 }
 </style>

zkqy-ui/src/views/system/report/bigscreenDesigner/designer/index.vue

@@ -504,7 +504,6 @@ export default {
       return this.bigscreenScaleInWorkbench * px;
     },
     dragStart(widgetCode) {
-      console.log("dragStart", widgetCode);
       this.dragWidgetCode = widgetCode;
       this.currentWidgetTotal = this.widgets.length; // 当前操作面板上有多少各组件
     },
@@ -539,7 +538,7 @@ export default {
     },
     // 拖动一个组件放到工作区中去，在拖动结束时，放到工作区对应的坐标点上去
     widgetOnDragged(evt) {
-      console.log("拖动结束", evt);
+      console.log("widgetOnDragged", evt);
       let widgetType = this.dragWidgetCode;
 
       // 获取结束坐标和列名