Karsa 1 жил өмнө
parent
commit
259b001289

+ 1 - 1
src/components/tableNoData.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="text-align:center">
     <img
       src="~@/assets/img/data_m/nodata.png"
       alt=""

+ 54 - 43
src/views/report_manage/addreportNew.vue

@@ -192,27 +192,32 @@
 						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"
 					>
-						<div
-							v-for="(item, index) in newreportlist"
-							:key="item.ChartInfoId"
-							:style="item.Disabled && 'cursor: not-allowed;'"
-							class="liststy"
-						>
-							<p class="color_primary">{{ item.ChartName }}</p>
-							<img
-								:src="item.ChartImage"
-								:id="'listnode' + index"
-								@click="insertHtml(item)"
-							/>
-						</div>
+						<template v-if="newreportlist.length">
+							<div
+								v-for="(item, index) in newreportlist"
+								:key="item.ChartInfoId"
+								:style="item.Disabled && 'cursor: not-allowed;'"
+								class="liststy"
+							>
+								<p class="color_primary">{{ item.ChartName }}</p>
+								<img
+									:src="item.ChartImage"
+									:id="'listnode' + index"
+									@click="insertHtml(item)"
+								/>
+							</div>
+						</template>
+
+						<tableNoData text="暂无图表" size="mini" v-else/>
 					</div>
+
 				</div>
 				<div v-if="tabsactive == '沙盘插入'">
 					<el-input
@@ -226,26 +231,28 @@
 						id="sandTable-container"
 						ref="sandTable"
 						style="
-							height: calc(100vh - 320px);
+							height: calc(100vh - 370px);
 							overflow-x: hidden;
 							overflow-y: auto;
 						"
 						@scroll="sandTableHandleScroll"
 					>
-						<div
-							v-for="(item, index) in sandTableList"
-							:key="item.SandboxId"
-							class="liststy"
-						>
-							<p class="color_primary">{{ item.Name }}</p>
-							<img
-								:src="item.PicUrl"
-								:id="'sandTable' + index"
-								@click="insertHtml(item,'image')"
-							/>
-							<p class="source-identification">来源:弘则研究</p>
-						</div>
-						<div v-loading = "sandTableLoading" class="loaded-text">{{loadedText}}</div>
+						<template v-if="sandTableList.length">
+							<div
+								v-for="(item, index) in sandTableList"
+								:key="item.SandboxId"
+								class="liststy"
+							>
+								<p class="color_primary">{{ item.Name }}</p>
+								<img
+									:src="item.PicUrl"
+									:id="'sandTable' + index"
+									@click="insertHtml(item,'image')"
+								/>
+								<p class="source-identification">来源:弘则研究</p>
+							</div>
+						</template>
+						<tableNoData text="暂无数据" size="mini" v-else/>
 					</div>
 				</div>
 				<div v-if="tabsactive == '表格插入'">
@@ -259,24 +266,28 @@
 					</el-input>
 					<div
 						style="
-							height: calc(100vh - 320px);
+							height: calc(100vh - 370px);
 							overflow-x: hidden;
 							overflow-y: auto;
 						"
 					>
-						<div
-							v-for="(item, index) 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 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批量插入'">

+ 52 - 43
src/views/report_manage/editreportNew.vue

@@ -191,28 +191,32 @@
 					<div
 						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"
 					>
-						<div
-							v-for="(item, index) in newreportlist"
-							:key="item.ChartInfoId"
-							:style="item.Disabled && 'cursor: not-allowed;'"
-							class="liststy"
-						>
-							<p class="color_primary">{{ item.ChartName }}</p>
-							<img
-								:src="item.ChartImage"
-								:id="'listnode' + index"
-								@click="insertHtml(item)"
-							/>
-						</div>
+						<template v-if="newreportlist.length">
+							<div
+								v-for="(item, index) in newreportlist"
+								:key="item.ChartInfoId"
+								:style="item.Disabled && 'cursor: not-allowed;'"
+								class="liststy"
+							>
+								<p class="color_primary">{{ item.ChartName }}</p>
+								<img
+									:src="item.ChartImage"
+									:id="'listnode' + index"
+									@click="insertHtml(item)"
+								/>
+							</div>
+						</template>
+						<tableNoData text="暂无图表" size="mini" v-else/>
 					</div>
 				</div>
+
 				<div v-if="tabsactive == '沙盘插入'">
 					<el-input
 						placeholder="沙盘名称/品种"
@@ -225,26 +229,28 @@
 						id="sandTable-container"
 						ref="sandTable"
 						style="
-							height: calc(100vh - 320px);
+							height: calc(100vh - 370px);
 							overflow-x: hidden;
 							overflow-y: auto;
 						"
 						@scroll="sandTableHandleScroll"
 					>
-						<div
-							v-for="(item, index) in sandTableList"
-							:key="item.SandboxId"
-							class="liststy"
-						>
-							<p class="color_primary">{{ item.Name }}</p>
-							<img
-								:src="item.PicUrl"
-								:id="'sandTable' + index"
-								@click="insertHtml(item,'image')"
-							/>
-							<p class="source-identification">来源:弘则研究</p>
-						</div>
-						<div v-loading = "sandTableLoading" class="loaded-text">{{loadedText}}</div>
+						<template v-if="sandTableList.length">
+							<div
+								v-for="(item, index) in sandTableList"
+								:key="item.SandboxId"
+								class="liststy"
+							>
+								<p class="color_primary">{{ item.Name }}</p>
+								<img
+									:src="item.PicUrl"
+									:id="'sandTable' + index"
+									@click="insertHtml(item,'image')"
+								/>
+								<p class="source-identification">来源:弘则研究</p>
+							</div>
+						</template>
+						<tableNoData text="暂无数据" size="mini" v-else/>
 					</div>
 				</div>
 				<div v-if="tabsactive == '表格插入'">
