Merge remote-tracking branch 'origin/master'

src/views/anomaly/index.vue

@@ -55,7 +55,7 @@
                 :datas="tableData" 
                 :cell-style="tableCellStyle"
                 :index-style="{ fixed: true, width: 60 }"
-                is-check :check-style="{ fixed: true, width: 29 }" @selection-change="tableSelectionChange"
+                is-check :check-style="{ fixed: true, width: 29 }" @selection-change="tableSelectionChange" 
             >
                 <template #action="{ row }">
                     <el-link type="danger" @click="cancleClick(row)">   <hc-icon name="arrow-go-back" />撤销</el-link>
@@ -117,7 +117,7 @@ const tableColumn = [
        { key: 'key6', name: '是否撤销', align:'center' },
        { key: 'key7', name: '撤销开始时间', align:'center' },
        { key: 'key8', name: '撤销结束时间', align:'center' },
-       { key: 'action', name: '操作' },
+       { key: 'action', name: '操作', fixed:'right', align: 'center' },
    ]
 const tableData = ref([
     { key1: '成渝高速', key2: '项目进度异常', key3: '第一季度', key4:'2021-3-1 14:31', key5:'三级异常', key6:'否', key7:'' },

src/views/system/set.vue

@@ -275,7 +275,7 @@
                                                     <el-col :span="10">
                                                         <div class="warn-item-inner-box">
                                                             <div class="text-center" style="font-size: 16px;">第二季度</div>
-                                                            <div class="warn-item-inner-title text-right">该季度投资计划完成比例</div>
+                                                            <div class="warn-item-inner-title text-right">该季度工作计划完成比例</div>
                                                             <div class="warn-item-inner-box-detail">
                                                                 <!-- <div class="arrow">   |||级预警</div> -->
                                                                 <div class="arrow" style="width: auto;min-width:60px">   三级</div>
@@ -318,7 +318,7 @@
                                                     <el-col :span="10" :offset="4">
                                                         <div class="warn-item-inner-box">
                                                             <div class="text-center" style="font-size: 16px;">第一季度</div>
-                                                            <div class="warn-item-inner-title text-right">该季度投资计划完成比例</div>
+                                                            <div class="warn-item-inner-title text-right">该季度工作计划完成比例</div>
                                                             <div class="warn-item-inner-box-detail">
                                                                 <!-- <div class="arrow">   |||级预警</div> -->
                                                                 <div class="arrow" style="width: auto;min-width:60px">   三级</div>
@@ -361,7 +361,7 @@
                                                     <el-col :span="10">
                                                         <div class="warn-item-inner-box">
                                                             <div class="text-center" style="font-size: 16px;">第三季度</div>
-                                                            <div class="warn-item-inner-title text-right">该季度投资计划完成比例</div>
+                                                            <div class="warn-item-inner-title text-right">该季度工作计划完成比例</div>
                                                             <div class="warn-item-inner-box-detail">
                                                                 <!-- <div class="arrow">   |||级预警</div> -->
                                                                 <div class="arrow" style="width: auto;min-width:60px">   三级</div>
@@ -404,7 +404,7 @@
                                                     <el-col :span="10" :offset="4">
                                                         <div class="warn-item-inner-box">
                                                             <div class="text-center" style="font-size: 16px;">第四季度</div>
-                                                            <div class="warn-item-inner-title text-right">该季度投资计划完成比例</div>
+                                                            <div class="warn-item-inner-title text-right">该季度工作计划完成比例</div>
                                                             <div class="warn-item-inner-box-detail">
                                                                 <!-- <div class="arrow">   |||级预警</div> -->
                                                                 <div class="arrow" style="width: auto;min-width:60px">   三级</div>