Merge branch 'custom'

src/components/edb/cascader.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="cascader">
+    <el-cascader
+      @focus="onFocus"
+      :key="currentLang"
+      v-bind="$attrs"
+      :style="cascaderWidth"
+      v-model="cascaderValue"
+      :props="{
+        label: currentLang === 'zh' ? 'ClassifyName' : 'ClassifyNameEn',
+        value: 'ClassifyId',
+        children: 'Children',
+        ...config,
+      }"
+      @change="onChange"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  model: {
+    prop: "cascaderValue",
+    event: "changeVal",
+  },
+  props: {
+    // cascader宽度
+    cascaderWidth: {
+      type: String,
+      default: "",
+    },
+    // prop其他配置项
+    config: {
+      type: Object,
+      default: () => {},
+    },
+    // 选中值
+    cascaderValue: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  computed: {
+    currentLang() {
+      return this.$store.state.lang;
+    },
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    // 改变值
+    onChange(val) {
+      this.$emit("changeVal", val);
+    },
+    // 获取焦点
+    onFocus() {
+      this.$emit("onFocus");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/utils/registryComponents.js

@@ -45,4 +45,8 @@ Vue.component('noDataAuth',noDataAuth)
 
 // 选择图表类型
 import chartTypeSelect from '@/components/chart/chartTypeSelect.vue'
-Vue.component('chartTypeSelect',chartTypeSelect)
+Vue.component('chartTypeSelect',chartTypeSelect)
+
+// 级联选择器多语言展示
+import cascader from '@/components/edb/cascader.vue';
+Vue.component('cascader',cascader)

src/views/chartRelevance_manage/components/saveEdbToBaseDia.vue

@@ -25,13 +25,16 @@
 						:placeholder="$t('Table.edb_name')"></el-input>
 					</el-form-item>
 					<el-form-item :label="$t('Edb.Detail.select_catalogue')" prop="menu">
-						<el-cascader
+						<cascader
 						v-model="formData.menu"
 						:options="options"
-						:props="levelProps"
-						style="width: 80%"
 						clearable
-						:placeholder="$t('CustomAnalysisPage.select_appropriate_category')"/>
+						cascaderWidth="width:80%"
+						:placeholder="
+							$t('CustomAnalysisPage.select_appropriate_category')
+						"
+						:config="{ emitPath: false, checkStrictly: true }"
+						/>
 					</el-form-item>
 					<el-form-item :label="$t('Table.frequency')" prop="frequency">
 						<span slot="label">{{$t('Table.frequency')}}</span>

src/views/chartRelevance_manage/crossVarietyAnalysis/components/chartFormSection.vue

@@ -62,7 +62,7 @@
           <el-option
             v-for="item in tagList"
             :key="item.ChartTagId"
-            :label="item.ChartTagName"
+            :label="item[langObj[currentLang]]"
             :value="item.ChartTagId"
             :disabled="item.ChartTagId===form.TagY"
           />
@@ -78,7 +78,7 @@
           <el-option
             v-for="item in tagList"
             :key="item.ChartTagId"
-            :label="item.ChartTagName"
+            :label="item[langObj[currentLang]]"
             :value="item.ChartTagId"
             :disabled="item.ChartTagId===form.TagX"
           />
@@ -166,6 +166,9 @@ export default {
     }
   },
   computed:{
+    currentLang() {
+      return this.$store.state.lang;
+    },
     unitOpt(){
       return [
           {label:this.$t('Edb.FreAll.year_min'),val:'年'},
@@ -204,6 +207,10 @@ export default {
   },
   data() {
     return {
+      langObj:{
+        'zh':'ChartTagName',
+        'en':'ChartTagNameEn'
+      },
       form: {
         ChartName:'',
         Source: 10,

src/views/chartRelevance_manage/relevance/components/multipleIndForm.vue

@@ -105,19 +105,14 @@
                 </div>
                 <!-- 表格筛选项 -->
                 <div class="table-select-box">
-                    <el-cascader
+                    <cascader
                         v-model="tableSelectParams.classify"
                         :options="classifyOpt"
-                        :props="{
-                            label: 'ClassifyName',
-                            value: 'ClassifyId',
-                            children: 'Children',
-                            multiple: true,
-                            emitPath:false
-                        }"
-                        clearable collapse-tags
+                        clearable
+                        collapse-tags
                         :placeholder="$t('EtaBasePage.label_classify')"
-                        @change="handleFilter"
+                        @changeVal="handleFilter"
+                        :config="{ multiple: true, emitPath: false }"
                     />
                     <el-select
                         v-model="tableSelectParams.frequency"

src/views/dataEntry_manage/addChart.vue

@@ -102,12 +102,13 @@
 						/>
 					</el-form-item>
 					<el-form-item :label="$t('Chart.Detail.chart_classify')" prop="classify">
-						<el-cascader
+						<cascader
 							v-model="chartInfo.classify"
 							:options="classifyOptions"
 							:props="levelProps"
-							style="width: 90%"
+							cascaderWidth="width: 90%"
 							:placeholder="$t('Chart.InputHolderAll.input_classify')"
+							:config="{ label: currentLang === 'zh' ? 'ChartClassifyName' : 'ChartClassifyNameEn',value: 'ChartClassifyId'}"
 						/>
 					</el-form-item>
 					<!-- 图表别名 英文文案还没给-->

src/views/dataEntry_manage/adjustdata/adjustData.vue

@@ -86,18 +86,12 @@
 						/>
           </el-form-item>
           <el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
-            <el-cascader
+            <cascader
               v-model="formData.menu"
               :options="classifyOptions"
-              :props="{
-                label: 'ClassifyName',
-                value: 'ClassifyId',
-                children: 'Children',
-                emitPath: false,
-                checkStrictly: true
-              }"
               clearable
               :placeholder="$t('Edb.InputHolderAll.input_menu')"
+              :config="{ emitPath: false, checkStrictly: true }"
             />
           </el-form-item>
           <el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">

src/views/dataEntry_manage/codecount/index.vue

@@ -67,20 +67,15 @@
 								</el-select>
 							</el-form-item>
 							<el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
-								<el-cascader
+								<cascader
 								v-model="formData.menu"
 								:options="menuOptions"
-								:props="{
-									label: 'ClassifyName',
-									value: 'ClassifyId',
-									children: 'Children',
-									checkStrictly: true,
-									emitPath: false,
-								}"
-								@change="menuChange"
+								@changeVal="menuChange"
 								clearable
-								style="width:220px"
-								:placeholder="$t('Edb.InputHolderAll.input_menu')"/>
+								:placeholder="$t('Edb.InputHolderAll.input_menu')"
+								cascaderWidth="width:220px"
+								:config="{ checkStrictly: true, emitPath: false }"
+								/>
 							</el-form-item>
 						</el-form>
 					</el-tab-pane>

src/views/dataEntry_manage/databaseComponents/addTargetDiaBase.vue

@@ -129,14 +129,15 @@
                 <td v-for="(data, sub_index) in edbIndexDatas" :key="sub_index" :colspan="2" 
 								:class="highLightIndex.includes(data.EdbName) && item=='EdbName' ?'exist-highlight':''">
 									<template v-if="item === 'ClassifyId'">
-										<el-cascader :options="options" v-model="data[item]" :placeholder="$t('Edb.InputHolderAll.input_menu')"
-										size="mini" :disabled="!data.Source"
-										:props="{label: 'ClassifyName',
-											value: 'ClassifyId',
-											children: 'Children',
-											checkStrictly: true,
-											emitPath:false}">
-										</el-cascader>
+										<cascader
+										:options="options"
+										v-model="data[item]"
+										:placeholder="$t('Edb.InputHolderAll.input_menu')"
+										size="mini"
+										:disabled="!data.Source"
+										:config="{ checkStrictly: true, emitPath: false }"
+										cascaderWidth="width:100%"
+										/>
 									</template>
 									<template v-else-if="item === 'Unit'">
 										<el-autocomplete

src/views/dataEntry_manage/databaseComponents/batchComptedDialog.vue

@@ -84,13 +84,14 @@
 						:placeholder="$t('Edb.InputHolderAll.input_name')"
             style="margin: 0 10px;width:25%"
 					/>
-          <el-cascader
+					<cascader
+						style="width: 25%"
 						v-model="list.menu"
 						:options="options"
-						:props="levelProps"
 						clearable
 						:placeholder="$t('Edb.InputHolderAll.input_menu')"
-            style="width: 25%"
+						cascaderWidth="width: 100%"
+						:config="{ checkStrictly: true }"
 					/>
 					<selectUnit 
 						v-model="list.unit" 

src/views/dataEntry_manage/databaseComponents/batchComputedSave.vue

@@ -43,14 +43,14 @@
                     </el-radio-group>
                 </template>
                 <template slot-scope="{row,$index}">
-                    <el-cascader
-						v-model="row.classify"
-						:options="classifyOpt"
-						:props="levelProps"
-						:placeholder="$t('Edb.InputHolderAll.input_menu')"
-                        :disabled="(classifyType===1&&$index>0)||operationForm.view"
-                        @change="handleClassifyChange(row,$index)"
-					/>
+                    <cascader
+                    v-model="row.classify"
+                    :options="classifyOpt"
+                    :placeholder="$t('Edb.InputHolderAll.input_menu')"
+                    :disabled="(classifyType === 1 && $index > 0) || operationForm.view"
+                    @changeVal="handleClassifyChange(row, $index)"
+                    :config="{ checkStrictly: true, emitPath: false }"
+                />
                 </template>
             </el-table-column>
         </el-table>

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -254,16 +254,17 @@
                     {{$t('EtaBasePage.pending_metrics',{num:MAXAddNUM})}}
                 </p>
                 <div>
-                    <el-cascader
-						v-model="filter.classify"
-						:options="classifyOpt"
-						:props="classifyProps"
-						clearable
+                    <cascader
+                        style="display:inline-block"
+                        v-model="filter.classify"
+                        :options="classifyOpt"
+                        clearable
                         collapse-tags
-						:placeholder="$t('EtaBasePage.label_classify')"
-                        style="width: 240px"
-                        @change="handleFilter"
-					/>
+                        :placeholder="$t('EtaBasePage.label_classify')"
+                        cascaderWidth="width: 240px"
+                        @changeVal="handleFilter"
+                        :config="{ multiple: true, emitPath: false }"
+                    />
                     <el-select
 						v-model="filter.frequency"
 						:placeholder="$t('EtaBasePage.select_frequency')"

src/views/dataEntry_manage/databaseComponents/completeTargetDia.vue

@@ -28,13 +28,14 @@
 						:placeholder="$t('Edb.InputHolderAll.input_name')"></el-input>
 					</el-form-item>
 					<el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
-						<el-cascader
+						<cascader
 						v-model="formData.menu"
 						:options="options"
-						:props="levelProps"
-						style="width: 80%"
+						cascaderWidth="width: 80%"
 						clearable
-						:placeholder="$t('Edb.InputHolderAll.input_menu')"/>
+						:placeholder="$t('Edb.InputHolderAll.input_menu')"
+						:config="{ checkStrictly: true }"
+						/>
 					</el-form-item>
 					<el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
 						<!-- <span slot="label">频&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;率</span> -->

src/views/dataEntry_manage/databaseComponents/computedDialog.vue

@@ -212,12 +212,12 @@
 					<selectUnit v-model="formData.unit" style="width: 340px" />
 				</el-form-item>
 				<el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
-					<el-cascader
+					<cascader
 						v-model="formData.menu"
 						:options="options"
-						:props="levelProps"
 						clearable
 						:placeholder="$t('Edb.InputHolderAll.input_menu')"
+						:config="{ checkStrictly: true }"
 					/>
 				</el-form-item>
 				<el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">

src/views/dataEntry_manage/databaseComponents/diffusionIndexDia.vue

@@ -111,14 +111,14 @@
 			/>
           </el-form-item>
           <el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu" style="margin-right: 40px;">
-            <el-cascader
-              v-model="formData.menu"
-              :options="options"
-              :props="levelProps"
-              clearable
-              :placeholder="$t('Edb.InputHolderAll.input_menu')"
-							style="width: 340px"
-            />
+			<cascader
+				v-model="formData.menu"
+				:options="options"
+				clearable
+				:placeholder="$t('Edb.InputHolderAll.input_menu')"
+				cascaderWidth="width: 340px"
+				:config="{ checkStrictly: true }"
+			/>
           </el-form-item>
           <el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
             <el-select

src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -148,13 +148,13 @@
           :placeholder="$t('Edb.InputHolderAll.input_name')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
-          <el-cascader
+		  <cascader
             v-model="formData.menu"
             :options="options"
-            :props="levelProps"
-            style="width:70%" 
+            cascaderWidth="width:70%"
             clearable
             :placeholder="$t('Edb.InputHolderAll.input_menu')"
+            :config="{ checkStrictly: true, emitPath: false }"
           />
         </el-form-item>
         <el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">

src/views/dataEntry_manage/databaseComponents/jointTargetDia.vue

@@ -197,18 +197,14 @@
 				:placeholder="$t('Edb.InputHolderAll.input_name')"></el-input>
 			</el-form-item>
 			<el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
-				<el-cascader
-				v-model="formData.menu"
-				:options="menuOptions"
-				:props="{
-					label: 'ClassifyName',
-					value: 'ClassifyId',
-					children: 'Children',
-					checkStrictly: true
-				}"
-				style="width: 70%"
-				clearable
-				:placeholder="$t('Edb.InputHolderAll.input_menu')"/>
+				<cascader
+					v-model="formData.menu"
+					:options="menuOptions"
+					cascaderWidth="width: 70%"
+					clearable
+					:placeholder="$t('Edb.InputHolderAll.input_menu')"
+					:config="{ checkStrictly: true }"
+				/>
 			</el-form-item>
 			<el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
 				<el-select 

src/views/dataEntry_manage/databaseComponents/openDialog.vue

@@ -43,12 +43,13 @@
 							:placeholder="$t('Edb.InputHolderAll.input_name')"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('Edb.Detail.e_menu')" prop="level_menu">
-							<el-cascader
-							v-model="formData.level_menu"
-							:options="options"
-							:props="levelProps"
-							style="width: 80%"
-							:placeholder="$t('Edb.InputHolderAll.input_menu')"/>
+							<cascader
+								v-model="formData.level_menu"
+								:options="options"
+								cascaderWidth="width: 80%"
+								:placeholder="$t('Edb.InputHolderAll.input_menu')"
+								:config="{ checkStrictly: true }"
+							/>
 						</el-form-item>
 						<el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
 							<!-- <span slot="label">频&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;率</span> -->

src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -184,12 +184,12 @@
 						</el-form-item>
 						<!-- 指标目录 -->
 						<el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
-							<el-cascader
+							<cascader
 								v-model="formData.menu"
 								:options="options"
-								:props="levelProps"
 								clearable
 								:placeholder="$t('Edb.InputHolderAll.input_menu')"
+								:config="{ checkStrictly: true }"
 							/>
 						</el-form-item>
 						<!-- 指标频度 -->

src/views/dataEntry_manage/databaseComponents/smoothEdbDialog.vue

@@ -135,12 +135,13 @@
                                 />
                             </el-form-item>
                             <el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
-                                <el-cascader v-if="isOpenSmooth"
-                                    v-model="formData.menu"
-                                    :options="catalogArr"
-                                    :props="levelProps"
-                                    clearable
-                                    :placeholder="$t('Edb.InputHolderAll.input_menu')"
+                                <cascader
+                                v-if="isOpenSmooth"
+                                v-model="formData.menu"
+                                :options="catalogArr"
+                                clearable
+                                :placeholder="$t('Edb.InputHolderAll.input_menu')"
+                                :config="{ emitPath: false, checkStrictly: true }"
                                 />
                             </el-form-item>
                             <el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
@@ -238,13 +239,14 @@
                                 />
                             </el-form-item>
                             <el-form-item prop="menu">
-                                <el-cascader v-if="isOpenSmooth"
-                                    v-model="targetList[index].menu"
-                                    :options="catalogArr"
-                                    :props="levelProps"
-                                    style="width: 200px" 
-                                    clearable
-                                    placeholder="请选择指标目录"
+                                <cascader
+                                v-if="isOpenSmooth"
+                                v-model="targetList[index].menu"
+                                :options="catalogArr"
+                                cascaderWidth="width: 200px"
+                                clearable
+                                placeholder="请选择指标目录"
+                                :config="{ emitPath: false, checkStrictly: true }"
                                 />
                             </el-form-item>
                             <el-form-item prop="unit">

src/views/dataEntry_manage/databaseList.vue

@@ -1040,6 +1040,8 @@ export default {
 							}, 1000);
 						})
 						
