Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

 src/components/view/enums.vue

@@ -40,7 +40,7 @@
   <div class="enums">
      <div>
         <el-row class="title">
            <el-col :span="12" style="padding-left: 20px;">数据字典</el-col>
            <el-col :span="12" style="padding-left: 20px;text-align: left;">数据字典</el-col>
            <el-col :span="12" style="text-align: right;">
               <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">新增</el-button>
            </el-col>
@@ -110,22 +110,22 @@
                },
                {
                  value:'success',
                  label:'success',
                  label:'成功',
                  type:'success'
                },
                {
                  value:'info',
                  label:'info',
                  label:'信息',
                  type:'info'
                },
                {
                  value:'warning',
                  label:'warning',
                  label:'警告',
                  type:'warning'
                },
                {
                  value:'danger',
                  label:'danger',
                  label:'错误',
                  type:'danger'
                },
              ]
@@ -140,19 +140,19 @@
                },
                {
                  value:'success',
                  label:'success'
                  label:'成功'
                },
                {
                  value:'info',
                  label:'info'
                  label:'信息'
                },
                {
                  value:'warning',
                  label:'warning'
                  label:'警告'
                },
                {
                  value:'danger',
                  label:'danger'
                  label:'错误'
                },
              ]
            }
@@ -170,7 +170,8 @@
            ],
          },
               requiredAdd:['category','label','value'],
               requiredUp:['category','label','value']
               requiredUp:['category','label','value'],
          needSort: ['createTime', 'updateTime', 'type'],
            },
            entityCopy: {},
            upIndex: 0,