@@ -258,24 +264,27 @@
 					</el-input>
 					<div
 						style="
-							height: calc(100vh - 320px);
+							height: calc(100vh - 370px);
 							overflow-x: hidden;
 							overflow-y: auto;
 						"
 					>
-						<div
-							v-for="(item, index) 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 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批量插入'">

+ 53 - 45
src/views/report_manage/reportEn/reportEditor.vue

@@ -199,28 +199,31 @@
 						<el-checkbox v-model="isShowMe" @change="() => {search_page=1;$refs.chartListRef.scrollTop = 0;getreportlist(key_word)}">只看我的</el-checkbox>
 					</div>
 					<div
-						style="height: calc(100vh - 320px);overflow-x: hidden;overflow-y: auto;"
+						style="height: calc(100vh - 370px);overflow-x: hidden;overflow-y: auto;"
 						v-infinite-scroll="loadReportHandle"
 						:infinite-scroll-immediate="false"
 						ref="chartListRef"
 					>
-						<div
-							v-for="(item, index) in newreportlist"
-							:key="item.ChartInfoId"
-							:style="item.Disabled && 'cursor: not-allowed;'"
-							class="liststy"
-						>
-							<div class="chartEn-mark" style="top: 0;left:0;" @click="setEnHandle(item)">
-								<span v-if="item.IsEnChart">En</span>
-								<i class="el-icon-edit" v-else style="font-size:18px"/>
+						<template v-if="newreportlist.length">
+							<div
+								v-for="(item, index) in newreportlist"
+								:key="item.ChartInfoId"
+								:style="item.Disabled && 'cursor: not-allowed;'"
+								class="liststy"
+							>
+								<div class="chartEn-mark" style="top: 0;left:0;" @click="setEnHandle(item)">
+									<span v-if="item.IsEnChart">En</span>
+									<i class="el-icon-edit" v-else style="font-size:18px"/>
+								</div>
+								<p class="color_primary">{{ chart_source===1 ? (item.ChartNameEn||item.ChartName) : item.ChartName }}</p>
+								<img
+									:src="item.ChartImage"
+									:id="'listnode' + index"
+									@click="insertHtml(item)"
+								/>
 							</div>
-							<p class="color_primary">{{ chart_source===1 ? (item.ChartNameEn||item.ChartName) : item.ChartName }}</p>
-							<img
-								:src="item.ChartImage"
-								:id="'listnode' + index"
-								@click="insertHtml(item)"
-							/>
-						</div>
+						</template>
+						<tableNoData text="暂无图表" size="mini" v-else/>
 					</div>
 				</div>
 				<div v-if="tabsactive == '沙盘插入'">
@@ -235,26 +238,28 @@
 						id="sandTable-container"
 						ref="sandTable"
 						style="
-							height: calc(100vh - 320px);
+							height: calc(100vh - 370px);
 							overflow-x: hidden;
 							overflow-y: auto;
 						"
 						@scroll="sandTableHandleScroll"
 					>
-						<div
-							v-for="(item, index) in sandTableList"
-							:key="item.SandboxId"
-							class="liststy"
-						>
-							<p class="color_primary">{{ item.Name }}</p>
-							<img
-								:src="item.PicUrl"
-								:id="'sandTable' + index"
-								@click="insertHtml(item,'image')"
-							/>
-							<p class="source-identification">来源:弘则研究</p>
-						</div>
-						<div v-loading = "sandTableLoading" class="loaded-text">{{loadedText}}</div>
+						<template v-if="sandTableList.length">
+							<div
+								v-for="(item, index) in sandTableList"
+								:key="item.SandboxId"
+								class="liststy"
+							>
+								<p class="color_primary">{{ item.Name }}</p>
+								<img
+									:src="item.PicUrl"
+									:id="'sandTable' + index"
+									@click="insertHtml(item,'image')"
+								/>
+								<p class="source-identification">来源:弘则研究</p>
+							</div>
+						</template>
+						<tableNoData text="暂无数据" size="mini" v-else/>
 					</div>
 				</div>
 				<div v-if="tabsactive == '表格插入'">
@@ -273,19 +278,22 @@
 							overflow-y: auto;
 						"
 					>
-						<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 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批量插入'">

+ 1 - 2
src/views/report_manage/reportlist.vue

@@ -212,7 +212,7 @@
             label="PV / UV"
             align="center"
             :render-header="renderHeader"
-            min-width="150"
+            width="140"
           >
             <template slot-scope="scope"
               >{{ scope.row.Pv }}/{{ scope.row.Uv }}</template
@@ -223,7 +223,6 @@
               <div class="opt-btns">
                 <template
                   v-if="scope.row.State == 1"
-                  style="color: #4099ef; font-size: 24px"
                 >
                   <!-- <i class="el-icon-edit-outline" @click="$router.push({name:'编辑研报',query:{id:scope.row.id}})"></i> -->
                   <span