switch branch

src/views/datasheet_manage/components/MixedTable.vue

@@ -93,7 +93,7 @@
 
     <!-- 选择指标 -->
     <selectTargetValueDia
-      :isShow.sync="isSelectTargetValue"
+      :isShow.sync="isSelectTargetValueDialog"
     />
   </div>
 </template>
@@ -117,9 +117,10 @@ export default {
   props: {
     disabled: { //是否只预览
       type: Boolean,
-      default: false
+      default: false,
     }
   },
+  components: { selectTargetValueDia },
   computed: {
     //列头
     columnHeader() {
@@ -147,7 +148,7 @@ export default {
 
       insertRelationArr: [],
 
-      isSelectTargetValue: false
+      isSelectTargetValueDialog: false
     };
   },
   mounted() {
@@ -479,9 +480,15 @@ export default {
         'reset': this.clearCell
       }
       keyMap[key] && keyMap[key](key)
+      
       this.hideContextMenu()
     },
 
+    /* 打开选择指标弹窗 */
+    selectTargetOpen() {
+      this.isSelectTargetValueDialog = true;
+    },
+
     /* 清除单元格内容 格式 关联关系 */
     clearCell() {
       if(this.selectCell.DataType===4) resetRelationStyle();

src/views/datasheet_manage/components/selectTargetValueDia.vue

@@ -6,16 +6,33 @@
     :modal="false"
     title="选择指标"
     @close="cancelHandle"
-    custom-class="savechart-dialog"
+    custom-class="select-target-value-dialog"
     center
-    width="650px"
+    width="550px"
     v-dialogDrag
   >
     <div class="main">
       <selectTarget
         ref="xSelectRef"
-        @select="chooseXEdbs"
+        @select="chooseEdb"
       />
+
+      <ul class="data-cont">
+        <template v-if="dataList.length">
+          <li v-for="(item,index) in dataList" :key="index">
+            <span>{{item.DataTime}}</span>
+            <span>{{item.Value}}</span>
+          </li>
+        </template>
+        <tableNoData size="mini"/>
+      </ul>
+
+      <div class="dia-bot">
+        <el-button type="primary" style="margin-right: 20px" @click="saveHandle"
+          >插入值</el-button
+        >
+        <el-button type="primary" plain @click="cancelHandle">取消</el-button>
+      </div>
     </div>
     
   </el-dialog>
@@ -31,13 +48,18 @@ export default {
   components: { selectTarget },
   data() {
     return {
-      
+      dataList: [],
     }
   },
   mounted(){
 
   },
   methods:{
+    /* 选择指标和日期获取近5期数据 */
+    chooseEdb(edb) {
+      
+    },
+
     cancelHandle() {
       this.$emit('update:isShow',false)
     }
@@ -45,5 +67,22 @@ export default {
 }
 </script>
 <style scoped lang='scss'>
-
+.main {
+  padding: 20px 0;
+  .data-cont {
+    margin: 15px 0;
+    border: 1px solid #DCDFE6;
+    padding: 20px;
+  }
+  .dia-bot {
+    margin-top: 20px; 
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>
+<style lang="scss">
+  .select-target-value-dialog {
+    margin-right: 10vw;
+  }
 </style>