+						// 重绘图表，刷新数据
+						this.$refs.createChart&&this.$refs.createChart.getEdbData()
 
 					}else {
 						this.tableData = [];

src/views/dataEntry_manage/thirdBase/bloombergSource.vue

@@ -135,17 +135,12 @@
                                 </el-select>
                             </el-form-item>
                             <el-form-item :prop="`list[${index}].ClassifyId`" :rules="{required:true,message:$t('Edb.InputHolderAll.input_menu'),trigger: 'blur'}">
-                                <el-cascader v-model="item.ClassifyId"
+                                <cascader
+                                v-model="item.ClassifyId"
                                 :placeholder="$t('Edb.InputHolderAll.input_menu')"
-                                :options="edbCatalogList" 
-                                :props="{
-                                    label: 'ClassifyName',
-                                    value: 'ClassifyId',
-                                    children: 'Children',
-                                    checkStrictly: true,
-                                    emitPath:false
-                                }"
-                                ></el-cascader>
+                                :options="edbCatalogList"
+                                :config="{ checkStrictly: true, emitPath: false }"
+                                />
                             </el-form-item>
                         </div>
                         

src/views/dataEntry_manage/thirdBase/components/addIndicsDia.vue

@@ -28,13 +28,14 @@
                     :placeholder="$t('Table.edb_name')"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('Edb.Detail.select_catalogue')" prop="menu">
