diff --git a/src/mixins/common.js b/src/mixins/common.js
index 6c4c64e..cf1d913 100644
--- a/src/mixins/common.js
+++ b/src/mixins/common.js
@@ -181,7 +181,7 @@ export default {
     },
 
     // 对象深拷贝
-    deepClone(data) {
+    deepClone(data,dd) {
       let type = this.getObjectType(data)
       let obj
       if (type === 'array') {
diff --git a/src/views/bigscreenDesigner/designer/components/drillDrownSetting.vue b/src/views/bigscreenDesigner/designer/components/drillDrownSetting.vue
new file mode 100644
index 0000000..ad3e135
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/components/drillDrownSetting.vue
@@ -0,0 +1,1418 @@
+<!--
+ * @Descripttion: 大屏报表设计器-主体页面
+ * @Author: Devli
+ * @Date: 2021-3-19 10:23:27
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2023-03-17 17:38:44
+-->
+<template>
+  <div class="layout">
+    <div
+      v-if="toolIsShow"
+      class="layout-left"
+      :style="{ width: widthLeftForTools + 'px' }"
+    >
+      <el-tabs class="layout-left" type="border-card" :stretch="true">
+        <!-- 左侧组件栏-->
+        <el-tab-pane label="工具栏">
+          <span slot="label"><i class="el-icon-date icon"></i>工具栏</span>
+          <div class="chart-type">
+            <el-tabs class="type-left" tab-position="left">
+              <el-tab-pane
+                v-for="(item, index) in widgetTools"
+                :key="index"
+                :label="item.name"
+              >
+                <li
+                  v-for="(it, idx) in item.list"
+                  :key="idx"
+                  draggable="true"
+                  @dragstart="dragStart(it.code)"
+                  @dragend="dragEnd()"
+                >
+                  <div class="tools-item">
+                    <span class="tools-item-icon">
+                      <i class="iconfont" :class="it.icon"></i>
+                    </span>
+                    <span class="tools-item-text">{{ it.label }}</span>
+                  </div>
+                </li>
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+        </el-tab-pane>
+        <!-- 左侧图层-->
+        <el-tab-pane label="图层">
+          <draggable
+            v-model="layerWidget"
+            @update="datadragEnd"
+            :options="{ animation: 300 }"
+          >
+            <transition-group>
+              <div
+                v-for="(item, index) in layerWidget"
+                :key="'item' + index"
+                class="tools-item"
+                :class="widgetIndex == index ? 'is-active' : ''"
+                @click="layerClick($event,index)"
+              >
+                <span class="tools-item-icon">
+                  <i class="iconfont" :class="item.icon"></i>
+                </span>
+                <span class="tools-item-text">{{ item.label }}</span>
+              </div>
+            </transition-group>
+          </draggable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+    <div
+      class="layout-left-fold"
+      :style="{ width: widthLeftForToolsHideButton + 'px' }"
+      @click="toolIsShow = !toolIsShow"
+    >
+      <i class="el-icon-arrow-right"/>
+    </div>
+
+    <div
+      class="layout-middle"
+      :style="{ width: middleWidth + 'px', height: middleHeight + 'px' }"
+    >
+      <div class="top-button">
+        <span class="btn" @click="saveData">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="保存"
+            placement="bottom"
+          >
+            <i class="iconfont iconsave"></i>
+          </el-tooltip>
+        </span>
+        <span class="btn" @click="viewScreen">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="预览"
+            placement="bottom"
+          >
+            <i class="iconfont iconyulan"></i>
+          </el-tooltip>
+        </span>
+
+        <span class="btn" @click="handleUndo">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="撤销"
+            placement="bottom"
+          >
+            <i class="iconfont iconundo"></i>
+          </el-tooltip>
+        </span>
+
+        <span class="btn" @click="handleRedo">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="恢复"
+            placement="bottom"
+          >
+            <i class="iconfont iconhuifubeifen"></i>
+          </el-tooltip>
+        </span>
+
+        <span
+          :class="{
+            btn: true,
+            'btn-disable': currentSizeRangeIndex === 0,
+          }"
+          @click="setSize(0)"
+        >
+          <el-tooltip
+            class="item"
+            :disabled="currentSizeRangeIndex === 0"
+            effect="dark"
+            content="缩小"
+            placement="bottom"
+          >
+            <i class="el-icon-minus" style="font-size: 16px"/>
+          </el-tooltip>
+        </span>
+        <span
+          :class="{
+            btn: true,
+            'scale-num': true,
+            'btn-disable': currentSizeRangeIndex === defaultSize.index,
+          }"
+          @click="setSize(2)"
+        >
+          <el-tooltip
+            class="item"
+            :disabled="currentSizeRangeIndex === defaultSize.index"
+            effect="dark"
+            content="默认比例"
+            placement="bottom"
+          >
+            <span> {{ parseInt(scaleNum) }}% </span>
+          </el-tooltip>
+        </span>
+        <span
+          :class="{
+            btn: true,
+            'btn-disable': currentSizeRangeIndex === 8,
+          }"
+          @click="setSize(1)"
+        >
+          <el-tooltip
+            class="item"
+            :disabled="currentSizeRangeIndex === 8"
+            effect="dark"
+            content="放大"
+            placement="bottom"
+          >
+            <i class="el-icon-plus" style="font-size: 16px"/>
+          </el-tooltip>
+        </span>
+
+        <span class="btn" v-permission="'bigScreenManage:export'">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="导入"
+            placement="bottom"
+          >
+            <el-upload
+              class="el-upload"
+              ref="upload"
+              :action="uploadUrl"
+              :headers="headers"
+              accept=".zip"
+              :on-success="handleUpload"
+              :show-file-list="false"
+              :limit="1"
+            >
+              <i class="iconfont icondaoru"></i>
+            </el-upload>
+          </el-tooltip>
+        </span>
+        <span class="btn border-left" v-permission="'bigScreenManage:import'">
+          <ul class="nav">
+            <li>
+              <i class="iconfont icondaochu"></i
+              ><i class="el-icon-arrow-down"></i>
+              <ul>
+                <li>
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    content="适合当前系统"
+                    placement="right"
+                  >
+                    <div @click="exportDashboard(1)">导出(包含数据集)</div>
+                  </el-tooltip>
+                </li>
+                <li>
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    content="适合跨系统"
+                    placement="right"
+                  >
+                    <div @click="exportDashboard(0)">导出(不包含数据集)</div>
+                  </el-tooltip>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </span>
+      </div>
+      <!-- 中间操作内容  主体 -->
+      <div class="workbench-container" @mousedown="handleMouseDown">
+        <div
+          :style="{
+            width: (+bigscreenWidth + 18) * bigscreenScaleInWorkbench + 'px',
+            height: (+bigscreenHeight + 18) * bigscreenScaleInWorkbench + 'px',
+          }"
+          class="vue-ruler-tool-wrap"
+        >
+          <!-- 大屏设计页面的标尺插件 -->
+          <vue-ruler-tool
+            ref="vue-ruler-tool"
+            v-model="dashboard.presetLine"
+            class="vueRuler"
+            :step-length="50"
+            :parent="true"
+            :position="'relative'"
+            :is-scale-revise="true"
+            :visible.sync="dashboard.presetLineVisible"
+            :style="{
+              width: +bigscreenWidth + 18 + 'px',
+              height: +bigscreenHeight + 18 + 'px',
+              transform:
+                currentSizeRangeIndex === defaultSize.index
+                  ? workbenchTransform
+                  : `scale(${sizeRange[currentSizeRangeIndex] / 100})`,
+              transformOrigin: '0 0',
+            }"
+          >
+            <div
+              id="workbench"
+              class="workbench"
+              :style="{
+                width: bigscreenWidth + 'px',
+                height: bigscreenHeight + 'px',
+                'background-color': dashboard.backgroundColor,
+                'background-image': 'url(' + dashboard.backgroundImage + ')',
+                'background-position': '0% 0%',
+                'background-size': '100% 100%',
+                'background-repeat': 'initial',
+                'background-attachment': 'initial',
+                'background-origin': 'initial',
+                'background-clip': 'initial',
+              }"
+              @click.self="setOptionsOnClickScreen"
+              @drop="widgetOnDragged($event)"
+              @dragover="dragOver($event)"
+              @mousedown.self="downEvent($event)"
+              @mouseup="upEvent($event)"
+              @mousemove="moveEvent($event)"
+            >
+              <div v-if="grade" class="bg-grid"></div>
+              <widget
+                ref="widgets"
+                v-for="(widget, index) in widgets"
+                :key="index"
+                v-model="widget.value"
+                :index="index"
+                :step="step"
+                :type="widget.type"
+                :bigscreen="{ bigscreenWidth, bigscreenHeight }"
+                @onActivated="setOptionsOnClickWidget"
+                @contextmenu.prevent.native="rightClick($event, index)"
+                @mousedown.prevent.native="widgetsClick($event, index)"
+                @mouseup.prevent.native="grade = false"
+              />
+            </div>
+          </vue-ruler-tool>
+        </div>
+      </div>
+    </div>
+
+    <div class="layout-right" :style="{ width: widthLeftForOptions + 'px' }">
+      <el-tabs v-model="activeName" type="border-card" :stretch="true">
+        <el-tab-pane
+          v-if="
+            isNotNull(widgetOptions.setup) || isNotNull(widgetOptions.collapse)
+          "
+          name="first"
+          label="配置"
+        >
+          <dynamicForm
+            ref="formData"
+            :options="widgetOptions.setup"
+            :layer-widget="layerWidget"
+            :hideDrill="true"
+            :widget-index="widgetIndex"
+            :widget-params-config="widgetParamsConfig"
+            @onChanged="(val) => widgetValueChanged('setup', val)"
+          />
+        </el-tab-pane>
+        <el-tab-pane
+          v-if="isNotNull(widgetOptions.data)"
+          name="second"
+          label="数据"
+        >
+          <dynamicForm
+            ref="formData"
+            :options="widgetOptions.data"
+            @onChanged="(val) => widgetValueChanged('data', val)"
+          />
+        </el-tab-pane>
+        <el-tab-pane
+          v-if="isNotNull(widgetOptions.position)"
+          name="third"
+          label="坐标"
+        >
+          <dynamicForm
+            ref="formData"
+            :options="widgetOptions.position"
+            @onChanged="(val) => widgetValueChanged('position', val)"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+    <content-menu
+      :visible.sync="visibleContentMenu"
+      :style-obj="styleObj"
+      @deletelayer="deletelayer"
+      @lockLayer="lockLayer"
+      @noLockLayer="noLockLayer"
+      @copylayer="copylayer"
+      @istopLayer="istopLayer"
+      @setlowLayer="setlowLayer"
+      @moveupLayer="moveupLayer"
+      @movedownLayer="movedownLayer"
+      @alignment="alignment($event)"
+    />
+  </div>
+</template>
+
+<script>
+import {widgetTools } from "../tools/index";
+import widget from "../widget/widget.vue";
+import dynamicForm from "./dynamicForm";
+import draggable from "vuedraggable";
+import VueRulerTool from "vue-ruler-tool"; // 大屏设计页面的标尺插件
+import contentMenu from "./contentMenu";
+import { Revoke } from "@/utils/revoke";
+import { getToken } from "@/utils/auth";
+import { getToolByCode } from "@/views/bigscreenDesigner/designer/tools/index";
+import { exportDashboard, } from "@/api/bigscreen";
+export default {
+  name: "Login",
+  components: {
+    draggable,
+    VueRulerTool,
+    widget,
+    dynamicForm,
+    contentMenu,
+  },
+  props:{
+    screenData:{
+      type:Object,
+      default:()=>{
+        return {
+           dashboard: {  },
+           widgets: []
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      grade: false,
+      editData:{},
+      layerWidget: [],
+      widgetTools: widgetTools, // 左侧工具栏的组件图标，将js变量加入到当前作用域
+      widthLeftForTools: 200, // 左侧工具栏宽度
+      widthLeftForToolsHideButton: 15, // 左侧工具栏折叠按钮宽度
+      widthLeftForOptions: 300, // 右侧属性配置区
+      widthPaddingTools: 18,
+      toolIsShow: true, // 左侧工具栏是否显示
+      reportCode: this.$route.query.reportCode,
+      uploadUrl: process.env.BASE_API + "/reportDashboard/import/" + this.$route.query.reportCode,
+      revoke: null, //处理历史记录
+      rightClickIndex: -1,
+      rightClickWidget: null,
+      bigscreenWidth: 1920, // 大屏设计的大小
+      bigscreenHeight: 1080,
+
+      dashboard: {},
+      // 大屏的标记
+      screenCode: "",
+      dragWidgetCode: "", //从工具栏拖拽的组件code
+      // 大屏画布中的组件
+      widgets: [], // 工作区中拖放的组件
+      // 当前激活组件
+      widgetIndex: 0,
+      // 当前激活组件右侧配置属性
+      widgetOptions: {
+        setup: [], // 配置
+        data: [], // 数据
+        position: [], // 坐标
+      },
+      flagWidgetClickStopPropagation: false, // 点击组件时阻止事件冒泡传递到画布click事件上
+      styleObj: {
+        left: 0,
+        top: 0,
+      },
+      visibleContentMenu: false,
+
+      activeName: "first",
+      scaleNum: 0, // 当前缩放百分比的值
+      sizeRange: [20, 40, 60, 80, 100, 150, 200, 300, 400], // 缩放百分比
+      currentSizeRangeIndex: -1, // 当前是哪个缩放比分比,
+      currentWidgetTotal: 0,
+      widgetParamsConfig: [], // 各组件动态数据集的参数配置情况
+
+      selectedWidgets: [], //多选组件集合
+      moveTimes: 0, //鼠标移动次数
+      selectFlag: false, //选择标识
+      kuangSelectFlag: false, //框选标识
+      downX: 0,  //移动开始X坐标
+      downY: 0,  //移动开始Y坐标
+      downX2: 0, //移动结束X坐标
+      downY2: 0, //移动结束Y坐标
+      rect : null, //框选矩形对象
+      openMulDrag: false, //批量拖拽开关
+      moveWidgets:{},  //记录移动的组件的起始left和top属性
+    };
+  },
+  computed: {
+    step() {
+      return Number(100 / (this.bigscreenScaleInWorkbench * 100));
+    },
+    headers() {
+      return {
+        Authorization: getToken(),
+      };
+    },
+    // 初始的缩放百分比 和 下标
+    defaultSize() {
+      const obj = {
+        index: -1,
+        size: "50",
+      };
+      this.sizeRange.some((item, index) => {
+        if (item <= 100 * this.bigscreenScaleInWorkbench) {
+          obj.index = index;
+          obj.size = 100 * this.bigscreenScaleInWorkbench;
+        }
+      });
+      if (obj.index === -1) {
+        obj.index = 0;
+        obj.size = this.sizeRange[0];
+      }
+      return obj;
+    },
+    // 左侧折叠切换时，动态计算中间区的宽度
+    middleWidth() {
+      let widthLeftAndRight = 0;
+      if (this.toolIsShow) {
+        widthLeftAndRight += this.widthLeftForTools; // 左侧工具栏宽度
+      }
+      widthLeftAndRight += this.widthLeftForToolsHideButton; // 左侧工具栏折叠按钮宽度
+      widthLeftAndRight += this.widthLeftForOptions; // 右侧配置栏宽度
+
+      let middleWidth = this.bodyWidth - widthLeftAndRight;
+      return middleWidth;
+    },
+    middleHeight() {
+      return this.bodyHeight;
+    },
+    // 设计台按大屏的缩放比例
+    bigscreenScaleInWorkbench() {
+      let widthScale =
+        (this.middleWidth - this.widthPaddingTools) / this.bigscreenWidth;
+      let heightScale =
+        (this.middleHeight - this.widthPaddingTools) / this.bigscreenHeight;
+      return Math.min(widthScale, heightScale);
+    },
+    workbenchTransform() {
+      return `scale(${this.bigscreenScaleInWorkbench}, ${this.bigscreenScaleInWorkbench})`;
+    },
+    // 大屏在设计模式的大小
+    bigscreenWidthInWorkbench() {
+      return this.getPXUnderScale(this.bigscreenWidth) + this.widthPaddingTools;
+    },
+    bigscreenHeightInWorkbench() {
+      return (
+        this.getPXUnderScale(this.bigscreenHeight) + this.widthPaddingTools
+      );
+    },
+  },
+  watch: {
+    defaultSize: {
+      handler(val) {
+        if (val !== -1) {
+          this.currentSizeRangeIndex = val.index;
+          this.scaleNum = val.size;
+        }
+      },
+      immediate: true,
+    },
+    bigscreenWidth() {
+      this.initVueRulerTool();
+    },
+    bigscreenHeight() {
+      this.initVueRulerTool();
+    },
+    widgets: {
+      handler(val) {
+        this.getLayerData(val);
+        this.handlerdynamicDataParamsConfig(val);
+        //以下部分是记录历史
+        this.$nextTick(() => {
+          this.revoke.push(this.widgets);
+        });
+      },
+      deep: true,
+    },
+    screenData: {
+      handler(val) {
+        this.editData=val
+        this.getData();
+      },
+      deep: true,
+      immediate:true
+    }
+  },
+  mounted() {
+    this.widgets = [];
+    this.editData=this.screenData
+    window.addEventListener("mouseup", () => {
+      this.grade = false;
+    });
+    this.$nextTick(() => {
+      this.initVueRulerTool(); // 初始化 修正插件样式
+      this.getData();
+    });
+  },
+  created() {
+    this.revoke = new Revoke();
+  },
+  methods: {
+      /**
+  * @param num: 0缩小 1放大 2默认比例
+  * sizeRange: [20, 40, 60, 72, 100, 150, 200, 300, 400]
+  */
+    setSize(num) {
+      switch (num) {
+        case 0: this.currentSizeRangeIndex === 0 ? '' : this.currentSizeRangeIndex -= 1;
+          break;
+        case 1: this.currentSizeRangeIndex === 8 ? '' : this.currentSizeRangeIndex += 1;
+          break;
+        case 2: this.currentSizeRangeIndex = this.defaultSize.index;
+      }
+      this.scaleNum = this.currentSizeRangeIndex === this.defaultSize.index ? this.defaultSize.size : this.sizeRange[this.currentSizeRangeIndex];
+    },
+    // 初始化 修正插件样式
+    initVueRulerTool() {
+      const vueRulerToolDom = this.$refs["vue-ruler-tool"].$el; // 操作面板 第三方插件工具
+      const contentDom = vueRulerToolDom.querySelector(".vue-ruler-content");
+      const vueRulerX = vueRulerToolDom.querySelector(".vue-ruler-h"); // 横向标尺
+      const vueRulerY = vueRulerToolDom.querySelector(".vue-ruler-v"); // 纵向标尺
+      contentDom.style.width = "100%";
+      contentDom.style.height = "100%";
+
+      let xHtmlContent = "";
+      let yHtmlContent = "";
+      let currentNum = 0;
+      while (currentNum < +this.bigscreenWidth) {
+        xHtmlContent += `<span class="n" style="left: ${currentNum + 2}px;">${currentNum}</span>`;
+        currentNum += 50;
+      }
+      currentNum = 0;
+      while (currentNum < +this.bigscreenHeight) {
+        yHtmlContent += `<span class="n" style="top: ${currentNum + 2}px;">${currentNum}</span>`;
+        currentNum += 50;
+      }
+      vueRulerX.innerHTML = xHtmlContent;
+      vueRulerY.innerHTML = yHtmlContent;
+    },
+    // 初始化接口数据
+    async getData() {
+        
+      const data = {dashboard:{...this.editData.dashboard,...this.editData},widgets:null};
+      console.log(data,1231231)
+      this.widgets = this.initWidgetsData(data);
+      this.dashboard = this.initScreenData(data.dashboard);
+      this.bigscreenWidth = this.dashboard.width;
+      this.bigscreenHeight = this.dashboard.height;
+    },
+    // 组件数据
+    initWidgetsData(data) {
+      const widgets = data.dashboard ? data.dashboard.widgets : [];
+      const widgetsData = [];
+      for (let i = 0; i < widgets.length; i++) {
+        const widget = widgets[i]
+        const { setup, data, position } = { ...widget.value }
+        const obj = {
+          type: widget.type,
+          value: { setup, data, position }
+        };
+        const tool = this.deepClone(getToolByCode(widget.type));
+        if (!tool) {
+          const message = "暂未提供该组件或该组件下线了，组件code: " + widget.type;
+          if (process.env.NODE_ENV === "development") {
+            this.$message.error(message);
+          }
+          continue; // 找不到就跳过，避免整个报表都加载不出来
+        }
+        obj.options = this.setDefaultWidgetConfigValue(widget.value, tool.options);
+        obj.value.widgetId = obj.value.setup.widgetId;
+        widgetsData.push(obj);
+      }
+      return widgetsData;
+    },
+    // 重写默认数据
+    setDefaultWidgetConfigValue(data, option) {
+      this.setConfigValue(data.setup, option.setup)
+      this.setConfigValue(data.position, option.position)
+      this.setConfigValue(data.data, option.data)
+      return option;
+    },
+    setConfigValue(objValue, setup) {
+      Object.keys(objValue).forEach(key => {
+        setup.forEach(item => {
+          if (this.isObjectFn(item) && key == item.name) {
+            item.value = objValue[key]
+          }
+          if (this.isArrayFn(item)) {
+            item.forEach(itemChild => {
+              itemChild.list.forEach(el => {
+                if (key == el.name) {
+                  el.value = objValue[key]
+                }
+              })
+            })
+          }
+        })
+      })
+    },
+    // 大屏数据
+    initScreenData(data) {
+      const optionScreen = getToolByCode("screen").options;
+      this.setConfigValue(data, optionScreen.setup)
+      this.setOptionsOnClickScreen();
+      return {
+        backgroundColor:
+          (data && data.backgroundColor) || (!data ? "#1e1e1e" : ""),
+        backgroundImage: (data && data.backgroundImage) || "",
+        height: (data && data.height) || "1080",
+        title: (data && data.title) || "",
+        width: (data && data.width) || "1920",
+      };
+    },
+    // 保存数据
+    async saveData() {
+      if (!this.widgets || this.widgets.length == 0) {
+        return this.$message.error("请添加组件");
+      }
+      const { title, width, height, backgroundColor, backgroundImage, refreshSeconds } = { ...this.dashboard }
+      const screenData = {
+        dashboard: { title, width, height, backgroundColor, backgroundImage, refreshSeconds },
+        widgets: this.widgets,
+      };
+      screenData.widgets.forEach((widget) => {
+        widget.value.setup.widgetId = widget.value.widgetId;
+        widget.value.setup.widgetCode = widget.type
+      });
+      this.$emit('submitDrillDrownData',screenData);
+    },
+    // 预览
+    viewScreen() {
+      let routeUrl = this.$router.resolve({
+        path: "/bigscreen/viewer",
+        query: { reportCode: this.reportCode },
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    async exportDashboard(val) {
+      const fileName = this.reportCode + ".zip";
+
+      const param = {
+        reportCode: this.reportCode,
+        showDataSet: val,
+      };
+      exportDashboard(param).then((res) => {
+        const that = this;
+        const type = res.type;
+        if (type == "application/json") {
+          let reader = new FileReader();
+          reader.readAsText(res, "utf-8");
+          reader.onload = function () {
+            const data = JSON.parse(reader.result);
+            that.$message.error(data.message);
+          };
+          return;
+        }
+        const blob = new Blob([res], { type: "application/octet-stream" });
+        if (window.navigator.msSaveOrOpenBlob) {
+          //msSaveOrOpenBlob方法返回bool值
+          navigator.msSaveBlob(blob, fileName); //本地保存
+        } else {
+          const link = document.createElement("a"); //a标签下载
+          link.href = window.URL.createObjectURL(blob);
+          link.download = fileName;
+          link.click();
+          window.URL.revokeObjectURL(link.href);
+        }
+      });
+    },
+    handleUndo() {
+      const record = this.revoke.undo();
+      if (!record) return false;
+      this.widgets = record;
+    },
+    handleRedo() {
+      const record = this.revoke.redo();
+      if (!record) return false;
+      this.widgets = record;
+    },
+    handleUpload(response, file, fileList) {
+      this.$refs.upload.clearFiles();
+      this.getData();
+      if (response.code == "200") return this.$message.success('导入成功！')
+      this.$message.error(response.message)
+    },
+    // 右键
+    rightClick(event, index) {
+      this.rightClickIndex = index;
+      this.rightClickWidget = this.widgets[index];
+      const left = event.clientX;
+      const top = event.clientY;
+      if (left || top) {
+        this.styleObj = {
+          left: left + "px",
+          top: top + "px",
+          display: "block",
+        };
+      }
+      //设置多选和单选的菜单项展示
+      document.getElementsByName("singleSelect").forEach(e=>{
+        e.style.display= this.selectedWidgets.length >= 2 ?"none":"block";
+      });
+      document.getElementsByName("mulSelect").forEach(e=>{
+        e.style.display= this.selectedWidgets.length >= 2 ?"block":"none";
+      })
+      this.visibleContentMenu = true;
+      return false;
+    },
+    // 数组 元素互换位置
+    swapArr(arr, oldIndex, newIndex) {
+      arr[oldIndex] = arr.splice(newIndex, 1, arr[oldIndex])[0];
+      return arr;
+    },
+    // 删除
+    deletelayer() {
+      let _this = this;
+      this.widgets.splice(this.rightClickIndex, 1);
+      this.selectedWidgets.forEach(sw=>{
+        _this.widgets = _this.widgets.filter(w=>w.value.widgetId !== sw.value.widgetId);
+      })
+    },
+    // 锁定
+    lockLayer() {
+      const obj = this.widgets[this.rightClickIndex];
+      this.$set(obj.value.position, "disabled", true);
+    },
+    // 解除锁定
+    noLockLayer() {
+      const obj = this.widgets[this.rightClickIndex];
+      this.$set(obj.value.position, "disabled", false);
+    },
+    // 复制
+    copylayer() {
+      if (this.selectedWidgets.length === 1) {
+        // 单选复制
+        const obj = this.deepClone(this.widgets[this.rightClickIndex]);
+        obj.value.position.top += 40; // 复制的元素向右下角偏移一点
+        obj.value.position.left += 40;
+        obj.value.widgetId = Number(
+          Math.random()
+            .toString()
+            .substr(2)
+        ).toString(36);
+        this.widgets.splice(this.widgets.length, 0, obj);
+        this.$nextTick(() => {
+          this.layerClick(this.widgets.length - 1); // 复制后定位到最新的组件
+        });
+      } else {
+        // 多选复制
+        this.handleMouseDown();
+        const selectedWidgets = [];
+        const selectedWidgetsDom = [];
+        this.widgets.filter(c => {
+          this.selectedWidgets.filter(d => {
+            if (c.value.widgetId === d.value.widgetId) {
+              selectedWidgets.push(c)
+              selectedWidgetsDom.push(d)
+            }
+          })
+        })
+        this.selectedWidgets = [];
+        selectedWidgets.map((sw, index) => {
+          const newSw = this.deepClone(sw)
+          newSw.value.position.left += 100;
+          newSw.value.widgetId = Number(
+            Math.random()
+              .toString()
+              .substr(2)
+          ).toString(36);
+          this.widgets.push(newSw);
+          this.$nextTick(() => {
+            this.$refs.widgets.map(select => {
+              if (select.value.widgetId === newSw.value.widgetId) {
+                this.$nextTick(() => {
+                  select.$refs.draggable.setActive(true);
+                  this.selectedWidgets.push(select);
+                });
+              }
+            })
+          })
+        })
+      }
+    },
+    // 置顶
+    istopLayer() {
+      if (this.rightClickIndex + 1 < this.widgets.length) {
+        const temp = this.widgets.splice(this.rightClickIndex, 1)[0];
+        this.widgets.push(temp);
+      }
+      this.widgetIndex = this.widgets.indexOf(this.rightClickWidget);
+      this.widgetsClickFocus(this.widgetIndex);
+    },
+    // 置底
+    setlowLayer() {
+      if (this.rightClickIndex != 0) {
+        this.widgets.unshift(this.widgets.splice(this.rightClickIndex, 1)[0]);
+      }
+      this.widgetIndex = this.widgets.indexOf(this.rightClickWidget);
+      this.widgetsClickFocus(this.widgetIndex);
+    },
+    // 上移一层
+    moveupLayer() {
+      if (this.rightClickIndex != 0) {
+        this.widgets[this.rightClickIndex] = this.widgets.splice(
+          this.rightClickIndex - 1,
+          1,
+          this.widgets[this.rightClickIndex]
+        )[0];
+      } else {
+        this.widgets.push(this.widgets.shift());
+      }
+      this.widgetIndex = this.widgets.indexOf(this.rightClickWidget);
+      this.widgetsClickFocus(this.widgetIndex);
+    },
+    // 下移一层
+    movedownLayer() {
+      if (this.rightClickIndex != this.widgets.length - 1) {
+        this.widgets[this.rightClickIndex] = this.widgets.splice(
+          this.rightClickIndex + 1,
+          1,
+          this.widgets[this.rightClickIndex]
+        )[0];
+      } else {
+        this.widgets.unshift(this.widgets.splice(this.rightClickIndex, 1)[0]);
+      }
+      this.widgetIndex = this.widgets.indexOf(this.rightClickWidget);
+      this.widgetsClickFocus(this.widgetIndex);
+    },
+    //对齐
+    alignment(align) {
+      if(this.selectedWidgets.length <= 1) {
+        this.$message.error("请至少选择两个组件对齐");
+        return;
+      }
+      console.log("对齐方式：" + align);
+      let topWidget = this.selectedWidgets[0]; //最上组件(左右对齐使用)
+      let leftWidget = this.selectedWidgets[0]; //最左组件(上下对齐使用)
+      let minTop = this.selectedWidgets[0].value.position.top;
+      let minLeft = this.selectedWidgets[0].value.position.left;
+      //如果是框选的话，以【最上组件】【最左组件】为标准对齐;如果是Ctrl多选方式，则以第一个选中的组件为标准对齐，组合多选以框选逻辑为准
+      if(this.kuangSelectFlag){
+        for(let i = 0; i< this.selectedWidgets.length; i++){
+          let widget = this.selectedWidgets[i];
+          if( minTop > widget.value.position.top){
+            minTop = widget.value.position.top;
+            topWidget = widget;
+          }
+          if( minLeft > widget.value.position.left){
+            minLeft = widget.value.position.left;
+            leftWidget = widget;
+          }
+        }
+      }
+      for(let i = 0; i< this.selectedWidgets.length; i++){
+        let widget = this.selectedWidgets[i];
+        this.$refs.widgets.forEach(w=>{
+          if(w.value.widgetId === widget.value.widgetId){
+            w.$refs.draggable.setActive(false);
+          }
+        });
+        this.widgets.forEach(w=>{
+          if(w.value.widgetId === widget.value.widgetId){
+            switch (align){
+              case "left":  //左对齐
+                w.value.position.left = topWidget.value.position.left;
+                break;
+              case "right":  //右对齐
+                w.value.position.left = topWidget.value.position.left + topWidget.value.position.width - w.value.position.width;
+                break;
+              case "horizontal_center":  //左右居中对齐
+                w.value.position.left = topWidget.value.position.left + topWidget.value.position.width/2 - w.value.position.width /2;
+                break;
+              case "top":  //上对齐
+                w.value.position.top = leftWidget.value.position.top;
+                break;
+              case "bottom":  //下对齐
+                w.value.position.top = leftWidget.value.position.top + leftWidget.value.position.height - w.value.position.height;
+                break;
+              case "vertical_center":  //上下居中对齐
+                w.value.position.top = leftWidget.value.position.top + leftWidget.value.position.height/2 - w.value.position.height /2;
+                break;
+            }
+          }
+        });
+      }
+      this.selectedWidgets = [];
+      if(this.rect){
+        document.getElementById("workbench").removeChild(this.rect);
+      }
+      this.kuangSelectFlag = false;
+    },
+    // 获取图层数据
+    getLayerData(val) {
+      const layerWidgetArr = [];
+      for (let i = 0; i < val.length; i++) {
+        const obj = {};
+        const myItem = getToolByCode(val[i].type);
+        obj.icon = myItem.icon;
+        obj.code = myItem.code; // 组件类型code
+        obj.widgetId = val[i].value.widgetId || ""; // 唯一id
+        if (val[i].value.paramsKeys) {
+          obj.paramsKeys = val[i].value.paramsKeys;
+        }
+
+        const options = val[i].options["setup"];
+        options.forEach((el) => {
+          if (el.name == "layerName") {
+            obj.label = el.value;
+          }
+        });
+        layerWidgetArr.push(obj);
+      }
+      this.layerWidget = layerWidgetArr;
+    },
+    // 返回每个组件的动态数据集参数配置情况
+    handlerdynamicDataParamsConfig(val) {
+      this.widgetParamsConfig = val.map((item) => {
+        return item.value.data;
+      });
+    },
+    // 在缩放模式下的大小
+    getPXUnderScale(px) {
+      return this.bigscreenScaleInWorkbench * px;
+    },
+    dragStart(widgetCode) {
+      this.dragWidgetCode = widgetCode;
+      this.currentWidgetTotal = this.widgets.length; // 当前操作面板上有多少各组件
+    },
+    dragEnd() {
+      /**
+       * 40@remarks 新增组件到操作面板后，右边的配置有更新，但是当前选中的组件没更新，导致配置错乱的bug;
+       * 由于拖动组件拖到非操作面板上是不会添加组件，还需判断是否添加组件到操作面板上;
+       */
+      this.$nextTick(() => {
+        if (this.widgets.length === this.currentWidgetTotal + 1) {
+          // 确实新增了一个组件到操作面板上
+          console.log(
+            `新添加 '${
+              this.widgets[this.currentWidgetTotal].value.setup.layerName
+            }' 组件到操作面板`
+          );
+          const uuid = Number(Math.random().toString().substr(2)).toString(36);
+          this.widgets[this.currentWidgetTotal].value.widgetId = uuid;
+          this.layerWidget[this.currentWidgetTotal].widgetId = uuid;
+          this.widgets[this.currentWidgetTotal].value.widgetCode = this.dragWidgetCode;
+          const index = this.widgets.length - 1;
+          this.widgetIndex = index;
+          this.widgetsClickAndCtrl(index); // 选中当前新增的组件
+          this.grade = false; // 去除网格线
+        }
+      });
+    },
+    dragOver(evt) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      evt.dataTransfer.dropEffect = "copy";
+    },
+    // 拖动一个组件放到工作区中去，在拖动结束时，放到工作区对应的坐标点上去
+    widgetOnDragged(evt) {
+      let widgetType = this.dragWidgetCode;
+
+      // 获取结束坐标和列名
+      let eventX = evt.clientX; // 结束在屏幕的x坐标
+      let eventY = evt.clientY; // 结束在屏幕的y坐标
+
+      let workbenchPosition = this.getDomTopLeftById("workbench");
+      let widgetTopInWorkbench = eventY - workbenchPosition.top;
+      let widgetLeftInWorkbench = eventX - workbenchPosition.left;
+
+      const targetScale =
+        this.currentSizeRangeIndex === this.defaultSize.index
+          ? this.bigscreenScaleInWorkbench
+          : this.sizeRange[this.currentSizeRangeIndex] / 100;
+      const x = widgetLeftInWorkbench / targetScale;
+      const y = widgetTopInWorkbench / targetScale;
+
+      // 复制一个组件
+      let tool = getToolByCode(widgetType);
+      let widgetJson = {
+        type: widgetType,
+        value: {
+          setup: {},
+          data: {},
+          position: {
+            width: 0,
+            height: 0,
+            left: 0,
+            top: 0,
+            zIndex: 0,
+          },
+        },
+        options: tool.options,
+      };
+      // 处理默认值
+      const widgetJsonValue = this.getWidgetConfigValue(widgetJson);
+
+      widgetJsonValue.value.position.left =
+        x - widgetJsonValue.value.position.width / 2;
+      widgetJsonValue.value.position.top =
+        y - widgetJsonValue.value.position.height / 2;
+      // 将选中的复制组件，放到工作区中去
+      this.widgets.push(this.deepClone(widgetJsonValue));
+      // 激活新组件的配置属性
+      this.setOptionsOnClickWidget(this.widgets.length - 1);
+    },
+    getWidgetConfigValue(widgetJson) {
+      this.setWidgetConfigValue(
+        widgetJson.options.setup,
+        widgetJson.value.setup
+      );
+      this.setWidgetConfigValue(
+        widgetJson.options.position,
+        widgetJson.value.position
+      );
+      this.setWidgetConfigValue(widgetJson.options.data, widgetJson.value.data);
+      return widgetJson;
+    },
+    setWidgetConfigValue(config, configValue) {
+      // 循环遍历前非空判断
+      if (config) {
+        config.forEach((item) => {
+          if (this.isObjectFn(item)) {
+            configValue[item.name] = item.value;
+          }
+          if (this.isArrayFn(item)) {
+            item.forEach((itemChild) => {
+              itemChild.list.forEach((ev) => {
+                configValue[ev.name] = ev.value;
+              });
+            });
+          }
+        });
+      }
+    },
+    layerClick(event,index) {
+      this.widgetIndex = index;
+      this.widgetsClick(event,index);
+    },
+    // 如果是点击大屏设计器中的底层，加载大屏底层属性
+    setOptionsOnClickScreen() {
+      console.log("setOptionsOnClickScreen");
+      if(this.selectedWidgets.length > 0  && this.kuangSelectFlag){
+        //如果Ctrl多选过程中，点击了大屏底层，就清空 this.selectedWidgets
+        return;
+      }
+      this.selectFlag = false;
+      this.kuangSelectFlag = false;
+      this.selectedWidgets = [];
+      this.screenCode = "screen";
+      // 选中不同的组件 右侧都显示第一栏
+      this.activeName = "first";
+      this.widgetOptions = getToolByCode("screen")["options"];
+    },
+    // 如果是点击某个组件，获取该组件的配置项
+    setOptionsOnClickWidget(obj) {
+      this.screenCode = "";
+      if (typeof obj == "number") {
+        this.widgetOptions = this.deepClone(this.widgets[obj]["options"]);
+        return;
+      }
+      if (obj.index < 0 || obj.index >= this.widgets.length) {
+        return;
+      }
+      this.widgetIndex = obj.index;
+      this.widgets[obj.index].value.position = obj;
+      this.widgets[obj.index].options.position.forEach((el) => {
+        for (const key in obj) {
+          if (el.name == key) {
+            el.value = obj[key];
+          }
+        }
+      });
+      this.widgetOptions = this.deepClone(this.widgets[obj.index]["options"]);
+    },
+    widgetsClick(event,index) {
+      console.log("widgetsClick");
+      //判断是否按住了Ctrl按钮，表示Ctrl多选
+      let _this = this;
+      let eventWidget = null;
+      if(event.currentTarget.__vue__ != null) { // //解决图层栏点击组件定位问题(批量移动改造导致的问题)
+        eventWidget = event.currentTarget.__vue__.$parent;//vue3已经弃用__vue__
+      }
+      if(eventWidget != null){
+        if(event.ctrlKey){ //Ctrl左键选中或者取消选中
+          if(this.selectedWidgets.includes(eventWidget)){
+            this.selectedWidgets = this.selectedWidgets.filter(w=> w!== eventWidget);
+            this.$refs.widgets.forEach(w=>{
+              if(eventWidget.value.widgetId === w.value.widgetId){
+                setTimeout(function (){
+                  _this.$refs.widgets[index].$refs.draggable.setActive(false);
+                  console.log("触发取消选中, eventWidget.value.widgetId = " + eventWidget.value.widgetId +", w.value.widgetId= "+ w.value.widgetId);
+                },200); //设置超时，防止效果被覆盖
+              }
+            })
+            return;
+          }
+          this.widgetsClickAndCtrl(event, index);
+          return;
+        }
+        if(this.selectedWidgets.includes(eventWidget)){  //右键点击菜单的时候 ， 批量拖拽的时候
+          this.openMulDrag = true;
+          this.moveWidgets = {};
+          for (let i = 0; i < this.$refs.widgets.length; i++) {
+            let widget = {
+              left: this.$refs.widgets[i].value.position.left,
+              top: this.$refs.widgets[i].value.position.top
+            };
+            this.moveWidgets[this.$refs.widgets[i].value.widgetId] = widget;
+          }
+          this.calculateMousePosition(event, true);
+          return;
+        }
+      }
+      this.widgetsClickFocus(index);
+    },
+    widgetsClickFocus(index){
+      this.selectedWidgets = []; //单选的时候需要清空
+      this.selectedWidgets.push(this.$refs.widgets[index]); //确保第一个选中的组件添加到集合，不需要按住Ctrl键
+      const draggableArr = this.$refs.widgets;
+      for (let i = 0; i < draggableArr.length; i++) {
+        if (i == index) {
+          this.$refs.widgets[i].$refs.draggable.setActive(true);
+        } else {
+          this.$refs.widgets[i].$refs.draggable.setActive(false);
+        }
+      }
+      this.setOptionsOnClickWidget(index);
+      this.grade = true;
+    },
+    //Ctrl鼠标点击事件
+    widgetsClickAndCtrl(event, index) {
+      const draggableArr = this.$refs.widgets;
+      for (let i = 0; i < draggableArr.length; i++) {
+        if (i === index && ! this.selectedWidgets.includes(this.$refs.widgets[i])) {
+          this.selectedWidgets.push(this.$refs.widgets[i]); //选中的添加到集合
+        }
+      }
+    },
+    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) {
+      console.log("key", key);
+      console.log("val", val);
+      console.log(this.widgetOptions);
+      if (this.screenCode == "screen") {
+        let newSetup = [];
+        this.dashboard = this.deepClone(val);
+        console.log("asd", this.dashboard);
+        console.log(this.widgetOptions);
+        if (this.bigscreenWidth != this.dashboard.width) {
+          this.bigscreenWidth = this.dashboard.width;
+        }
+        if (this.bigscreenHeight != this.dashboard.height) {
+          this.bigscreenHeight = this.dashboard.height;
+        }
+        this.widgetOptions.setup.forEach((el) => {
+          if (el.name == "width") {
+            el.value = this.bigscreenWidth;
+          } else if (el.name == "height") {
+            el.value = this.bigscreenHeight;
+          } else if (this.dashboard.hasOwnProperty(el.name)) {
+            el["value"] = this.dashboard[el.name];
+          }
+          newSetup.push(el);
+        });
+        console.log(newSetup);
+        this.widgetOptions.setup = newSetup;
+      } else {
+        for (let i = 0; i < this.widgets.length; i++) {
+          if (this.widgetIndex == i) {
+            this.widgets[i].value[key] = this.deepClone(val);
+            this.setDefaultValue(this.widgets[i].options[key], val);
+          }
+        }
+      }
+    },
+    setDefaultValue(options, val) {
+      for (let i = 0; i < options.length; i++) {
+        if (this.isObjectFn(options[i])) {
+          for (const k in val) {
+            if (options[i].name == k) {
+              options[i].value = val[k];
+            }
+          }
+        } else if (this.isArrayFn(options[i])) {
+          for (let j = 0; j < options[i].length; j++) {
+            const list = options[i][j].list;
+            for (let z = 0; z < list.length; z++) {
+              for (const k in val) {
+                if (list[z].name == k) {
+                  list[z].value = val[k];
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    datadragEnd(evt) {
+      evt.preventDefault();
+      this.widgets = this.swapArr(this.widgets, evt.oldIndex, evt.newIndex);
+    },
+    //计算鼠标坐标
+    calculateMousePosition(event, isStart){
+      let workbenchPosition = this.getDomTopLeftById("workbench");
+      let widgetTopInWorkbench = event.clientY - workbenchPosition.top;
+      let widgetLeftInWorkbench = event.clientX - workbenchPosition.left;
+      const targetScale =
+        this.currentSizeRangeIndex === this.defaultSize.index
+          ? this.bigscreenScaleInWorkbench
+          : this.sizeRange[this.currentSizeRangeIndex] / 100;
+      const x = widgetLeftInWorkbench / targetScale;
+      const y = widgetTopInWorkbench / targetScale;
+      if(isStart){
+        this.downX = x;
+        this.downY = y;
+      }else{
+        this.downX2 = x;
+        this.downY2 = y;
+      }
+    },
+    //鼠标按下事件
+    downEvent(event){
+      console.log("downEvent")
+      this.moveTimes = 0;
+      this.selectedWidgets = [];
+      this.openMulDrag = false;
+      this.selectFlag = true;
+      this.kuangSelectFlag = false; //框选标志
+      //鼠标位置
+      this.calculateMousePosition(event, true)
+
+      if(this.rect != null){
+        document.getElementById("workbench").removeChild(this.rect);
+        this.rect = null;
+      }
+    },
+    //鼠标移动事件
+    moveEvent(event){
+      console.log("moveEvent");
+      //测试的时候发现，每次点击组件，再次点击大屏的时候，偶尔会触发一次moveEvent,导致会生成rect，所以加了移动次数moveTimes 变量控制一下，只有移动多次的情况下，才能说明是框选多选
+      if(this.selectFlag && this.selectedWidgets.length <= 1 && this.moveTimes >= 1){
+        if(this.rect === null){
+          //这里说明一下，为啥不在downEvent方法中创建，是因为
+          this.rect = document.createElement("div");
+          this.rect.style.cssText = "position:absolute; width:0px; height:0px; font-size:0px; margin:0px; border: 1px dashed #0099FF; background-color: #C3D5ED";
+          this.rect.id = "selectedDiv";
+          this.rect.style.left = this.downX +"px";
+          this.rect.style.top = this.downY+"px";
+          this.rect.style.left = this.downX;
+          this.rect.style.top = this.downY;
+        }
+        document.getElementById("workbench").appendChild(this.rect);
+        this.calculateMousePosition(event, false);
+
+        if(this.rect.style.display === "none"){
+          this.rect.style.display = "";
+        }
+        this.rect.style.left = Math.min(this.downX, this.downX2) + "px";
+        this.rect.style.top = Math.min(this.downY, this.downY2) + "px";
+        this.rect.style.width = Math.abs(this.downX -  this.downX2) + "px";
+        this.rect.style.height = Math.abs(this.downY -  this.downY2) + "px";
+        if(this.downX2 < this.downX && this.downY2 < this.downY){
+          this.rect.style.left = this.downX2;
+          this.rect.style.top = this.downY2;
+        }
+        if(this.downX2 > this.downX2 && this.downY2 < this.downY){
+          this.rect.style.left = this.downX;
+          this.rect.style.top = this.downY2;
+        }
+        if(this.downX2 < this.downX && this.downY2 > this.downY){
+          this.rect.style.left = this.downX2;
+          this.rect.style.top = this.downY;
+        }
+        if(this.downX2 > this.downX2 && this.downY2 > this.downY){
+          this.rect.style.left = this.downX;
+          this.rect.style.top = this.downY;
+        }
+      }
+      if (this.openMulDrag) {
+        this.mulWidgetMove(event);
+      }
+      this.moveTimes++;
+    },
+    //批量拖拽移动
+    mulWidgetMove(event){
+      let _this = this;
+      if(this.openMulDrag && this.selectedWidgets.length >= 2){
+        this.calculateMousePosition(event, false);
+        setTimeout(function (){
+          _this.selectedWidgets.forEach(sw=>{
+            for (let i = 0; i < _this.$refs.widgets.length; i++) {
+              if(sw.value.widgetId === _this.$refs.widgets[i].value.widgetId){
+                _this.$refs.widgets[i].value.position.left = _this.moveWidgets[_this.$refs.widgets[i].value.widgetId].left + (_this.downX2 - _this.downX);
+                _this.$refs.widgets[i].value.position.top =  _this.moveWidgets[_this.$refs.widgets[i].value.widgetId].top + (_this.downY2 - _this.downY);
+              }
+            }
+          });
+        },50);
+      }
+    },
+    upEvent(event){
+      console.log("upEvent")
+      if(this.selectFlag && this.selectedWidgets.length === 0 &&  this.rect !== null){
+        this.calculateMousePosition(event, false);
+
+        //计算选择框内的组件
+        const draggableArr = this.$refs.widgets;
+        for (let i = 0; i < draggableArr.length; i++) {
+          //判断组件是否在选择框内
+          let widget = this.$refs.widgets[i];
+          if(this.intersection(widget)){
+            this.selectedWidgets.push(widget);
+            widget.$refs.draggable.setActive(true);
+          }
+        }
+        this.selectFlag = false;
+        this.kuangSelectFlag = true; //框选结束的时候
+      }
+      if(this.rect){
+        document.getElementById("workbench").removeChild(this.rect);
+        this.rect = null;
+      }
+      if(this.openMulDrag){
+        this.mulWidgetMove(event);
+        this.openMulDrag = false;
+      }
+    },
+    //判断矩形框与组件是否相交
+    intersection(widget){
+      return (
+          (widget.value.position.left - this.downX) * (widget.value.position.left - this.downX2) < 0 ||
+          (widget.value.position.left + widget.value.position.width - this.downX) * (widget.value.position.left + widget.value.position.width- this.downX2) < 0
+        )
+        &&
+        (
+          (widget.value.position.top - this.downY) * (widget.value.position.top - this.downY2) < 0 ||
+          (widget.value.position.top + widget.value.position.height - this.downY) * (widget.value.position.top + widget.value.position.height- this.downY2) < 0
+        );
+    }
+  },
+};
+</script>
+
+<style lang="scss">
+@import "@/assets/styles/screen.scss";
+</style>
diff --git a/src/views/bigscreenDesigner/designer/components/dynamicForm.vue b/src/views/bigscreenDesigner/designer/components/dynamicForm.vue
index 0d4c9b2..70a4f76 100644
--- a/src/views/bigscreenDesigner/designer/components/dynamicForm.vue
+++ b/src/views/bigscreenDesigner/designer/components/dynamicForm.vue
@@ -13,8 +13,10 @@
           <el-form-item
             v-if="
               inputShow[item.name] &&
+              item.type != 'el-collapse'&&
               item.type != 'dycustComponents' &&
-              item.type != 'dynamic-add-table'
+              item.type != 'dynamic-add-table'&&
+              (item.name != 'is_drill_drown' || hideDrill === false)
             "
             :label="item.label"
             :prop="item.name"
@@ -155,7 +157,7 @@
                 <el-button type="primary" @click="saveData">确 定</el-button>
               </span>
             </el-dialog>
-
+       
             <el-dialog
               title="代码编辑"
               :visible.sync="methodsVisible"
@@ -173,6 +175,15 @@
               </span>
             </el-dialog>
           </el-form-item>
+          <el-collapse   v-if="inputShow[item.name] && item.type === 'el-collapse'">
+              <el-collapse-item
+                class="collapseItem1" 
+                :title="item.label"
+                @click.prevent.native="handleCollapse"
+                :name="item.label"
+                >
+              </el-collapse-item>
+          </el-collapse>
           <dynamicComponents
             v-if="item.type == 'dycustComponents' && inputShow[item.name]"
             v-model="formData[item.name]"
@@ -336,6 +347,7 @@
 <script>
 import ColorPicker from "./colorPicker.vue";
 import vueJsonEditor from "vue-json-editor";
+
 import "codemirror/lib/codemirror.css"; // 核心样式
 import "codemirror/theme/cobalt.css"; // 引入主题后还需要在 options 中指定主题才会生效
 // language
@@ -354,7 +366,7 @@ import componentLinkage from './componentLinkage';
 import imageSelect from './imageSelect';
 import multiIframeManager from './multiIframeManager.vue';
 export default {
-  name: "DynamicForm",
+  name: "dynamic-form",
   components: {
     imageSelect,
     ColorPicker,
@@ -390,6 +402,10 @@ export default {
     widgetIndex: {
       type: Number,
       default: -1
+    },
+    hideDrill:{
+      type: Boolean,
+      default:false,
     }
   },
   data() {
@@ -399,6 +415,8 @@ export default {
       dialogVisibleStaticData: false,
       methodsVisible: false,
       validationRules: "",
+     
+   
       optionsJavascript: {
         mode: "text/javascript",
         tabSize: 2, // 缩进格式
@@ -416,6 +434,7 @@ export default {
     value(newValue, oldValue) {
       this.formData = newValue || {};
     },
+    
     options(val) {
       this.setDefaultValue();
       this.isShowData();
@@ -427,6 +446,12 @@ export default {
   },
   mounted() {},
   methods: {
+    handleCollapse(){
+      this.$emit('handleCollapse',this.formData)
+    },
+    changeDrillData(val){
+      this.changed(val, 'drill_drown_setting')
+    },
     onJsonChange(val) {
       console.log(val);
     },
@@ -442,7 +467,6 @@ export default {
       } else {
         this.$set(this.formData, key, val);
       }
-
       this.$emit("onChanged", this.formData);
       // key为当前用户操作的表单组件
       for (let i = 0; i < this.options.length; i++) {
@@ -465,6 +489,7 @@ export default {
     handleClose() {
       this.dialogVisibleStaticData = false;
       this.methodsVisible = false;
+     
     },
     // 组件属性 数据是否展示动态还是静态数据
     isShowData() {
@@ -480,8 +505,9 @@ export default {
         }
       }
       data.forEach((el) => {
-        if (el.relactiveDomValue != currentData.value) {
+        if (el.relactiveDomValue != currentData.value&&el.name!=='drill_drown_setting') {
           this.inputShow[el.name] = false;
+          console.log(el.name)
         }
       });
     },
@@ -494,6 +520,9 @@ export default {
             this.formData[this.options[i].name] = this.deepClone(
               this.options[i].value
             );
+            if(this.options[i].name=="is_drill_drown"&&this.formData[this.options[i].name]){
+               this.inputShow['drill_drown_setting']=true
+            }
           } else if (Object.prototype.toString.call(obj) == "[object Array]") {
             for (let j = 0; j < obj.length; j++) {
               const list = obj[j].list;
@@ -515,6 +544,12 @@ export default {
 </script>
 
 <style lang="scss">
+.dialogDrillDrown.el-dialog__wrapper .el-dialog{
+  .el-dialog__body{
+    max-height:calc(100vh - 60px) !important;
+    overflow-y:hidden !important;
+  }
+}
 .el-form-item {
   margin-bottom: 5px;
 }
@@ -547,4 +582,9 @@ export default {
   background: transparent;
   padding-bottom: 0;
 }
+.collapseItem1 .el-collapse-item__arrow.is-active{
+  cursor:pointer;
+  color: #bcc9d4;
+  transform:rotate(0)
+}
 </style>
diff --git a/src/views/bigscreenDesigner/designer/index.vue b/src/views/bigscreenDesigner/designer/index.vue
index c00963b..c897ae7 100644
--- a/src/views/bigscreenDesigner/designer/index.vue
+++ b/src/views/bigscreenDesigner/designer/index.vue
@@ -310,11 +310,12 @@
           label="配置"
         >
           <dynamicForm
-            ref="formData"
+            ref="formData1"
             :options="widgetOptions.setup"
             :layer-widget="layerWidget"
             :widget-index="widgetIndex"
             :widget-params-config="widgetParamsConfig"
+            @handleCollapse="handleCollapse"
             @onChanged="(val) => widgetValueChanged('setup', val)"
           />
         </el-tab-pane>
@@ -342,7 +343,15 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-
+     <el-dialog
+       title="下钻配置"
+       :visible.sync="dialogVisibleDrillDrown"
+       width="100%"
+       class="dialogDrillDrown"
+     >
+      
+       <drill-drown-setting @submitDrillDrownData="submitDrillDrownData" :screenData="screenData"></drill-drown-setting>
+     </el-dialog>
     <content-menu
       :visible.sync="visibleContentMenu"
       :style-obj="styleObj"
@@ -367,7 +376,7 @@ import dynamicForm from "./components/dynamicForm.vue";
 import draggable from "vuedraggable";
 import VueRulerTool from "vue-ruler-tool"; // 大屏设计页面的标尺插件
 import contentMenu from "./components/contentMenu";
-
+import DrillDrownSetting from "./components/drillDrownSetting";
 export default {
   name: "Login",
   components: {
@@ -376,11 +385,13 @@ export default {
     widget,
     dynamicForm,
     contentMenu,
+    DrillDrownSetting
   },
   mixins: [mixin],
   data() {
     return {
       grade: false,
+      dialogVisibleDrillDrown:false,
       layerWidget: [],
       widgetTools: widgetTools, // 左侧工具栏的组件图标，将js变量加入到当前作用域
       widthLeftForTools: 200, // 左侧工具栏宽度
@@ -388,7 +399,10 @@ export default {
       widthLeftForOptions: 300, // 右侧属性配置区
       widthPaddingTools: 18,
       toolIsShow: true, // 左侧工具栏是否显示
-
+      screenData:{
+        dashboard: {  },
+        widgets: []
+      },
       bigscreenWidth: 1920, // 大屏设计的大小
       bigscreenHeight: 1080,
 
@@ -494,6 +508,14 @@ export default {
     });
   },
   methods: {
+    submitDrillDrownData(data){
+      this.dialogVisibleDrillDrown=false
+      this.$refs.formData1.changeDrillData(data)
+    },
+    handleCollapse(val){
+      this.dialogVisibleDrillDrown=true
+      this.screenData=val.drill_drown_setting?val.drill_drown_setting:this.screenData
+    },
     // 获取图层数据
     getLayerData(val) {
       const layerWidgetArr = [];
@@ -506,6 +528,7 @@ export default {
         if (val[i].value.paramsKeys) {
           obj.paramsKeys = val[i].value.paramsKeys;
         }
+
         const options = val[i].options["setup"];
         options.forEach((el) => {
           if (el.name == "layerName") {
@@ -596,6 +619,7 @@ export default {
         options: tool.options,
       };
       // 处理默认值
+      console.log(widgetType)
       const widgetJsonValue = this.getWidgetConfigValue(widgetJson);
 
       widgetJsonValue.value.position.left =
@@ -618,7 +642,6 @@ export default {
         widgetJson.value.position
       );
       this.setWidgetConfigValue(widgetJson.options.data, widgetJson.value.data);
-
       return widgetJson;
     },
     setWidgetConfigValue(config, configValue) {
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js
index 245f1d0..68812a4 100644
--- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js
+++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js
@@ -70,6 +70,24 @@ export const widgetImage = {
         required: false,
         placeholder: '',
       },
+      {
+        type: 'el-switch',
+        label: '开启下钻',
+        name: 'is_drill_drown',
+        required: false,
+        placeholder: '',
+        value: false,
+      },
+       {
+        type: 'el-collapse',
+        label: '下钻配置',
+        name: 'drill_drown_setting',
+        relactiveDom:'is_drill_drown',
+        relactiveDomValue:true,
+        required: false,
+        placeholder: '',
+        value:''
+      },
     ],
     // 数据
     data: [],
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js
index 0bf0040..adf544d 100644
--- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js
+++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js
@@ -150,6 +150,24 @@ export const widgetText = {
         placeholder: '',
         value: false,
       },
+      {
+        type: 'el-switch',
+        label: '开启下钻',
+        name: 'is_drill_drown',
+        required: false,
+        placeholder: '',
+        value: false,
+      },
+      {
+        type: 'el-collapse',
+        label: '下钻配置',
+        name: 'drill_drown_setting',
+        relactiveDom:'is_drill_drown',
+        relactiveDomValue:true,
+        required: false,
+        placeholder: '',
+        value:''
+      },
       [
         {
           name: '自定义样式设置',
diff --git a/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime old.vue b/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime old.vue
new file mode 100644
index 0000000..4c4c679
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime old.vue	
@@ -0,0 +1,179 @@
+<!--
+ * @Author: qianlishi qianlishi@anji-plus.com
+ * @Date: 2023-03-06 15:38:10
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2023-04-20 13:54:57
+-->
+<template>
+  <el-date-picker
+    :style="styleObj"
+    v-model="timeValue"
+    :value-format="valueFormat"
+    :picker-options="datetimeRangePickerOptions"
+    :type="dateType"
+    @[eventChange]="change"
+  />
+</template>
+<script>
+import {
+  originWidgetLinkageLogic,
+  targetWidgetLinkageLogic,
+} from "@/views/bigscreenDesigner/designer/linkageLogic";
+import miment from 'miment'
+
+export default {
+  name: "WidgetFormTime",
+  props: {
+    value: Object,
+    ispreview: Boolean,
+    widgetIndex: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      timeValue: "",
+      optionsStyle: {},
+      optionsData: {},
+      optionsSetup: {},
+      //日期时间快捷选项
+      datetimeRangePickerOptions: {
+        shortcuts: [{
+          text: '今天',
+          onClick(picker) {
+            const start = new Date(new Date(new Date().getTime()).setHours(0, 0, 0, 0));
+            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '昨天',
+          onClick(picker) {
+            const start = new Date(new Date(new Date().getTime() - 24 * 60 * 60 * 1000).setHours(0, 0, 0, 0));
+            const end = new Date(new Date(new Date().getTime() - 24 * 60 * 60 * 1000).setHours(23, 59, 59, 999));
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
+            const start = new Date(new Date(new Date().getTime() + 24 * 60 * 60 * 1000));
+            start.setTime(miment().add(-6, 'DD').stamp());
+            new Date(start.setHours(0, 0, 0, 0));
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
+            const start = new Date();
+            start.setTime(miment().add(-1, 'MM').stamp());
+            new Date(start.setHours(0, 0, 0, 0));
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
+            const start = new Date();
+            start.setTime(miment().add(-3, 'MM').stamp());
+            new Date(start.setHours(0, 0, 0, 0));
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近半年',
+          onClick(picker) {
+            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
+            const start = new Date();
+            start.setTime(miment().add(-6, 'MM').stamp());
+            new Date(start.setHours(0, 0, 0, 0));
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一年',
+          onClick(picker) {
+            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
+            const start = new Date();
+            start.setTime(miment().add(-1, 'YY').stamp());
+            new Date(start.setHours(0, 0, 0, 0));
+            picker.$emit('pick', [start, end]);
+          }
+        }],
+        // disabledDate(time){
+        //   return time.getTime() > Date.now()
+        // }
+      }
+    };
+  },
+  computed: {
+    styleObj() {
+      return {
+        position: this.ispreview ? "absolute" : "static",
+        width: this.optionsStyle.width + "px",
+        height: this.optionsStyle.height + "px",
+        left: this.optionsStyle.left + "px",
+        top: this.optionsStyle.top + "px",
+        background: this.optionsSetup.select_background,
+      };
+    },
+    eventChange() {
+      return "change";
+    },
+    dateType() {
+      return this.optionsSetup.dateType || 'datetimerange';
+    },
+    valueFormat() {
+      return this.dateType === 'daterange' ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm:ss';
+    },
+    allComponentLinkage() {
+      return this.$store.state.designer.allComponentLinkage;
+    },
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.optionsSetup = val.setup;
+        this.optionsData = val.data;
+        this.optionsStyle = val.position;
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.optionsSetup = this.value.setup;
+    this.optionsData = this.value.data;
+    this.optionsStyle = this.value.position;
+
+    targetWidgetLinkageLogic(this); // 联动-目标组件逻辑
+  },
+  methods: {
+    change(event) {
+      const formTimeData = {}
+      formTimeData['startTime'] = event[0]  //startTime
+      formTimeData['endTime'] = event[1] //endTime
+      originWidgetLinkageLogic(this, true, {
+        currentData: formTimeData,
+      }); // 联动-源组件逻辑
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+  .el-select {
+  height: 100%;
+
+  .el-input {
+    height: 100%;
+
+    .el-input__inner {
+      height: 100%;
+      background: inherit;
+      color: inherit;
+
+      &::placeholder {
+        color: inherit;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue b/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue
index 4c4c679..3a971a0 100644
--- a/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue
+++ b/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue
@@ -5,14 +5,26 @@
  * @LastEditTime: 2023-04-20 13:54:57
 -->
 <template>
+  <div class="pickWrap">
+
   <el-date-picker
-    :style="styleObj"
-    v-model="timeValue"
-    :value-format="valueFormat"
-    :picker-options="datetimeRangePickerOptions"
-    :type="dateType"
-    @[eventChange]="change"
+  class="start-picker date-picker"
+  :style="styleObj"
+  v-model="startTime"
+  :value-format="valueFormat"
+  :type="dateType=='datetimerange'?'datetime':'date'"
+  @[eventChange]="change"
   />
+
+  <el-date-picker
+  class="date-picker"
+  :style="{...styleObj,left:styleObj.leftEnd,width:styleObj.widthEnd}"
+  v-model="endTime"
+  :value-format="valueFormat"
+  :type="dateType=='datetimerange'?'datetime':'date'"
+  @[eventChange]="change"
+  />
+  </div>
 </template>
 <script>
 import {
@@ -33,85 +45,23 @@ export default {
   },
   data() {
     return {
-      timeValue: "",
       optionsStyle: {},
       optionsData: {},
       optionsSetup: {},
-      //日期时间快捷选项
-      datetimeRangePickerOptions: {
-        shortcuts: [{
-          text: '今天',
-          onClick(picker) {
-            const start = new Date(new Date(new Date().getTime()).setHours(0, 0, 0, 0));
-            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '昨天',
-          onClick(picker) {
-            const start = new Date(new Date(new Date().getTime() - 24 * 60 * 60 * 1000).setHours(0, 0, 0, 0));
-            const end = new Date(new Date(new Date().getTime() - 24 * 60 * 60 * 1000).setHours(23, 59, 59, 999));
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
-            const start = new Date(new Date(new Date().getTime() + 24 * 60 * 60 * 1000));
-            start.setTime(miment().add(-6, 'DD').stamp());
-            new Date(start.setHours(0, 0, 0, 0));
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
-            const start = new Date();
-            start.setTime(miment().add(-1, 'MM').stamp());
-            new Date(start.setHours(0, 0, 0, 0));
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
-            const start = new Date();
-            start.setTime(miment().add(-3, 'MM').stamp());
-            new Date(start.setHours(0, 0, 0, 0));
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近半年',
-          onClick(picker) {
-            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
-            const start = new Date();
-            start.setTime(miment().add(-6, 'MM').stamp());
-            new Date(start.setHours(0, 0, 0, 0));
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一年',
-          onClick(picker) {
-            const end = new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 999));
-            const start = new Date();
-            start.setTime(miment().add(-1, 'YY').stamp());
-            new Date(start.setHours(0, 0, 0, 0));
-            picker.$emit('pick', [start, end]);
-          }
-        }],
-        // disabledDate(time){
-        //   return time.getTime() > Date.now()
-        // }
-      }
+      endTime:null,
+      startTime:null,
+
     };
   },
   computed: {
     styleObj() {
       return {
         position: this.ispreview ? "absolute" : "static",
-        width: this.optionsStyle.width + "px",
+        width: this.optionsStyle.width/2+12 + "px",
+        widthEnd: this.optionsStyle.width/2-12 + "px",
         height: this.optionsStyle.height + "px",
         left: this.optionsStyle.left + "px",
+        leftEnd: this.optionsStyle.left+this.optionsStyle.width/2+12 + "px",
         top: this.optionsStyle.top + "px",
         background: this.optionsSetup.select_background,
       };
@@ -149,8 +99,8 @@ export default {
   methods: {
     change(event) {
       const formTimeData = {}
-      formTimeData['startTime'] = event[0]  //startTime
-      formTimeData['endTime'] = event[1] //endTime
+      formTimeData['startTime'] = this.startTime //event[0]  //startTime
+      formTimeData['endTime'] = this.endTime //event[1] //endTime
       originWidgetLinkageLogic(this, true, {
         currentData: formTimeData,
       }); // 联动-源组件逻辑
@@ -159,21 +109,15 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-  .el-select {
-  height: 100%;
-
-  .el-input {
-    height: 100%;
-
-    .el-input__inner {
-      height: 100%;
-      background: inherit;
-      color: inherit;
-
-      &::placeholder {
-        color: inherit;
-      }
+.start-picker{
+    display:flex;
+    &:after{
+        content:'-';
+        width:24px;
+        transform:translate(7px,5px)
     }
-  }
+}
+.pickWrap{
+    display:flex;
 }
 </style>
diff --git a/src/views/bigscreenDesigner/designer/widget/temp.vue b/src/views/bigscreenDesigner/designer/widget/temp.vue
index 5291764..c45d2d7 100644
--- a/src/views/bigscreenDesigner/designer/widget/temp.vue
+++ b/src/views/bigscreenDesigner/designer/widget/temp.vue
@@ -5,6 +5,7 @@
       :value="value"
       :ispreview="true"
       :widget-index="index"
+      @oepnTheDrillView="$emit('oepnTheDrillView',$event)"
     />
   </div>
 </template>
@@ -58,7 +59,6 @@ import widgetChinaMap from "./map/widgetChinaMap.vue";
 import widgetGlobalMap from "./map/widgetGlobalMap.vue";
 import widgetBarStackMoreShowChart from "./bar/widgetBarStackMoreShowChart.vue";
 import widgetBarLineSingleChart from "./barline/widgetBarLineSingleChart.vue";
-
 export default {
   name: "WidgetTemp",
   components: {
diff --git a/src/views/bigscreenDesigner/designer/widget/texts/widgetImage.vue b/src/views/bigscreenDesigner/designer/widget/texts/widgetImage.vue
index 16794c4..781d1fa 100644
--- a/src/views/bigscreenDesigner/designer/widget/texts/widgetImage.vue
+++ b/src/views/bigscreenDesigner/designer/widget/texts/widgetImage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="imagebox" :style="styleColor">
+  <div class="imagebox" :style="styleColor"  @click="handleClick" >
     <img
       :class="transStyle.startRotate ? 'startImg' : ''"
       :style="imgStyle"
@@ -18,7 +18,8 @@ export default {
   },
   data() {
     return {
-      options: {}
+      options: {},
+      optionsSetup:{}
     };
   },
   computed: {
@@ -50,15 +51,26 @@ export default {
     value: {
       handler(val) {
         this.options = val;
+        this.optionsSetup = val.setup;
       },
       deep: true
     }
   },
   created() {
     this.options = this.value;
+     this.optionsSetup = this.value.setup;
   },
-  mounted() {},
-  methods: {}
+  mounted() {
+
+  },
+  methods: {
+    handleClick(){
+      console.log(this.optionsSetup)
+      if(!!this.optionsSetup.is_drill_drown){
+        this.$emit('oepnTheDrillView',this.optionsSetup.drill_drown_setting)
+      }
+    },
+  }
 };
 </script>
 
diff --git a/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue b/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
index 58ee6d8..4f4d140 100644
--- a/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
+++ b/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
@@ -5,7 +5,7 @@
  * @Last Modified time: 2022-3-14 14:04:24
  !-->
  <template>
-  <div class="text" :style="computedStyleColor">{{ styleColor.text }}</div>
+  <div class="text" @click="handleClick" :style="computedStyleColor">{{ styleColor.text }}</div>
 </template>
 <script>
 import {targetWidgetLinkageLogic} from "@/views/bigscreenDesigner/designer/linkageLogic";
@@ -84,6 +84,11 @@ export default {
     this.setOptionsData();
   },
   methods: {
+    handleClick(){
+      if(!!this.optionsSetup.is_drill_drown){
+        this.$emit('oepnTheDrillView',this.optionsSetup.drill_drown_setting)
+      }
+    },
     // 根据条件应用样式
     getConditionalStyle() {
       const setup = this.optionsSetup || {};
diff --git a/src/views/bigscreenDesigner/viewer/drillDrownView.vue b/src/views/bigscreenDesigner/viewer/drillDrownView.vue
new file mode 100644
index 0000000..c40c9bc
--- /dev/null
+++ b/src/views/bigscreenDesigner/viewer/drillDrownView.vue
@@ -0,0 +1,150 @@
+<!--
+ * @Descripttion: 大屏设计器 -- 预览
+ * @Author: Devli
+ * @Date: 2021-3-13 11:04:24
+ * @Last Modified by:   Raod
+ * @Last Modified time: 2022-5-6 11:04:24
+ !-->
+<template>
+  <div class="layout">
+    <div :style="bigScreenStyle">
+      <widget
+        v-for="(widget, index) in widgets"
+        :key="index"
+        v-model="widget.value"
+        :index="index"
+        :type="widget.type"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import widget from "../designer/widget/temp";
+import { detailDashboard } from "@/api/bigscreen";
+export default {
+  name: "Login",
+  components: {
+    widget
+  },
+  
+  data() {
+    return {
+      bigScreenStyle: {},
+      dashboard:{},
+      widgets: [],
+      viewData:{}
+    };
+  },
+  props:{
+    screenData:{
+      type:Object,
+      default:()=>{
+        return {
+           dashboard: {  },
+           widgets: []
+        }
+      }
+    }
+  },
+  watch: {
+    screenData: {
+      handler(val) {
+        this.viewData=val
+        this.getData();
+      },
+      deep: true,
+      immediate:true
+    }
+  },
+  mounted() {
+    this.viewData=this.screenData
+    this.getData();
+    window.onresize=this.Debounce(this.setScale,500);
+  },
+  methods: {
+    async getData() {
+      const data = {dashboard:{...this.viewData.dashboard,...this.viewData},widgets:null};
+      this.dashboard=data.dashboard||{};
+      const equipment = document.body.clientWidth;
+      const ratioEquipment = equipment / data.dashboard.width;
+      this.bigScreenStyle = {
+        width: data.dashboard.width + "px",
+        height: data.dashboard.height + "px",
+        "background-color": data.dashboard.backgroundColor,
+        "background-image": "url(" + data.dashboard.backgroundImage + ")",
+        "background-position": "0% 0%",
+        "background-size": "100% 100%",
+        "background-repeat": "initial",
+        "background-attachment": "initial",
+        "background-origin": "initial",
+        "background-clip": "initial",
+        transform: `scale(${ratioEquipment}, ${ratioEquipment})`,
+        "transform-origin": "0 0"
+      };
+      data.dashboard.widgets.forEach((item, index) => {
+        item.value.widgetId = item.value.setup.widgetId
+        item.value.widgetCode = item.value.setup.widgetCode
+        if (item.value.setup.componentLinkage && item.value.setup.componentLinkage.length) {
+          this.$store.commit('SET_ALL_COMPONENT_LINKAGE', {
+            index,
+            widgetId: item.value.widgetId,
+            linkageArr: item.value.setup.componentLinkage
+          })
+        }
+      })
+      this.widgets = data.dashboard.widgets;
+
+      // 定时刷新
+      if(data.dashboard.refreshSeconds>0) {
+        setTimeout(function(){ window.location.reload(); }, data.dashboard.refreshSeconds*1000);
+      }
+    },
+    Debounce:(fn,t)=>{
+      const delay=t||500;
+      let timer=null;
+      return(...args)=>{
+        if(timer){
+          clearTimeout(timer);
+        }
+        const context=this
+        timer=setTimeout(()=>{
+          fn.apply(context,args);
+        },delay);
+      }
+    },
+    setScale(){
+      const scale=this.getScale();
+      this.bigScreenStyle.transform='scale('+scale.scalex+','+scale.scaley+')'
+    },
+    getScale(){
+      let width = this.dashboard.width
+      let height = this.dashboard.height
+      // 固定宽度比例
+      const scalex = window.innerWidth / width
+      // 高度按相同比例缩放，但允许超出屏幕高度
+      const scaley = scalex
+      return {
+        scalex,
+        scaley
+      }
+    },
+  }
+};
+</script>
+
+<style lang="scss">
+
+.layout {
+  width: 100%;
+  height: 100%;
+  text-align: center;
+}
+.bottom-text {
+  width: 100%;
+  color: #a0a0a0;
+  position: fixed;
+  bottom: 16px;
+  z-index: 9999;
+}
+</style>
diff --git a/src/views/bigscreenDesigner/viewer/index.vue b/src/views/bigscreenDesigner/viewer/index.vue
index 96bdff8..ca3a8f2 100644
--- a/src/views/bigscreenDesigner/viewer/index.vue
+++ b/src/views/bigscreenDesigner/viewer/index.vue
@@ -14,24 +14,39 @@
         v-model="widget.value"
         :index="index"
         :type="widget.type"
+        @oepnTheDrillView="oepnTheDrillView"
       />
     </div>
+    <el-dialog 
+      :title="''"
+       class="dialogDrillDrown dialogDrillDrownView" :visible.sync="visiableDrillView">
+    <drill-drown-view :screenData="screenData"></drill-drown-view>
+  </el-dialog>
   </div>
+
 </template>
 
 <script>
 import widget from "../designer/widget/temp";
+import DrillDrownView from "./drillDrownView";
+
 import { detailDashboard } from "@/api/bigscreen";
 export default {
   name: "Login",
   components: {
-    widget
+    widget,
+    DrillDrownView
   },
   data() {
     return {
       bigScreenStyle: {},
       dashboard:{},
-      widgets: []
+      widgets: [],
+      screenData:{
+          dashboard: {  },
+          widgets: []
+      },
+      visiableDrillView:false
     };
   },
   mounted() {
@@ -39,6 +54,10 @@ export default {
     window.onresize=this.Debounce(this.setScale,500);
   },
   methods: {
+    oepnTheDrillView(val){
+      this.screenData=val
+      this.visiableDrillView=true
+    },
     async getData() {
       const reportCode = this.$route.query.reportCode;
       const { code, data } = await detailDashboard(reportCode);
@@ -117,6 +136,18 @@ export default {
   height: 100%;
   text-align: center;
 }
+.dialogDrillDrownView .el-dialog{
+  width:auto;
+  margin-top:0 !important;
+  .el-dialog__body{
+    padding:0;
+    height:calc(100vh - 60px);
+    overflow-y:auto;
+  }
+   .el-dialog__header .el-dialog__headerbtn{
+  top: 6px;
+}
+}
 .bottom-text {
   width: 100%;
   color: #a0a0a0;