Merge branch 'requirement_262' into debug

src/lang/modules/DataSources/En.js

@@ -140,6 +140,12 @@ export default {
     batch_add_hint1:'Some indicators are incomplete. Please check',
     batch_add_hint2:'Some indicator names already exist. Please enter a new one',
     batch_add_placeholder:'Place select Indicator category',
+
+    // 操作说明
+    content1_of_Explanation1:'1. Click the button to open a pop-up window, enter the indicator ID and category, support batch addition, please confirm that the indicator ID is correct, otherwise it cannot be successfully added;',
+    content2_of_Explanation1:'2. After completing the addition, close the pop-up window and wait for about 10 minutes. You can search for the indicator ID on the current page to verify whether it has been added to the system. If it has not been successfully added, you can follow the manual refresh operation document steps to troubleshoot and solve the problem;',
+    content1_of_Explanation2:'1. For indicators that have been added to the system, if they need to be used in the indicator library, you can click the "Add Indicator Library" button in the indicator operation bar, configure the basic information, click "Save", and the indicator will be visible in the corresponding directory of the indicator library;',
+    content2_of_Explanation2:"2. Click on 'Batch Add to Indicator Library' to open a pop-up window. Filter the indicators that need to be processed in batches and configure the corresponding information. After completion, the indicators will be successfully added to the indicator library;"
   },
 
   /* un数据页面 */

src/lang/modules/DataSources/Zh.js

@@ -140,6 +140,11 @@ export default {
     batch_add_hint2:'部分指标名称已存在，请重新填写',
     batch_add_placeholder:'请选择指标库目录',
 
+    // 操作说明
+    content1_of_Explanation1:'1、点击按钮打开弹窗，输入指标ID和所属分类，支持批量添加，请确认指标ID正确，否则无法成功添加；',
+    content2_of_Explanation1:'2、完成添加后关闭弹窗，等待10分钟左右，可在当前页面检索指标ID核实是否已加入系统，若没有成功加入，可按照手动刷新操作文档步骤排查解决；',
+    content1_of_Explanation2:'1、已加入系统的指标，若需要在指标库使用，可点击指标的操作栏按钮“加入指标库”，配置基本信息后，点击保存完成，在指标库对应目录下可见该指标；',
+    content2_of_Explanation2:"2、点击批量加入指标库，可打开弹窗，筛选需要批量处理的指标并配置对应的信息，完成后指标成功加入指标库；"
   },
 
   /* un数据页面 */

src/views/dataEntry_manage/thirdBase/operatingInstruction.vue

@@ -0,0 +1,53 @@
+<template>
+  <el-dialog
+    :visible.sync="show"
+    :close-on-click-modal="false"
+    :modal-append-to-body="false"
+    top="5vh"
+    :title="$t('SteelChemicalPage.add_edb')"
+    custom-class="dialog"
+    center
+    @close="handleClose"
+    width="780px"
+    v-dialogDrag
+  >
+  <div class="operating-instruction-content">
+      <div>{{$t('EtaBasePage.add_edb_btn')}}：</div>
+      <div>{{ $t('SteelChemicalPage.content1_of_Explanation1') }}</div>
+      <div>{{ $t('SteelChemicalPage.content2_of_Explanation1') }}</div>
+      <div style="margin-top: 20px;">{{ $t('ManualEdbListPage.add_tobase_btn') }}：</div>
+      <div>{{ $t('SteelChemicalPage.content1_of_Explanation2') }}</div>
+      <div>{{ $t('SteelChemicalPage.content2_of_Explanation2') }}</div>
+  </div>
+  <div class="footer-container" slot="footer">
+            <el-button type="primary" size="medium" @click="handleClose">{{ $t('Dialog.known') }}</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    show:{
+        type:Boolean,
+        default:false
+    },
+  },
+  methods: {
+    handleClose(){
+       this.$emit('close')
+    },
+  },
+};
+</script>
+<style lang="scss">
+.operating-instruction-content{
+    max-height: 60vh;
+    overflow: auto;
+    box-sizing: border-box;
+    padding: 10px 10px 30px 10px;
+    font-size: 14px;
+    line-height: 26px;
+    word-break: normal;
+}
+</style>