-                    <el-cascader
-                    v-model="formData.menu"
-                    :options="options"
-                    :props="levelProps"
-                    style="width: 80%"
-                    clearable
-                    :placeholder="$t('CustomAnalysisPage.select_appropriate_category')"/>
+                    <cascader
+                        v-model="formData.menu"
+                        :options="options"
+                        cascaderWidth="width: 80%"
+                        clearable
+                        :placeholder="$t('CustomAnalysisPage.select_appropriate_category')"
+                        :config="{ emitPath: false, checkStrictly: true }"
+                    />
                 </el-form-item>
                 <el-form-item :label="$t('Table.frequency')" prop="frequency">
                     <el-select 

src/views/dataEntry_manage/thirdBase/components/addToBaseDia.vue

@@ -76,14 +76,14 @@
                         />
                     </div>
                 </template>
-                <template slot-scope="{row,$index}">
-                      <el-cascader
+                <template slot-scope="{row}">
+                      <cascader
                         v-model="row.ClassifyId"
                         :options="classifyOpt"
-                        :props="levelProps"
                         placeholder="请选择指标目录"
                         :disabled="classifyType===1"
                         class="cascader-wrapper"
+                        :config="{ checkStrictly: true, emitPath: false }"
                       />
                 </template>
             </el-table-column>

