弹窗自定义插入的单元格浮窗显示指标信息

src/views/Home.vue

@@ -851,6 +851,7 @@ export default {
     collapseHandle () {
       //折叠导航栏
       this.isCollapse = !this.isCollapse;
+      this.$store.commit('SET_COLLAPSE',this.isCollapse)
       // 派发折叠导航栏事件
       EventBus.$emit("collapseHandle", this.isCollapse);
     },

src/views/datasheet_manage/components/CustomTable.vue

@@ -303,7 +303,7 @@
 
 
       <!-- 添加 -->
-      <div class="add-fixed" v-if="!disabled" draggable @dragend="dragEnd">
+      <div class="add-fixed" v-if="!disabled" draggable @dragend="dragEnd" :style="isCollapse?'left:70px;':'left:200px;'">
         <div class="add-wrapper" v-show="!isSlideLeft">
           <div @click="addDateRow"> <i class="el-icon-circle-plus-outline"></i> 添加日期</div>
           <div @click="addTextRow"> <i class="el-icon-circle-plus-outline"></i> 添加文本</div>
@@ -429,6 +429,9 @@ export default {
     dateArr() {
       console.log(this.config.data)
       return this.config.data.length ? this.config.data[0].Data.map(_ => _.DataTime) : []
+    },
+    isCollapse() {
+      return this.$store.state.isCollapse
     }
   },
   data() {
@@ -754,8 +757,7 @@ export default {
 
     dragEnd(e) {
       let dom = document.querySelector('.add-fixed');
-      dom.style.top = e.clientY-105 + 'px';
-      dom.style.bottom = 0;
+      dom.style.top = e.clientY-10 + 'px';
     }
   },
 };
@@ -881,8 +883,8 @@ export default {
 
   .add-fixed {
     cursor: move;
-    position: absolute;
-    bottom: 20%;
+    position: fixed;
+    top: 70%;
     left: 0;
     z-index: 99;
     .add-wrapper {

src/views/datasheet_manage/components/MixedTable.vue

@@ -46,15 +46,43 @@
               :data-key="cell.Uid"
               @click="clickCell($event, cell)"
               @contextmenu.prevent="rightClickHandle($event,cell)"
+              @mouseenter="getRelationEdbInfo(cell)"
             >
+
+            <!-- 插入单元格禁止编辑 -->
+            <template v-if="[4,5].includes(cell.DataType) || disabled">
+              <!-- 单元格类型5显示指标浮窗 -->
+              <el-popover
+                v-if="cell.DataType===5&&!disabled"
+                placement="top-start"
+                width="350"
+                trigger="hover"
+              >
+                <ul>
+                  <li style="display:flex;margin:10px;">
+                    <label style="min-width:80px;">指标名称</label> 
+                    {{cellrelationEdbInfo.EdbName}}
+                  </li>
+                  <li style="display:flex;margin:10px;">
+                    <label style="min-width:80px;">指标ID</label> 
+                    {{cellrelationEdbInfo.EdbCode}}
+                  </li>
+                </ul>
+                <span
+                  slot="reference"
+                  :data-rindex="rowHeader[index]"
+                  :data-cindex="columnHeader[cell_index]"
+                  :data-key="cell.Uid"
+                >{{ cell.ShowValue }}</span>
+              </el-popover>
+
               <span
                 :data-rindex="rowHeader[index]"
                 :data-cindex="columnHeader[cell_index]"
                 :data-key="cell.Uid"
-                v-if="[4,5].includes(cell.DataType) || disabled"
-              >
-                {{ cell.ShowValue }}</span
-              >
+                v-else
+              >{{ cell.ShowValue }}</span>
+            </template>
 
               <el-autocomplete
                 v-else
@@ -157,7 +185,9 @@ export default {
 
       insertRelationArr: [],
 
-      isSelectTargetValueDialog: false
+      isSelectTargetValueDialog: false,
+
+      cellrelationEdbInfo: {}
     };
   },
   mounted() {
@@ -518,6 +548,8 @@ export default {
       this.insertTargetCell.Value = value;
       this.insertTargetCell.EdbInfoId = edbId;
 
+      this.$message.success('插入成功')
+
       //建立新的关联关系
       let relation = {
         insert_cell: {
@@ -636,6 +668,17 @@ export default {
 
     },
 
+    /* 单元格类型5 浮到上面展示指标信息浮窗 */
+    async getRelationEdbInfo({EdbInfoId,DataType}) {
+      if(DataType!==5||this.disabled) return
+
+      const res = await dataBaseInterface.targetDetail({EdbInfoId})
+
+      if(res.Ret !== 200) return
+
+      this.cellrelationEdbInfo =  res.Data;
+    },
+
     /* 初始化8行5列 */
     initData(initData=null) {
       if(initData) {

src/views/datasheet_manage/components/selectTargetValueDia.vue

@@ -13,8 +13,8 @@
       />
 
       <ul class="data-cont">
-        <template v-if="dataList.length">
-          <li v-for="(item,index) in dataList" :key="index" class="data-li">
+        <template v-if="result.List">
+          <li v-for="(item,index) in result.List" :key="index" :class="[{'choose': item.DataTime===result.Date},'data-li']">
             <span>{{item.DataTime}}</span>
             <span style="min-width:150px">{{item.Value}}</span>
           </li>
@@ -23,7 +23,7 @@
       </ul>
 
       <div class="dia-bot">
-        <el-button type="primary" style="margin-right: 20px" :disabled="!dataList.length" @click="insertData"
+        <el-button type="primary" style="margin-right: 20px" :disabled="!result.Date" @click="insertData"
           >插入值</el-button
         >
         <el-button type="primary" plain @click="cancelHandle">取消</el-button>
@@ -46,7 +46,7 @@ export default {
   components: { selectTarget },
   data() {
     return {
-      dataList: [],
+      result: {},
       chooseItem: {
         edbId: 0,
         value:''
@@ -64,7 +64,6 @@ export default {
         this.$refs.selectRef.search_txt='';
         return
       }
-      this.dataList = [];
 
       const res = await sheetInterface.getDateLatelyData({ 
         EdbInfoId: edb.EdbInfoId,
@@ -72,10 +71,11 @@ export default {
       })
       if(res.Ret !== 200) return
 
-      this.dataList = res.Data || [];
+      this.result = res.Data;
+      if(!this.result.Date) return this.$message.warning('所选指标所选日期无值')
       this.chooseItem = {
         edbId: edb.EdbInfoId,
-        value: this.dataList.find(_ =>_.DataTime===this.$parent.selectCell.ShowValue)?this.dataList.find(_ =>_.DataTime===this.$parent.selectCell.ShowValue).Value:''
+        value: this.result.Date?this.result.List.find(_ =>_.DataTime===this.result.Date).Value.toString():''
       }
 
     },
@@ -86,8 +86,8 @@ export default {
     },
 
     cancelHandle() {
-      this.dataList = [];
-      this.chooseItem = { edbId:0,value:'' };
+      this.result = {};
+      this.chooseItem = {};
       this.$refs.selectRef.search_txt='';
       this.$emit('update:isShow',false);
       resetDialogCellStyle();

src/vuex/index.js

@@ -20,6 +20,7 @@ const state = {
     "rai_researcher", //权益研究员
     "ficc_researcher", //ficc研究员
   ],
+  isCollapse: false
 };
 
 export default {

src/vuex/mutations.js

@@ -8,6 +8,9 @@ const mutations = {
   SET_DATA_AUTH(state, bool) {
     state.dataAuth = bool;
   },
+  SET_COLLAPSE(state,bool) {
+    state.isCollapse = bool;
+  }
 };
 
 export default mutations;