常规提交

src/api/api.js

@@ -107,7 +107,7 @@ export function apiGetevaluateRuledeleteList(params) {
         method: 'post'
     })
 }
-//----"规则模块，规则阶段数据" || "指标项条目-查询"
+//----"规则模块，规则阶段数据"
 export function apiGetdatadictionaryList(params) {
     return httpRequest({
         url: 'data-dictionary/list',
@@ -115,6 +115,13 @@ export function apiGetdatadictionaryList(params) {
         params: params
     })
 }
+//---------"指标项条目-查询"
+export function apiGetdataZBXList() {
+    return httpRequest({
+        url: 'data-dictionary/list?superKey=ZBX0001',
+        method: 'get'
+    })
+}
 //----考评规则详情-list
 export function apiGetevaluateRuleinfoList(params) {
     return httpRequest({

src/components/evaluationSystem/IndicatorItemPage.vue

@@ -100,7 +100,7 @@
 </template>
 
 <script>
-import {apiGetIndicatordictionaryList, apiGetdataDictionaryList, apiGetIndicatordicsaveList, apiGetIndicatordicdeleteList} from '../../api/api'
+import {apiGetIndicatordictionaryList, apiGetdataZBXList, apiGetIndicatordicsaveList, apiGetIndicatordicdeleteList} from '../../api/api'
 export default {
     data() {
         return {
@@ -163,7 +163,7 @@ export default {
             let params = {
                 superKey: 'ZBX0001'
             }
-            apiGetdataDictionaryList(params).then(datas =>{
+            apiGetdataZBXList(params).then(datas =>{
                 if (datas && datas.data) {
                     that.indicItemoptions = datas.data
                 }
@@ -335,7 +335,7 @@ export default {
                         padding: 10px 20px;
                         .el-table{
                             .el-table__body-wrapper{
-                                max-height: 55vh !important;
+                                height: 55vh !important;
                             }
                             .el-input__inner{
                                 height: 30px !important;

src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -506,7 +506,7 @@ export default {
     padding: 10px 20px;
     .el-table{
         .el-table__body-wrapper{
-            max-height: 64vh !important;
+            height: 64vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -484,7 +484,7 @@ export default {
     padding: 10px 20px;
     .el-table{
         .el-table__body-wrapper{
-            max-height: 64vh !important;
+            height: 64vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -493,7 +493,7 @@ export default {
     padding: 10px 20px;
     .el-table{
         .el-table__body-wrapper{
-            max-height: 64vh !important;
+            height: 64vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/evaluationPersonnelPage.vue

@@ -171,12 +171,7 @@
                                     />
                             </el-form-item>
                             <el-form-item label="月份">
-                                <el-date-picker
-                                    v-model="ruleForm.month"
-                                    type="month"
-                                    value-format="MM"
-                                    placeholder="请选择月份"
-                                    />
+                                <el-input-number v-model="ruleForm.month" :min="1" :max="12" />
                             </el-form-item>
                         </el-form>
                     </div>
@@ -226,7 +221,7 @@ export default {
                 evaluationCycle: '',
                 evaluationLevel: '',
                 year: '',
-                month: ''
+                month: 1
             },
             rules: {
                 companyName: [
@@ -387,7 +382,7 @@ export default {
                     evaluationCycle: '',
                     evaluationLevel: '',
                     year: '',
-                    month: ''
+                    month: 1
                 }
             })
         },
@@ -618,7 +613,7 @@ export default {
     padding: 10px 20px;
     .el-table{
         .el-table__body-wrapper{
-            max-height: 64vh !important;
+            height: 64vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/evaluationRulesPage.vue

@@ -424,7 +424,7 @@ export default {
     padding: 10px 20px;
     .el-table{
         .el-table__body-wrapper{
-            max-height: 64vh !important;
+            height: 64vh !important;
         }
         .el-input__inner{
             height: 30px !important;

src/components/evaluationSystem/ruleDetailPage.vue

@@ -349,7 +349,7 @@ export default {
                         padding: 10px 20px;
                         .el-table{
                             .el-table__body-wrapper{
-                                max-height: 55vh !important;
+                                height: 55vh !important;
                             }
                             .el-input__inner{
                                 height: 30px !important;

src/components/knowledgePage/scoringRulesDetailPage.vue

@@ -390,7 +390,7 @@ export default {
                         padding: 10px 20px;
                         .el-table{
                             .el-table__body-wrapper{
-                                max-height: 55vh !important;
+                                height: 55vh !important;
                             }
                             .el-input__inner{
                                 height: 30px !important;