Merge branch 'qualityControl' into test

src/components/safeControl/AddToken.vue

@@ -2,12 +2,12 @@
 <template>
     <div class="AddTokenWrapper">
         <crumbs
-          :title="'licence维护-'+titleText"
+          :title="'license维护-'+titleText"
           class="topBack"
           :param="$route.params"
           linkTo="TokenControl"
         ></crumbs>
-        <el-form ref="ruleForm"  class="addDepartForm" label-width="160px">
+        <el-form ref="ruleForm"  class="addDepartForm" label-width="190px">
             <el-form-item  class="addDepartFormItem isRequired" label="服务器秘钥：">
                 <!-- <input class="searchInput" type="text" v-model = "equipNum">  -->
                
@@ -43,10 +43,10 @@
             <el-form-item  label="硬盘：">
                 {{this.disk}}
             </el-form-item>
-            <el-form-item class="isRequired" label="使用天数（天）：" >
+            <el-form-item class="isRequired" label="License使用天数（天）：" >
                 <el-input v-model.trim="remainDay" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入使用天数" type='text' min = '0'></el-input>
             </el-form-item>
-            <el-form-item class="isRequired" label="有效时间（分钟）：" >
+            <el-form-item class="isRequired" label="Token有效时间（分钟）：" >
                 <el-input v-model.trim="validTime" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入有效时间" type='text' min = '0'></el-input>
             </el-form-item>
             <el-form-item  label="登录Key：" v-if="isEdit" >
@@ -76,7 +76,7 @@
     name: 'AddToken',
     data() {
         return{
-            titleText: '添加licence',
+            titleText: '添加license',
             modifier: '', //操作人
             id: '',
             equipNum:'',
@@ -102,7 +102,7 @@
         if(isEdit) {
             if(isEdit) {
                 this.isEdit = isEdit;
-                this.titleText = '修改licence';
+                this.titleText = '修改license';
                 this.id = data.id
                 this.equipNum = data.content
                 this.remainDay = data.remainDay
@@ -146,7 +146,11 @@
                     this.mainboard = data['server.mainboard']
                     this.cpu = data['server.cpu']
                     this.disk = data['server.disk']
+                } else {
+                    this.warning(res.data.msg)
                 }
+            }).catch((err) => {
+                this.warning(err);
             })
         },
         showDelDialog() {
@@ -208,7 +212,6 @@
         handleInp(e){ //分组不能输入负数
             const value =  e;
             this.remainDay = value.replace(/\./g,'');
-            console.log(this.remainDay)
             // e = value.replace(/[^\d]/g,'');
             // this.remainDay = value.replace(/[^\d]/g,'');
         }

src/components/safeControl/TokenControl.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="licence维护" style="min-width: 980px">
+        <crumbs title="license维护" style="min-width: 980px">
             <el-form :inline="true" class="demo-form-inline">
                 <!-- <el-form-item label="标签类型：">
                     <el-select size="mini" v-model="filter.tagType[0]" placeholder="标签类型" clearable>
@@ -20,7 +20,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
-                    <el-button size="mini" type="warning" @click="addToken">新增licence</el-button>
+                    <el-button size="mini" type="warning" @click="addToken">新增license</el-button>
                 </el-form-item>
             </el-form>
         </crumbs>
@@ -45,7 +45,7 @@
                 <el-table-column
                     :resizable = "false"
                     prop="server"
-                    label="供应商">
+                    label="服务商">
                 </el-table-column>
                 <el-table-column
                     :resizable = "false"
@@ -55,12 +55,12 @@
                 <el-table-column
                     :resizable = "false"
                     prop="remainDay"
-                    label="有效天数">
+                    label="License有效天数">
                 </el-table-column>
                  <el-table-column
                     :resizable = "false"
                     prop="validTime"
-                    label="有效时间（分钟）">
+                    label="Token有效时间（分钟）">
                 </el-table-column>
                 <el-table-column
                     :resizable = "false"
@@ -217,7 +217,7 @@ export default {
             // $form.attr('action', url);
             // $form.appendTo($('body'));
             // $form.submit();
-            this.download(url, 'licence.properties')
+            this.download(url, 'license.properties')
         //     const ele = document.createElement('a');
         //     ele.setAttribute('download' , 'download');//用于设置下载文件的文件名
 

src/routes.js

@@ -281,8 +281,8 @@ export default [
       {path:'LT-ZDYJWH-TJZDYJSJ',component:AddDiagBase,name:'AddDiagBase'},  //诊断依据-添加诊断依据
       {path:'LT-ZDYJWH-WTCSJWH',component:QuestionWords,name:'QuestionWords'},  //问题列表
       {path:'LT-SJTJ-YXSJTJ',component:MedicalStatistics,name:'MedicalStatistics'},  //问题列表
-      {path:'LT-AQGL-LICENCEWH',component:TokenControl,name:'TokenControl'},  //安全管理--令牌列表
-      {path:'LT-AQGL-TJLICENCE',component:AddToken,name:'AddToken'},  //安全管理--发放令牌
+      {path:'LT-AQGL-LICENSEWH',component:TokenControl,name:'TokenControl'},  //安全管理--令牌列表
+      {path:'LT-AQGL-TJLICENSE',component:AddToken,name:'AddToken'},  //安全管理--发放令牌
     ]
   }
 ]