src/views/dataEntry_manage/thirdBase/components/batchAddEdbDia.vue

@@ -45,13 +45,14 @@
                   :options="classifyOptions"
                   :key="item.edbIndex"
                   :props="{
-                    label: 'ClassifyName',
+                    label:currentLang==='zh'?'ClassifyName':'ClassifyNameEn',
                     value: 'BaseFromMysteelChemicalClassifyId',
                     children: 'Children',
                     emitPath: false,
                   }"
                   :placeholder="$t('Edb.InputHolderAll.input_classify')"
                 />
+
               </el-form-item>
             </el-col>
             <img src="~@/assets/img/delete-minus-red.png" @click="delEdbItem(index)" v-if="edbForm.edbDataList.length>1" />
@@ -94,6 +95,11 @@ import { steelInterface } from "@/api/modules/thirdBaseApi";
         }
       },
     },
+    computed: {
+      currentLang() {
+          return this.$store.state.lang;
+      },
+    },
     data(){
       this.checkAge=(rule, value, callback) => {
         // 不能输入中文和空格

src/views/dataEntry_manage/thirdBase/components/batchAddIndicsDia.vue

@@ -14,18 +14,18 @@
     >
         <div class="dialog-container">
             <div class="select-box">
-                <el-cascader v-model="searchClassify"
-                    :options="classifyList"
-                    :props="{
-                        children:'Children',
-                        label:'ClassifyName',
-                        value:'BaseFromMysteelChemicalClassifyId',
-                        multiple:true,
-                        emitPath:false,
-                    }"
-                    :placeholder="$t('Edb.InputHolderAll.input_classify')"
-                    @change="getEdbList"
-                ></el-cascader>
+                <cascader
+                style="display: inline-block"
+                v-model="searchClassify"
+                :options="classifyList"
+                :placeholder="$t('Edb.InputHolderAll.input_classify')"
+                @changeVal="getEdbList"
+                :config="{
+                    multiple: true,
+                    emitPath: false,
+                    value: 'BaseFromMysteelChemicalClassifyId',
+                }"
+                />
                 <el-input style="width:240px;" v-model="searchName"
                     :placeholder="$t('Edb.InputHolderAll.input_name_orid')"
                     prefix-icon="el-icon-search"
