很奇怪合并master 代码和不过来

src/views/report_manage/editChapterReport.vue

@@ -168,26 +168,10 @@
             v-model="key_word"
             size="medium"
             prefix-icon="el-icon-search"
-            @input="
-              () => {
-                search_page = 1;
-                $refs.chartListRef.scrollTop = 0;
-                getChartList(key_word);
-              }
-            "
+            @input="() => {search_page=1;$refs.chartListRef.scrollTop = 0;getreportlist(key_word)}"
           >
           </el-input>
-          <el-radio-group
-            v-model="chart_source"
-            @change="
-              () => {
-                search_page = 1;
-                $refs.chartListRef.scrollTop = 0;
-                getChartList('');
-              }
-            "
-            style="margin-top: 10px"
-          >
+          <el-radio-group v-model="chart_source" @change="() => {search_page=1;$refs.chartListRef.scrollTop = 0;getreportlist()}" style="margin-top: 10px;">
             <el-radio :label="1">ETA图库</el-radio>
             <el-radio :label="2">商品价格曲线</el-radio>
             <el-radio :label="3">相关性图表</el-radio>
@@ -195,30 +179,22 @@
             <el-radio :label="7">统计特征</el-radio>
           </el-radio-group>
           <div style="margin: 10px 0">
-            <el-checkbox
-              v-model="isShowMe"
-              @change="
-                () => {
-                  search_page = 1;
-                  $refs.chartListRef.scrollTop = 0;
-                  getChartList(key_word);
-                }
-              "
-              >只看我的</el-checkbox
-            >
+            <el-checkbox v-model="isShowMe" @change="() => {search_page=1;$refs.chartListRef.scrollTop = 0;getreportlist(key_word)}">只看我的</el-checkbox>
           </div>
           <div
+            id="reportwin"
             ref="chartListRef"
             style="
-              height: calc(100vh - 320px);
+              height: calc(100vh - 370px);
               overflow-x: hidden;
               overflow-y: auto;
             "
             v-infinite-scroll="loadReportHandle"
             :infinite-scroll-immediate="false"
           >
+          <template v-if="newreportlist.length">
             <div
-              v-for="(item, index) in chartlist"
+              v-for="(item, index) in newreportlist"
               :key="item.ChartInfoId"
               class="liststy"
               :style="item.Disabled && 'cursor: not-allowed;'"
@@ -230,6 +206,8 @@
                 @click="insertHtml(item)"
               />
             </div>
+          </template>
+          <tableNoData text="暂无图表" size="mini" v-else/>
           </div>
         </div>
         <div v-if="tabsactive == '沙盘插入'">
@@ -244,12 +222,13 @@
             id="sandTable-container"
             ref="sandTable"
             style="
-              height: calc(100vh - 320px);
+              height: calc(100vh - 3780px);
               overflow-x: hidden;
               overflow-y: auto;
             "
             @scroll="sandTableHandleScroll"
           >
+            <template v-if="sandTableList.length">
             <div
               v-for="(item, index) in sandTableList"
               :key="item.SandboxId"
@@ -263,11 +242,45 @@
               />
               <p class="source-identification">来源：弘则研究</p>
             </div>
-            <div v-loading="sandTableLoading" class="loaded-text">
-              {{ loadedText }}
-            </div>
+            </template>
+            <tableNoData text="暂无数据" size="mini" v-else/>
           </div>
         </div>
+        <div v-if="tabsactive == '表格插入'">
+					<el-input
+						placeholder="表格名称"
+						v-model="sheetSearchObj.Keyword"
+						size="medium"
+						prefix-icon="el-icon-search"
+						@input="getSheetList"
+					>
+					</el-input>
+					<div
+						style="
+							height: calc(100vh - 370px);
+							overflow-x: hidden;
+							overflow-y: auto;
+						"
+					>
+						<template v-if="sheetSearchList.length">
+							<div
+								v-for="item in sheetSearchList"
+								:key="item.ExcelInfoId"
+								class="liststy"
+							>
+								<p class="color_primary">{{ item.ExcelName }}</p>
+								<img
+									:src="item.ExcelImage"
+									:id="'sheet' + item.ExcelInfoId"
+									style="object-fit: contain;height: 250px;"
+									@click="insertHtml(item,'sheet')"
+								/>
+							</div>
+						</template>
+
+						<tableNoData text="暂无数据" size="mini" v-else/>
+					</div>
+				</div>
         <div v-if="tabsactive == 'MyETA批量插入'">
           <importMyChart @handleImportMyChart="handleImportMyChart" />
         </div>
@@ -318,6 +331,7 @@ export default {
   },
   mixins: [mixinMsg,reportMixin],
   data() {
+    let that=this
     return {
       weekPanelTabs:[
         "基础信息",