Просмотр исходного кода

Merge branch 'qualityControl' into test

zhangxc 5 лет назад
Родитель
Сommit
b73595fffd

+ 2 - 2
src/components/safeControl/AddToken.vue

@@ -16,7 +16,6 @@
                 :autosize ="{minRows: 2}"
                 placeholder="请输入内容"
                 @blur="tokenAnalysis"
-                maxlength="255"
                 v-model.trim="equipNum">
                 </el-input>
                  <!-- <el-button
@@ -44,7 +43,7 @@
             <el-form-item  label="硬盘:">
                 {{this.disk}}
             </el-form-item>
-            <el-form-item class="isRequired" label="License使用天数(天):" >
+            <el-form-item class="isRequired" label="license使用天数(天):" >
                 <el-input v-model.trim="remainDay" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入使用天数" type='text' min = '0' maxlength="255"></el-input>
             </el-form-item>
             <el-form-item class="isRequired" label="Token有效时间(分钟):" >
@@ -206,6 +205,7 @@
         warning(msg, type,time) {
             this.$message({
                 showClose: true,
+                dangerouslyUseHTMLString: true,
                 message: msg,
                 type: type || 'warning',
                 duration:time || '3000'

+ 1 - 1
src/components/safeControl/TokenControl.vue

@@ -55,7 +55,7 @@
                 <el-table-column
                     :resizable = "false"
                     prop="remainDay"
-                    label="License有效天数">
+                    label="license有效天数">
                 </el-table-column>
                  <el-table-column
                     :resizable = "false"