@@ -72,34 +72,23 @@
                                 <el-radio :label="1" style="margin-right:5px"><!-- 分目录 -->{{$t('EtaBasePage.subdirectory_radio')}}</el-radio>
                                 <el-radio :label="2"><!-- 同目录 -->{{$t('EtaBasePage.directory_radio')}}</el-radio>
                             </el-radio-group>
-                            <el-cascader v-if="classifyType===2" v-model="selectClassify"
+                            <cascader
+                                v-if="classifyType === 2"
+                                v-model="selectClassify"
                                 :options="edbClassifyList"
-                                :props="{
-                                    label: 'ClassifyName',
-                                    value: 'ClassifyId',
-                                    children: 'Children',
-                                    checkStrictly: true,
-                                    emitPath:false
-                                }"
                                 :placeholder="$t('SteelChemicalPage.batch_add_placeholder')"
-                            >
-                            </el-cascader>
+                                :config="{ checkStrictly: true, emitPath: false }"
+                            />
                         </template>
                         <template slot-scope="{row,$index}">
-                            <el-cascader 
+                            <cascader
                                 v-model="row.classify"
                                 :options="edbClassifyList"
-                                :props="{
-                                    label: 'ClassifyName',
-                                    value: 'ClassifyId',
-                                    children: 'Children',
-                                    checkStrictly: true,
-                                    emitPath:false
-                                }"
                                 :placeholder="$t('SteelChemicalPage.batch_add_placeholder')"
