Merge branch 'bug5687'

src/views/dataEntry_manage/addChart.vue

@@ -118,13 +118,16 @@
 						</el-tooltip>
 					</el-form-item>
 					<el-form-item :label="$t('Chart.Detail.chart_classify')" prop="classify">
-						<cascader
+						<el-cascader
 							v-model="chartInfo.classify"
 							:options="classifyOptions"
-							:props="levelProps"
-							cascaderWidth="width: 90%"
+							:props="{
+								label: currentLang==='en'?'ChartClassifyNameEn':'ChartClassifyName',
+								value: 'ChartClassifyId',
+								children: 'Children',
+							}"
+							style="width: 90%"
 							:placeholder="$t('Chart.InputHolderAll.input_classify')"
-							:config="{ label: currentLang === 'zh' ? 'ChartClassifyName' : 'ChartClassifyNameEn',value: 'ChartClassifyId'}"
 						/>
 					</el-form-item>
 					<el-form-item :label="$t('Chart.Detail.chart_unit')" prop="Unit" v-if="[7,11].includes(chartInfo.ChartType)">

src/views/dataEntry_manage/databaseList.vue

@@ -17,12 +17,6 @@
 			</div>
 			<div class="top-right">
 
-				<!-- <change-lang 
-					v-permission="permissionBtn.edbDataPermission.edbData_switchEn"
-					:lang="currentLang" 
-					style="height: 32px;" 
-					@changeLang="changeLanguage"
-				/> -->
 
 				<el-select
 					v-model="search_txt"
@@ -1020,7 +1014,8 @@ export default {
 						// res.Data.Item.ModifyTime = res.Data.Item.ModifyTime.substr(0,10);
 						let classify_arr = res.Data.ClassifyList || [];
 						let str = '';
-						classify_arr.length && classify_arr.reverse().map((item) => str += item.ClassifyName + '/');
+						classify_arr.length && classify_arr.reverse().map(item => str += item[this.currentLang==='en'?'ClassifyNameEn':'ClassifyName'] + '/');
+
 						this.edb_levels = classify_arr;
 						this.$set(res.Data.Item,'Menu',str);
 						this.tableData = [res.Data.Item] || [];

src/views/dataEntry_manage/editChart.vue

@@ -142,7 +142,11 @@
 						<el-cascader
 							v-model="chartInfo.classify"
 							:options="classifyOptions"
-							:props="levelProps"
+							:props="{
+								label: currentLang==='en'?'ChartClassifyNameEn':'ChartClassifyName',
+								value: 'ChartClassifyId',
+								children: 'Children',
+							}"
 							style="width: 90%"
 							:placeholder="$t('Chart.InputHolderAll.input_classify')"
 						/>

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -39,11 +39,6 @@ export default {
 			},
 
 			classifyOptions: [],//分类option
-      levelProps: {
-        label: 'ChartClassifyName',
-        value: 'ChartClassifyId',
-        children: 'Children',
-      },
 
 			styleArr: [
 				{ label: /* '曲线图' */this.$t('Chart.ChartType.spline_name'), key: 1 },

src/views/predictEdb_manage/components/childData.vue

@@ -177,7 +177,7 @@ export default {
         })
         const classify_arr = res.Data.ClassifyList || [];
         let str = '';
-        classify_arr.length && classify_arr.reverse().map((item) => str += item.ClassifyName + '/');
+        classify_arr.length && classify_arr.reverse().map((item) => str += item[this.lang==='en'?'ClassifyNameEn':'ClassifyName'] + '/');
         this.$set(Item,'Menu',str);
         this.haveMore =  this.page_no < res.Data.Paging.Pages;
         this.dataList = this.page_no === 1 ? [...Item.PredictDataList,...Item.DataList] : [...this.dataList,...Item.DataList];