Karsa 3 months ago
parent
commit
de418822e3

+ 1 - 0
src/lang/modules/DataSources/En.js

@@ -300,6 +300,7 @@ export default {
     btn_batch_edit: 'Bulk Edit',
     handle_clear: 'Remove',
     del_msg: 'Once deleted, the metrics cannot be recovered. Are you sure you want to delete the following metrics?',
+    total_msg: 'Total {limit} indicators'
   }
   
 }

+ 1 - 1
src/lang/modules/DataSources/Zh.js

@@ -303,6 +303,6 @@ export default {
     btn_batch_edit: '批量编辑',
     handle_clear: '移除',
     del_msg: '删除后不可恢复,是否确认删除以下指标?',
-
+    total_msg: '共{limit}个指标'
   }
 }

+ 1 - 1
src/styles/element-ui.scss

@@ -23,7 +23,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
 .el-submenu .el-menu-item{ padding:0 70px 0 45px !important; }
 .menu-collapsed .el-submenu .el-menu-item{ padding:0 85px 0 30px !important; }
 .box-card{ margin-bottom:20px !important; padding-bottom:30px; }
-.el-dialog .el-input{ width:60%; }
+.el-dialog .el-input{ width:100%; }
 .el-dialog .el-select>.el-input{ width:100%; }
 .el-dialog .el-dialog__headerbtn{ font-size:24px; padding:10px; top:3px; right:10px; }  // 右上角X
 .el-dialog .el-dialog__header{ background:$color-primary; color:#fff; padding:15px 0 15px 25px; text-align:left; }

+ 11 - 9
src/views/dataEntry_manage/thirdBase/zhuochuangRedStageBase.vue

@@ -160,6 +160,7 @@
       >
         <template v-if="!selectEdb">
           <div class="right-header">
+            <span>{{$t('SciHongqiPage.total_msg',{limit:total})}}</span>
             <el-checkbox 
               v-model="filterObj.checkAll"
               :indeterminate="filterObj.checkSome"
@@ -260,7 +261,7 @@
           :rules="classifyFormRules"
           @close="cancelDialogHandle"
         >
-          <el-form-item :label="$t('SteelChemicalPage.label_one_level')"  v-if="classifyForm.parent_classify_id">
+          <el-form-item :label="$t('SteelChemicalPage.label_one_level')"  v-if="classifyForm.parent_classify_name">
             <span>{{ classifyForm.parent_classify_name }}</span>
           </el-form-item>
           <el-form-item :label="$t('SteelChemicalPage.label_classify_name')" prop="classifyId" v-if="classifyForm.indexId">
@@ -270,7 +271,7 @@
               :options="classifyList"
               :props="{
                 label: 'ClassifyName',
-                value: 'ClassifyId',
+                value: 'ClassifyIdStr',
                 children: 'Children',
                 emitPath:false
               }"
@@ -604,7 +605,7 @@ export default {
           title: "编辑分类",
           classify_name: '',
           indexId: item.BaseFromSciHqIndexId,
-          classify_id: item.ClassifyId,
+          classify_id: String(item.ClassifyId),
           parent_classify_name:"",
           parent_classify_id: "",
         };
@@ -612,12 +613,14 @@ export default {
     async handleEditEdbApi() {
       const res = await zhuochuangRedStageInterface.edbEdit({
         BaseFromSciHqIndexId: this.classifyForm.indexId,
-        ClassifyId: this.classifyForm.classify_id
+        ClassifyId: Number(this.classifyForm.classify_id)
       })
       if(res.Ret !== 200) return 
       this.$message.success(/* "保存成功" */this.$t('MsgPrompt.saved_msg'));
       this.cancelDialogHandle();
-      this.getClassify()
+
+      this.getClassify();
+      !this.selectEdb && this.getEdbList()
     },  
 
     /* 加入指标库 */
@@ -691,6 +694,7 @@ export default {
     filterNodes(arr) {
 			arr.length &&
 				arr.forEach((item) => {
+          item.ClassifyIdStr = String(item.ClassifyId)
 					item.Children&&item.Children.length && this.filterNodes(item.Children);
 					if (!item.Children||!item.Children.length) {
 						delete item.Children;
@@ -1250,7 +1254,7 @@ export default {
       position: relative;
       .right-header {
         display: flex;
-        justify-content: flex-end;
+        justify-content: space-between;
       }
     }
    
@@ -1263,6 +1267,7 @@ export default {
 .dia-bot {
   display: flex;
   justify-content: center;
+  margin-top: 50px;
 }
 .hint-dialog-wrap{
     padding-bottom:30px;
@@ -1318,8 +1323,5 @@ export default {
   .el-tree-node__content {
     padding-right: 10px !important;
   }
-  .el-cascader .el-input {
-    width: 100% !important;
-  }
 }
 </style>