-                                style="width:100%;"
-                                :disabled="classifyType===2"
-                            ></el-cascader>
+                                cascaderWidth="width:100%;"
+                                :disabled="classifyType === 2"
+                                :config="{ checkStrictly: true, emitPath: false }"
+                            />
                         </template>
                     </el-table-column>
                     <div class="no-data" slot="empty">

src/views/dataEntry_manage/thirdBase/components/highFrequency/addToIndexDatabaseBatch.vue

@@ -105,13 +105,15 @@
                 </el-radio-group>
               </template>
               <template slot-scope="{row,$index}">
-                <el-cascader size="mini"
+                  <cascader
+                  size="mini"
                   v-model="row.ClassifyId"
                   :options="classifyOpt"
-                  :props="levelProps"
                   :placeholder="$t('Edb.InputHolderAll.input_menu')"
-                  :disabled="(classifyType===0&&$index>0)"
-                  @change="handleClassifyChange(row,$index)"/>
+                  :disabled="classifyType === 0 && $index > 0"
+                  @changeVal="handleClassifyChange(row, $index)"
+                  :config="{ checkStrictly: true, emitPath: false }"
+                />
               </template>
             </el-table-column>
             <el-table-column align="center" width="50px">

src/views/dataEntry_manage/thirdBase/components/targetDialog.vue

@@ -30,7 +30,7 @@
               v-model="formData.classify"
               :options="classifyOptions"
               :props="{
-                label: 'ClassifyName',
+                label:currentLang==='zh'?'ClassifyName':'ClassifyNameEn',
                 value: 'BaseFromMysteelChemicalClassifyId',
                 children: 'Children',
                 emitPath: false,
