Ver código fonte

调整指标库和预测指标库的操作按钮

cxmo 1 ano atrás
pai
commit
7b002b8a83

+ 11 - 12
src/views/dataEntry_manage/databaseList.vue

@@ -232,29 +232,28 @@
 							</el-tab-pane>
 						</el-tabs>
 						<div class="edb-tool-icon edb-tool" style="align-items: center;">
+							<el-button v-if="isEdbBtnShow('update')"
+								type="text" @click="refreshTargetHandle" >刷新</el-button>
+							<el-button v-if="isEdbBtnShow('edit')"
+								type="text" :disabled="!(EdbData.Button.OpButton)"
+								@click="editNode({},EdbData)">编辑</el-button>
+							<!-- 指保存指标的上下限,在走势图才显示 -->
+							<el-button v-if="activeTab==='Chart'&&isEdbBtnShow('saveEdb')"
+								type="text" @click.stop="saveEdbLimit">保存</el-button>
+							<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('toSource')"
+								type="text" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
 							<el-popover 
 								placement="left" 
 								trigger="hover"
 								popper-class="edb-tool-popover"
 								width="320" style="display: inline-block;">
 								<div class="edb-tool-wrap">
-									<el-button v-if="isEdbBtnShow('update')"
-										type="text" @click="refreshTargetHandle" >刷新</el-button>
-									<el-button v-if="isEdbBtnShow('edit')"
-											type="text" :disabled="!(EdbData.Button.OpButton)"
-											@click="editNode({},EdbData)"
-										>编辑</el-button>
-									<!-- 指保存指标的上下限,在走势图才显示 -->
-									<el-button v-if="activeTab==='Chart'&&isEdbBtnShow('saveEdb')"
-										type="text" @click.stop="saveEdbLimit">保存</el-button>
 									<el-button v-if="isEdbBtnShow('setEn')"
 										type="text" @click="openEnNameDia">设置英文名称</el-button>
 									<el-button v-if="EdbData.Button.InsertNewDataButton&&isEdbBtnShow('newValue')"
 										type="text" @click.stop="updateNewestDataHandle" >{{(EdbData.DataInsertConfig.Date)?'编辑最新值':'添加最新值'}}</el-button>
 									<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('calculateAgain')"
 										type="text" @click.stop="reCalculateHandler" :loading="calculateLoading">重新计算</el-button>
-									<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('toSource')"
-										type="text" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
 									<el-button v-if="EdbData.EdbType===1&&isEdbBtnShow('refreshAll')"
 										type="text" @click.stop="refreshBaseHandler" :loading="refreshLoading">全部刷新</el-button>
 									<el-button v-if="isEdbBtnShow('copyData')"
@@ -263,7 +262,7 @@
 										type="text" @click="removeNode(_,EdbData)" style="color:#C54322;">删除</el-button>
 								</div>
 								<div class="edb-btn" slot="reference">
-									<el-button type="text">操作</el-button>
+									<el-button type="text">更多操作</el-button>
 									<i class="el-icon-more" style="font-size: 14px;transform: rotate(90deg);cursor: pointer;color: #3375e1;"/>
 								</div>
 							</el-popover>

+ 9 - 9
src/views/predictEdb_manage/predictEdb.vue

@@ -186,6 +186,14 @@
 							</el-tab-pane>
 						</el-tabs>
 						<div class="edb-tool-icon edb-tool" style="align-items: center;">
+							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_update"
+									type="text" @click="updateEdbPartHandle">刷新</el-button>
+							<el-button type="text" @click="editEdbHandle('')" 
+									v-if="edbButton.OpButton&&isEdbBtnShow('edbPreData_edit')">编辑</el-button>
+							<el-button type="text" @click="saveEdbHandle" 
+									v-if="detail_show_chart&&isEdbBtnShow('edbPreData_save')">保存</el-button>
+							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_edbSource"
+								type="text" @click="isLookHistory=true;lookEdbId=select_id">指标溯源</el-button>
 							<el-popover 
 								placement="left" 
 								trigger="hover"
@@ -196,14 +204,6 @@
 										type="text" @click="clickEdbNameHandle" v-if="currentLang==='ch'||!edb_nameEn">
 										设置英文名称
 									</el-button>
-									<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_edbSource"
-									type="text" @click="isLookHistory=true;lookEdbId=select_id">指标溯源</el-button>
-									<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_update"
-										type="text" @click="updateEdbPartHandle">刷新</el-button>
-									<el-button type="text" @click="editEdbHandle('')" 
-										v-if="edbButton.OpButton&&isEdbBtnShow('edbPreData_edit')">编辑</el-button>
-									<el-button type="text" @click="saveEdbHandle" 
-										v-if="detail_show_chart&&isEdbBtnShow('edbPreData_save')">保存</el-button>
 									<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_recalcu"
 										type="text" @click="updateEdbHandle">重新计算</el-button>
 									<el-button class="deletesty" @click="delEdbHandle" type="text"
@@ -212,7 +212,7 @@
 										type="text" @click="copyData">复制数据</el-button>
 								</div>
 								<div class="edb-btn" slot="reference">
-									<el-button type="text">操作</el-button>
+									<el-button type="text">更多操作</el-button>
 									<i class="el-icon-more" style="font-size: 14px;transform: rotate(90deg);cursor: pointer;color: #3375e1;"/>
 								</div>
 							</el-popover>