src/views/dataEntry_manage/thirdBase/steelChemicalbase.vue

@@ -16,6 +16,10 @@
             <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
         </span>
       <div class="left-top">
+        <div class="opt-btn" @click="isShowInstruction = true">
+          <img src="~@/assets/img/data_m/note-icon.png">
+          <span style="font-size: 14px;margin-left: 8px;">{{$t('CodeCountPage.opt_tip_btn')}}</span> 
+        </div>
         <div>
           <el-button v-permission="permissionBtn.dataSourcePermission.mysteelData_add"
           type="primary" size="medium" @click="addTargetBatch" style="margin-bottom: 10px;"
@@ -68,11 +72,11 @@
             children: 'Children',
             isLeaf:'isLeaf'
           }"
-          :allow-drag="canDragHandle"
+          :allow-drag="permissionBtn.isShowBtn('dataSourcePermission','mysteelData_classifyOpt_edit')"
           :allow-drop="canDropHandle"
           :current-node-key="select_node"
           :default-expanded-keys="defaultShowNodes"
-          draggable
+          :draggable="permissionBtn.isShowBtn('dataSourcePermission','mysteelData_classifyOpt_edit')"
           :expand-on-click-node="false"
           check-strictly
           empty-text="暂无分类"
@@ -97,7 +101,7 @@
             <div v-if="select_node === data.UniqueCode">
               <img
                 src="~@/assets/img/data_m/move_ico.png"
-                v-if="data.Button.MoveButton"
+                v-if="data.Button.MoveButton&&permissionBtn.isShowBtn('dataSourcePermission','mysteelData_classifyOpt_edit')"
                 alt=""
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('move', data, node)"
@@ -269,6 +273,11 @@
         @close="isAddIndicsDiaShow=false;"
         @addCallback="isAddIndicsDiaShow=false;getFrequency();"
     />
+    <!-- 操作说明 -->
+     <operatingInstruction
+     :show="isShowInstruction"
+     @close="isShowInstruction = false"
+     ></operatingInstruction>
   </div>
 
 </template>
@@ -282,10 +291,11 @@ import batchAddEdbDia from "./components/batchAddEdbDia.vue";
 import batchAddIndicsDia from "./components/batchAddIndicsDia"
 import addIndicsDia from "./components/addIndicsDia"
 import leftMixin from "./mixins/leftMixin.js";
+import operatingInstruction from "./operatingInstruction.vue";
 export default {
   name: "",
   mixins: [leftMixin],
-  components: { lzTable, mDialog, targetDialog,batchAddEdbDia,batchAddIndicsDia,addIndicsDia },
+  components: { lzTable, mDialog, targetDialog,batchAddEdbDia,batchAddIndicsDia,addIndicsDia,operatingInstruction },
   data() {
     return {
       isLeftWrapShow:true,
@@ -334,6 +344,7 @@ export default {
       isBatchAddIndicsDiaShow:false, //批量添加至指标库弹窗
       isAddIndicsDiaShow:false,//单个添加至指标库弹窗
       currentIndicData:{},//当前选中指标
+      isShowInstruction:false,//是否展示操作说明
     };
   },
   methods: {
@@ -799,9 +810,23 @@ export default {
     width: 390px;
     flex-shrink: 0;
     margin-right: 20px;
-    padding: 30px 0;
+    padding: 16px 0 30px;
     overflow: hidden;
     position: relative;
+    .opt-btn{
+				display:inline-flex;
+				align-items: center;
+				cursor: pointer;
+        margin-bottom: 10px;
+				img{
+					width: 21px;
+					height: 21px;
+				}
+				span{
+					color: rgba(27, 123, 222, 1);
+
+				}
+			}
     .left-top {
       padding: 0 20px;
     }