@@ -145,6 +145,9 @@ export default {
     },
   },
   computed: {
+    currentLang() {
+      return this.$store.state.lang;
+    },
     // timeArr() {
     //   //30间隔的时间数组
     //   const timeArrays = new Array(48).fill("").map((item, index) => {

src/views/dataEntry_manage/thirdBase/ysTargetBase.vue

@@ -128,14 +128,14 @@
                 <td v-for="(data, sub_index) in edbIndexDatas" :key="sub_index" :colspan="2" 
                 :class="highLightIndex.includes(data.EdbName) && item=='EdbName' ?'exist-highlight':''">
                   <template v-if="item === 'ClassifyId'">
-                    <el-cascader :options="options" v-model="data[item]" :placeholder="$t('Edb.InputHolderAll.input_menu')"
-                    size="mini" :disabled="!data.Source"
-                    :props="{label: 'ClassifyName',
-                      value: 'ClassifyId',
-                      children: 'Children',
-                      checkStrictly: true,
-                      emitPath:false}">
-                    </el-cascader>
+                    <cascader
+                      :options="options"
+                      v-model="data[item]"
+                      :placeholder="$t('Edb.InputHolderAll.input_menu')"
+                      size="mini"
+                      :disabled="!data.Source"
+                      :config="{ checkStrictly: true, emitPath: false }"
+                    />
                   </template>
                   <template v-else-if="item === 'Unit'">
                     <el-autocomplete

src/views/datasheet_manage/components/insertDateDia.vue

@@ -29,7 +29,7 @@
               />
               
               <span v-show="selectEdbInfo.Frequency" style="margin: 0 10px">{{$t('ETableChildren.frequency_lable')}}: {{ getFrequencyTrans(selectEdbInfo.Frequency) }}</span>
-              <span v-show="selectEdbInfo.LatestDate">{{$t('OnlineExcelPage.lastest_date_lab')}}: {{ selectEdbInfo.LatestDate }}</span>
+              <span v-show="selectEdbInfo.EndDate">{{$t('OnlineExcelPage.lastest_date_lab')}}: {{ selectEdbInfo.EndDate }}</span>
             </li>
             <li class="form-item" style="padding-left:10px">
               <label class="el-form-item__label">{{$t('ETableChildren.lagging_period_label')}}</label>
@@ -103,8 +103,8 @@ export default {
           if(this.info.DataTimeType===2) { //指标日期时获取指标详情
             const { Data } = await dataBaseInterface.targetDetail({EdbInfoId: valueObj.EdbInfoId})
 
-            const { EdbName,LatestDate,Frequency,EdbInfoId } = Data;
-            this.selectEdbInfo = { EdbName,LatestDate,Frequency,EdbInfoId }
+            const { EdbName,LatestDate,Frequency,EdbInfoId,EndDate } = Data;
+            this.selectEdbInfo = { EdbName,LatestDate,Frequency,EdbInfoId,EndDate }
 
             this.search_edb = valueObj.EdbInfoId;
             this.searchOptions = [this.selectEdbInfo];

src/views/datasheet_manage/customAnalysis/components/createTargetForm.vue

@@ -20,20 +20,14 @@
         <el-input v-model="formData.edbName" :placeholder="$t('OnlineExcelPage.indicator_name_lbl')" @focus="initSelect"></el-input>
       </el-form-item>
       <el-form-item prop="classify">
-        <el-cascader
+        <cascader
           v-model="formData.classify"
           :options="classifyOption"
-          style="width: 100%"
-          @focus="initSelect"
-          :props="{
-            label: 'ClassifyName',
-            value: 'ClassifyId',
-            children: 'Children',
-            emitPath: false,
-            checkStrictly: true
-          }"
+          cascaderWidth="width: 100%"
+          @onFocus="initSelect"
           clearable
           :placeholder="$t('CustomAnalysisPage.select_appropriate_category')"
+          :config="{ emitPath: false, checkStrictly: true }"
         />
       </el-form-item>
       <el-form-item prop="frequency">

src/views/futures_manage/chartEditor.vue

@@ -67,18 +67,18 @@
 					:rules="chartRules"
 				>
 					<el-form-item :label="$t('ToolBox.CommodityPriceChart.select_future')" prop="futures_id" v-if="chartInfo.Source===2">
-						<el-cascader
+						<cascader
 							v-model="chartInfo.futures_id"
 							:options="futuresOptions"
-							:props="{
-								label: 'FutureGoodEdbInfoName',
+							cascaderWidth="width: 90%"
+							:placeholder="$t('ToolBox.CommodityPriceChart.please_select_future')"
+							@changeVal="changeFuturesHandle"
+							:config="{  
+								label:momentLang=== 'zh'?'FutureGoodEdbInfoName':'FutureGoodEdbInfoNameEn',
 								value: 'FutureGoodEdbInfoId',
 								children: 'Child',
 								emitPath: false
 							}"
