bug 修改

src/components/notificationMsg.vue

@@ -7,7 +7,7 @@
         <div class="notifation-wrap">
             <!-- 防止tabs在popover前渲染,会导致tab选中状态不正确 -->
             <el-tabs v-model="activeName" v-if="visible">
-                <el-tab-pane :label="`研报审批(${UnreadTotal})`" name="first"></el-tab-pane>
+                <el-tab-pane :label="`${$t('AprrovalPage.research_approval_btn')}(${UnreadTotal})`" name="first"></el-tab-pane>
             </el-tabs>
             <div class="massage-list" v-if="visible">
                 <div class="message-item" :class="{'IsRead':item.IsRead}" v-for="item in msgList" :key="item.Id" @click="readMsg(item)">
@@ -22,9 +22,9 @@
                         <div class="content">{{item.Remark||''}}&nbsp;</div>
                     </div>
                 </div>
-                <tableNoData v-if="!msgList.length" text="暂无消息"></tableNoData>
+                <tableNoData v-if="!msgList.length" :text="$t('AprrovalPage.no_news_yet')"></tableNoData>
             </div>
-            <el-button type="text" class="close-btn" @click="visible=false">关闭</el-button>
+            <el-button type="text" class="close-btn" @click="visible=false">{{$t('AprrovalPage.close_btn')}}</el-button>
         </div>
         <span slot="reference" @click="visible = !visible" class="msg-btn">
             <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">

src/lang/modules/Aprroval/En.js

@@ -31,6 +31,9 @@ export default {
     approval_status_lable: "Approval status",
     processing_time_lable: "Processing time",
     processing_result_lable: "Processing result",
+    research_approval_btn: "Research report approval",
+    close_btn: "close",
+    no_news_yet: "No news yet",
   },
   AprrovalDetailPage: {
     report_name_info: "Research Report name",

src/lang/modules/Aprroval/Zh.js

@@ -31,6 +31,9 @@ export default {
     approval_status_lable: "审批状态",
     processing_time_lable: "处理时间",
     processing_result_lable: "处理结果",
+    research_approval_btn: "研报审批",
+    close_btn: "关闭",
+    no_news_yet: "暂无消息",
   },
   AprrovalDetailPage: {
     report_name_info: "研报名称",

src/views/approve_manage/approveList.vue

@@ -29,9 +29,9 @@
                         @change="handleCurrentChange(1)"
                         type="daterange"
                         value-format="yyyy-MM-dd"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
+                        :range-separator="$t('Common.to')"
+                        :start-placeholder="$t('Common.ph_time_start')"
+                        :end-placeholder="$t('Common.ph_time_end')">
                     </el-date-picker>
                 </div>
                 
@@ -77,7 +77,7 @@
                             <span v-else>{{row[item.key]}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" align="center">
+                    <el-table-column :label="$t('Table.column_operations')" align="center">
                         <template slot-scope="{row}">
                             <template v-if="activeTab==='pending'">
                                 <el-button type="text" style="padding:0;" @click="toApproveDetail(row,'approve')"

src/views/datasheet_manage/components/sheetClassifyDia.vue

@@ -27,7 +27,7 @@
             <el-input
             v-model="formData.classify_name"
             style="width: 80%"
-            placeholder=""></el-input>
+            :placeholder="$t('Dialog.require_vaild')"></el-input>
           </el-form-item>
 				</el-form>
 			</div>

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

@@ -46,9 +46,9 @@
         >
           <el-option
             v-for="item in frequencyArr"
-            :key="item"
-            :label="item"
-            :value="item"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           >
           </el-option>
         </el-select>
@@ -82,7 +82,6 @@ export default {
 				unit:'',
       },
 
-      frequencyArr:['日度','周度','旬度','月度','季度','年度'],
       classifyOption: [],
 
       isLockUpdate: false,//防止手动改变公式设置选区出发hook事件又更新公式和值 手动设置值即可
@@ -96,7 +95,18 @@ export default {
         frequency: [{ required: true, message: this.$t('CustomAnalysisPage.rules_frequency') , trigger: 'blur' }],
         unit: [{ required: true, message: this.$t('CustomAnalysisPage.rules_unit'), trigger: 'blur' }],
       }
+    },
+    frequencyArr(){
+     return [
+        {label:this.$t('ETable.Date.day_lable'), value:'日度'},
+        {label:this.$t('ETable.Date.week_lable') , value:'周度'},
+        {label:this.$t('ETable.Date.dekad_lable') , value:'旬度'},
+        {label:this.$t('ETable.Date.month_lable') , value:'月度'},
+        {label:this.$t('ETable.Date.quarter_lable'), value:'季度'},
+        {label:this.$t('ETable.Date.year_lable'), value:'年度'},
+        ]
     }
+  
   },
   methods: {
 

src/views/datasheet_manage/customAnalysis/list.vue

@@ -566,7 +566,7 @@ export default {
           type: "error",
         })
       : DeleteStatus === 0 && !ExcelInfoId
-      ? this.$confirm(this.$t('Chart.OptMsg.classify_del_confirm') , this.$('Confirm.prompt') , {
+      ? this.$confirm(this.$t('Chart.OptMsg.classify_del_confirm') , this.$t('Confirm.prompt') , {
           confirmButtonText:  this.$t('Dialog.confirm_btn'),
           cancelButtonText: this.$t('Dialog.cancel_btn'),
           type: "warning",