-							style="width: 90%"
-							:placeholder="$t('ToolBox.CommodityPriceChart.please_select_future')"
-							@change="changeFuturesHandle"
 						/>
 					</el-form-item>
 					<el-form-item :label="$t('ToolBox.CommodityPriceChart.chart_name')" :prop="currentLang==='en'?'ChartNameEn':'ChartName'">
@@ -98,16 +98,15 @@
 						/>
 					</el-form-item>
 					<el-form-item :label="$t('ToolBox.CommodityPriceChart.chart_classify')" prop="classify">
-						<el-cascader
+						<cascader
 							v-model="chartInfo.classify"
 							:options="classifyOptions"
-							:props="{
-								label: 'ChartClassifyName',
+							:config="{
+								label:momentLang=== 'zh'?'ChartClassifyName':'ChartClassifyNameEn',
 								value: 'ChartClassifyId',
-								children: 'Children',
 								emitPath: false
 							}"
-							style="width: 90%"
+							cascaderWidth="width: 90%"
 							:placeholder="$t('ToolBox.CommodityPriceChart.please_select_classify')"
 						/>
 					</el-form-item>
@@ -274,6 +273,9 @@ export default {
     },
   },
 	computed: {
+		momentLang() {
+			return this.$store.state.lang;
+		},
 		roleName() {
 			return localStorage.getItem('userName');
 		},

src/views/ppt_manage/mixins/pptMixins.js

@@ -368,7 +368,7 @@ export default {
           x_max: res.Data.ChartInfo.XMax?Number(res.Data.ChartInfo.XMax):Number(res.Data.DataResp.XMaxValue),
         }
         this.setCrossVarietyChart();
-        this.changeRelevanceOptions();//更改英文一样
+        this.changeRelevanceOptions(currentLang);//更改英文一样
       }
 
       //根据图表数据获取配置项

src/views/predictEdb_manage/addPredicEdb.vue

@@ -15,18 +15,13 @@
           <el-form-item prop="classify">
             <div class="item">
               <span class="label">{{$t('PredictEditPage.add_to_classify')}}<!-- 添加到分类 --></span>
-              <el-cascader
-                    v-model="formData.classify"
-                    :options="classifyArr"
-                    :props="{
-                        label: 'ClassifyName',
-                        value: 'ClassifyId',
-                        children: 'Children',
-                        checkStrictly: true
-                    }"
-                    style="width: 90%"
-                    :placeholder="$t('Edb.InputHolderAll.input_classify')"
-                />
+              <cascader
+                v-model="formData.classify"
+                :options="classifyArr"
+                cascaderWidth="width: 100%"
+                :placeholder="$t('Edb.InputHolderAll.input_classify')"
+                :config="{  checkStrictly: true}"
+              />
             </div>
           </el-form-item>
           <el-form-item prop="oldEdb" v-if="!formData.edb_id">

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -174,7 +174,7 @@
 
                             <div class="html-end-img-box">
                                 <div class="opt-btn-box" style="display: none;">
-                                    <div class="del-btn" @click.stop="endImg=''"></div>
+                                    <div class="del-btn" @click.stop="deleteLayoutPic(2)"></div>
                                 </div>
                                 <img :src="endImg" alt="" style="display:block;width:100%">
                                 <div class="head-layout-item" v-for="item in endImgStyle" :key="item.value"
@@ -1375,7 +1375,7 @@ export default {
         },
         // 删除版头版尾
         deleteLayoutPic(type){
-            if(type=='1'){
+            if(type===1){
                 this.headImg=''
                 this.headImgId = 0
             }else{

src/views/supply_manage/components/createTargetDia.vue

@@ -25,13 +25,16 @@
 						:placeholder="$t('Edb.Detail.e_name')"></el-input>
 					</el-form-item>
 					<el-form-item :label="$t('Edb.Detail.select_catalogue')" prop="menu">
-						<el-cascader
+						<cascader
 						v-model="formData.menu"
 						:options="options"
-						:props="levelProps"
-						style="width: 80%"
+						cascaderWidth="width: 80%"
 						clearable
-						:placeholder="$t('CustomAnalysisPage.select_appropriate_category')"/>
+						:placeholder="
+							$t('CustomAnalysisPage.select_appropriate_category')
+						"
+						:config="{ checkStrictly: true }"
+						/>
 					</el-form-item>
 					<el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
 						<el-select