dedsudiyu 2 vuotta sitten
vanhempi
commit
1c53a23c0e
26 muutettua tiedostoa jossa 94 lisäystä ja 73 poistoa
  1. 2 2
      src/assets/styles/ZDcolorClass.scss
  2. 16 0
      src/assets/styles/ZDelement.scss
  3. 1 1
      src/views/comprehensive/laboratoryManagement/subject/index.vue
  4. 1 1
      src/views/comprehensive/personnel/post/authUser.vue
  5. 4 4
      src/views/comprehensive/personnel/student/addPage.vue
  6. 1 1
      src/views/comprehensive/personnel/student/index.vue
  7. 4 4
      src/views/comprehensive/personnel/teacher/addPage.vue
  8. 1 1
      src/views/comprehensive/personnel/teacher/index.vue
  9. 2 2
      src/views/comprehensive/system/dept/index.vue
  10. 1 1
      src/views/comprehensive/system/role/authUser.vue
  11. 6 6
      src/views/comprehensive/system/user/index.vue
  12. 1 1
      src/views/gasManage3_0/manage/qualificationApply/qualificationApplyAdd.vue
  13. 2 2
      src/views/gasManage3_0/manage/supplierManage/supplierManageAdd.vue
  14. 1 1
      src/views/gasManage3_0/manage/useGas/useGasAdd.vue
  15. 1 1
      src/views/gasManage3_0/student/qualificationApply/qualificationApplyAdd.vue
  16. 1 1
      src/views/gasManage3_0/student/useGas/useGasAdd.vue
  17. 2 2
      src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue
  18. 1 2
      src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue
  19. 7 7
      src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/addPage.vue
  20. 12 6
      src/views/medicUniversity-3_1/indexHome.vue
  21. 1 1
      src/views/medicUniversity-3_1/login.vue
  22. 6 6
      src/views/mine/index.vue
  23. 6 6
      src/views/studentViews/studentMine/index.vue
  24. 3 3
      src/views/system/alarm/index.vue
  25. 7 7
      src/views/system/user/profile/index.vue
  26. 4 4
      src/views/system/user/profile/userInfo.vue

+ 2 - 2
src/assets/styles/ZDcolorClass.scss

@@ -271,9 +271,9 @@
 }
 //===========================表格内按钮===========================
 .table-min-button{
-  height:25px;
+  height:23px;
   color:$list_button_color;
-  line-height:25px;
+  line-height:23px;
   font-size:14px;
   cursor:pointer;
   padding:0 10px !important;

+ 16 - 0
src/assets/styles/ZDelement.scss

@@ -115,6 +115,22 @@ background: rgba(255,255,255,0);
 }
 //表格内容高度部分
 //表头
+.el-table__fixed-header-wrapper{
+  th, td{
+    padding:18px 0;
+  }
+  .el-table--medium th, .el-table--medium td{
+    padding:12px 0!important;
+    border-top: 1px solid #dfe6ec!important;
+  }
+}
+//.el-table__fixed::before, .el-table__fixed-right::before{
+//  height:0;
+//}
+.el-table__fixed, .el-table__fixed-right{
+  top:1px;
+  left:1px;
+}
 .el-table__header-wrapper{
   th, td{
     padding:19px 0;

+ 1 - 1
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -56,7 +56,7 @@
             </el-table-column>
             <el-table-column label="重大危险源辨识指标" align="left" prop="riskIndicator" width="150" show-overflow-tooltip/>
             <el-table-column label="学院" align="left" prop="deptName" width="150" show-overflow-tooltip/>
-            <el-table-column label="责任人" align="left" prop="adminName" width="106" show-overflow-tooltip/>
+            <el-table-column label="实验室责任人" align="left" prop="adminName" width="120" show-overflow-tooltip/>
             <el-table-column label="安全责任人" align="left" prop="adminName" width="200" show-overflow-tooltip/>
             <el-table-column label="操作" align="left" width="160">
               <template slot-scope="scope">

+ 1 - 1
src/views/comprehensive/personnel/post/authUser.vue

@@ -43,7 +43,7 @@
       <el-form-item label="联系方式" prop="phonenumber">
         <el-input
           v-model="queryParams.phonenumber"
-          placeholder="请输入手机号码"
+          placeholder="请输入联系方式"
           clearable
           maxlength="13"
           size="small"

+ 4 - 4
src/views/comprehensive/personnel/student/addPage.vue

@@ -81,14 +81,14 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="手机号码:" prop="phonenumber">
+          <el-form-item label="联系方式:" prop="phonenumber">
             <el-input
               :disabled="editType"
               style="width:218px;"
               maxlength="11"
               onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
               v-model="form.phonenumber"
-              placeholder="请输入手机号码"
+              placeholder="请输入联系方式"
               clearable
               size="small"
             />
@@ -297,8 +297,8 @@
           deptId: [{ required: true, message: "请选择所在学院", trigger: "blur" }],
           majorId: [{ required: true, message: "请选择专业", trigger: "blur" }],
           phonenumber: [
-            { required: true, message: "请输入手机号码", trigger: "blur" },
-            { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入联系方式", trigger: "blur" },
+            { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
         textType:false,

+ 1 - 1
src/views/comprehensive/personnel/student/index.vue

@@ -304,7 +304,7 @@ export default {
         { key: 1, label: `用户名称`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
+        { key: 4, label: `联系方式`, visible: true },
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],

+ 4 - 4
src/views/comprehensive/personnel/teacher/addPage.vue

@@ -78,14 +78,14 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="手机号码:" prop="phonenumber">
+          <el-form-item label="联系方式:" prop="phonenumber">
             <el-input
               :disabled="editType"
               style="width:218px;"
               maxlength="25"
               onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
               v-model="form.phonenumber"
-              placeholder="请输入手机号码"
+              placeholder="请输入联系方式"
               clearable
               size="small"
             />
@@ -453,8 +453,8 @@
             { required: true, message: "请输入模板名称", validator: this.spaceJudgment, trigger: "blur" }],
           deptIds: [{ required: true, message: "请选择指定部门", trigger: "blur" }],
           phonenumber: [
-            { required: true, message: "请输入手机号码", trigger: "blur" },
-            { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入联系方式", trigger: "blur" },
+            { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
         textType:false,

+ 1 - 1
src/views/comprehensive/personnel/teacher/index.vue

@@ -458,7 +458,7 @@
           { key: 1, label: `用户名称`, visible: true },
           { key: 2, label: `用户昵称`, visible: true },
           { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
+          { key: 4, label: `联系方式`, visible: true },
           { key: 5, label: `状态`, visible: true },
           { key: 6, label: `创建时间`, visible: true }
         ],

+ 2 - 2
src/views/comprehensive/system/dept/index.vue

@@ -177,10 +177,10 @@ export default {
         phone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
+            message: "请输入正确的联系方式",
             trigger: "blur"
           },
-          { required: true, message: "请输入正确的手机号码", validator: this.spaceJudgment, trigger: "blur" }
+          { required: true, message: "请输入正确的联系方式", validator: this.spaceJudgment, trigger: "blur" }
         ],
         type:[
           { required: true, message: "请选择是否适用下级", trigger: "blur" }

+ 1 - 1
src/views/comprehensive/system/role/authUser.vue

@@ -44,7 +44,7 @@
       <el-form-item label="联系方式" prop="phonenumber">
         <el-input
           v-model="queryParams.phonenumber"
-          placeholder="请输入手机号码"
+          placeholder="请输入联系方式"
           clearable
           maxlength="13"
           size="small"

+ 6 - 6
src/views/comprehensive/system/user/index.vue

@@ -32,7 +32,7 @@
           <el-form-item label="关键字" prop="userName">
             <el-input
               v-model="queryParams.searchValue"
-              placeholder="用户名称/手机号"
+              placeholder="用户名称/联系方式"
               clearable
               size="small"
               style="width: 240px"
@@ -136,7 +136,7 @@
           <el-table-column label="用户名称" align="left" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="left" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="归属学院" align="left" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="left" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="联系方式" align="left" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
           <el-table-column label="状态" align="left" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
@@ -225,8 +225,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            <el-form-item label="联系方式" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入联系方式" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -429,7 +429,7 @@ export default {
         { key: 1, label: `用户名称`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
+        { key: 4, label: `联系方式`, visible: true },
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
@@ -458,7 +458,7 @@ export default {
         phonenumber: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
+            message: "请输入正确的联系方式",
             trigger: "blur"
           }
         ]

+ 1 - 1
src/views/gasManage3_0/manage/qualificationApply/qualificationApplyAdd.vue

@@ -218,7 +218,7 @@ export default {
         phone: [
           { required: true, message: "请输入联系方式", trigger: "blur" },
           { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" },
-          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的手机号", trigger: "blur" }
+          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的联系方式", trigger: "blur" }
         ],
         subjectId: [
           { required: true, message: "请选择实验地点", trigger: "blur" }

+ 2 - 2
src/views/gasManage3_0/manage/supplierManage/supplierManageAdd.vue

@@ -37,7 +37,7 @@
           <el-form-item label="联系人:" prop="contacts">
             <el-input  style="width: 300px" v-model="form.contacts" placeholder="请输入联系人姓名"  maxlength="10" />
           </el-form-item>
-          <el-form-item label="手机号码:" prop="phone" >
+          <el-form-item label="联系方式:" prop="phone" >
               <el-input   style="width: 300px" v-model="form.phone"  placeholder="请输入联系方式"  />
           </el-form-item>
           <el-form-item label="经营地址:" prop="businessAddress" >
@@ -244,7 +244,7 @@ export default {
         phone: [
           { required: true, message: "请输入联系方式", trigger: "blur" },
           { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" },
-          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }
+          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的联系方式", trigger: "blur" }
         ],
         empty:[
           { required: true, validator:empty, trigger: "change" },

+ 1 - 1
src/views/gasManage3_0/manage/useGas/useGasAdd.vue

@@ -163,7 +163,7 @@ export default {
         phone: [
           { required: true, message: "请输入联系方式", trigger: "blur" },
           { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" },
-          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的手机号", trigger: "blur" }
+          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的联系方式", trigger: "blur" }
         ],
         subjectId: [
           { required: true, message: "请选择实验地点", trigger: "blur" }

+ 1 - 1
src/views/gasManage3_0/student/qualificationApply/qualificationApplyAdd.vue

@@ -219,7 +219,7 @@ export default {
         phone: [
           { required: true, message: "请输入联系方式", trigger: "blur" },
           { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" },
-          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的手机号", trigger: "blur" }
+          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的联系方式", trigger: "blur" }
         ],
         subjectId: [
           { required: true, message: "请选择实验地点", trigger: "blur" }

+ 1 - 1
src/views/gasManage3_0/student/useGas/useGasAdd.vue

@@ -163,7 +163,7 @@ export default {
         phone: [
           { required: true, message: "请输入联系方式", trigger: "blur" },
           { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" },
-          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的手机号", trigger: "blur" }
+          { pattern:/^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[0-9])|(17[0,3,5-8])|(18[0-9])|(147))+\d{8}$/, message: "请输入正确的联系方式", trigger: "blur" }
         ],
         subjectId: [
           { required: true, message: "请选择实验地点", trigger: "blur" }

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue

@@ -133,7 +133,7 @@
               level:"1",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
               type:"2",//类型 1.input 2.select 3.TimePicker
               universal:[],
-              width:'175',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+              width:'155',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
             },
             {
               name:"出库方式",//描述名称
@@ -145,7 +145,7 @@
               universal:[ //通用参数 select时为列表数据 //TimePicker时可不传
                 {label:"用结",value:"2"},{label:"作废",value:"3"}
               ],
-              width:'175',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+              width:'155',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
             },
             {
               name:"标签类型",//描述名称

+ 1 - 2
src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue

@@ -196,7 +196,7 @@
       this.listDepartments();
       this.getNoauthList();
       this.getHxpClassifyattribute();
-      this.getList();
+      // this.getList();
     },
     methods: {
       //视频按钮
@@ -385,7 +385,6 @@
       flex-direction: column;
       overflow: hidden!important;
       padding:0 20px 20px!important;
-
     }
   }
 </style>

+ 7 - 7
src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/addPage.vue

@@ -64,19 +64,19 @@
               </div>
               <div class="for-right-box-3">
                 <div v-for="(minItem,minIndex) in item.alarmPhone">
-                  <el-form-item label="手机号码:"  :prop="'hxpAlarmConfigList.'+index+'.alarmPhone.'+minIndex+'.phone'" :rules="rules.phone">
+                  <el-form-item label="联系方式:"  :prop="'hxpAlarmConfigList.'+index+'.alarmPhone.'+minIndex+'.phone'" :rules="rules.phone">
                     <el-input
                       maxlength="11"
                       style="width:400px;"
                       onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
                       v-model="minItem.phone"
-                      placeholder="请输入手机号码"
+                      placeholder="请输入联系方式"
                       clearable
                       size="small"/>
                   </el-form-item>
                   <i class="el-icon-delete" v-if="item.alarmPhone.length>1" @click="delPhone(index,minIndex)"></i>
                   <i class="el-icon-plus" v-if="minIndex == item.alarmPhone.length-1" @click="addPhone(index)"></i>
-                  <i class="phone-add-text" v-if="minIndex == item.alarmPhone.length-1">最多可添加5个手机号码</i>
+                  <i class="phone-add-text" v-if="minIndex == item.alarmPhone.length-1">最多可添加5个联系方式</i>
                 </div>
               </div>
               <p class="el-icon-delete postion-button-1" @click="delItem(index)"></p>
@@ -115,9 +115,9 @@
             { required: true, message: "请输入报警内容", validator: this.spaceJudgment, trigger: "blur" }
           ],
           phone: [
-            { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur"},
-            { required: true, message: "请输入手机号码", trigger: "blur" },
-            { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
+            { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的联系方式", trigger: "blur"},
+            { required: true, message: "请输入联系方式", trigger: "blur" },
+            { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
         formData:{
@@ -137,7 +137,7 @@
       },
       addPhone(index){
         if(this.formData.hxpAlarmConfigList[index].alarmPhone.length>4){
-          this.msgError("最多可添加5个手机号码");
+          this.msgError("最多可添加5个联系方式");
           return
         }
         let obj = {

+ 12 - 6
src/views/medicUniversity-3_1/indexHome.vue

@@ -157,7 +157,7 @@
             <p>{{homeDialogData.adminNames[0]}}</p>
           </div>
           <div class="index-home-dialog-min-box">
-            <p>手机号码:</p>
+            <p>联系方式:</p>
             <p>{{homeDialogData.adminNames[1]}}</p>
           </div>
         </div>
@@ -179,7 +179,7 @@
             </p>
           </div>
           <div class="index-home-dialog-min-box">
-            <p>手机号码:</p>
+            <p>联系方式:</p>
             <p>
               <span v-for="(item,index) in homeDialogData.adminPhoneList">{{item}}<span v-if="index+1!=homeDialogData.adminPhoneList.length">、</span></span>
             </p>
@@ -359,12 +359,18 @@
         //化学品分类统计
         chemicalClassifyMix(){
           chemicalClassifyMix().then(response => {
-            this.chemicalClassifyMixList = JSON.parse(JSON.stringify(response.data));
-            let list = [];
+            let newList = [];
             for(let i=0;i<response.data.length;i++){
+              if(i<6){
+                newList.push(response.data[i]);
+              }
+            }
+            this.chemicalClassifyMixList = JSON.parse(JSON.stringify(newList));
+            let list = [];
+            for(let i=0;i<newList.length;i++){
               let obj = {
-                name:response.data[i].classifyAttribute,
-                value:response.data[i].chemicalMix.replace('%','')
+                name:newList[i].classifyAttribute,
+                value:newList[i].chemicalMix.replace('%','')
               }
               list.push(obj);
             }

+ 1 - 1
src/views/medicUniversity-3_1/login.vue

@@ -16,7 +16,7 @@
             <span>+86</span>
             <span>丨</span>
           </p>
-          <input type="text" v-model="loginForm.username" placeholder="请输入手机号"
+          <input type="text" v-model="loginForm.username" placeholder="请输入联系方式"
                  onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
                  maxlength="11" @keyup.enter="handleLogin">
         </div>

+ 6 - 6
src/views/mine/index.vue

@@ -37,7 +37,7 @@
           </div>
           <div class="left-type-text-max-box">
             <div>
-              <p>手机号码</p>
+              <p>联系方式</p>
               <p :class="user.phonenumber?'p-color-a':'p-color-b'">{{user.phonenumber?'已设置':'未设置'}}</p>
             </div>
             <div>
@@ -70,11 +70,11 @@
           <div v-if="buttonType == 1">
             <el-form :model="userform" ref="userform" :rules="rules" :inline="true" >
               <div>
-                <el-form-item class="form-item-min" label="手机号码:" prop="phonenumber" label-width="120px">
+                <el-form-item class="form-item-min" label="联系方式:" prop="phonenumber" label-width="120px">
                   <el-input
                     maxlength="11"
                     v-model="userform.phonenumber"
-                    placeholder="请输入手机号码"
+                    placeholder="请输入联系方式"
                     clearable
                     size="small"
                     onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
@@ -390,13 +390,13 @@
         this.$refs["userform"].validate(valid => {
           if (valid) {
             if(!this.userform.phonenumber&&!this.userform.email&&!this.userform.dateBirth){
-              this.msgError('手机号码/邮箱/出生年月,请至少填写一项进行修改')
+              this.msgError('联系方式/邮箱/出生年月,请至少填写一项进行修改')
               return
             }
             if((this.userform.phonenumber == this.userformData.phonenumber)&&
               (this.userform.email == this.userformData.email)&&
               (this.userform.dateBirth == this.userformData.dateBirth)){
-              this.msgError('手机号码/邮箱/出生年月,请至少修改一项再进行保存操作')
+              this.msgError('联系方式/邮箱/出生年月,请至少修改一项再进行保存操作')
               return
             }
             // let obj = JSON.parse(JSON.stringify(this.userform));
@@ -404,7 +404,7 @@
             if(this.userform.phonenumber){
               let regex = /^1[23456789]\d{9}$/;
               if(!regex.test(this.userform.phonenumber)){
-                this.msgError('请输入正确的手机号码')
+                this.msgError('请输入正确的联系方式')
                 return
               }else{
                 obj.phonenumber = this.userform.phonenumber;

+ 6 - 6
src/views/studentViews/studentMine/index.vue

@@ -37,7 +37,7 @@
           </div>
           <div class="left-type-text-max-box">
             <div>
-              <p>手机号码</p>
+              <p>联系方式</p>
               <p :class="user.phonenumber?'p-color-a':'p-color-b'">{{user.phonenumber?'已设置':'未设置'}}</p>
             </div>
             <div>
@@ -70,11 +70,11 @@
           <div v-if="buttonType == 1">
             <el-form :model="userform" ref="userform" :rules="rules" :inline="true" >
               <div>
-                <el-form-item class="form-item-min" label="手机号码:" prop="phonenumber" label-width="120px">
+                <el-form-item class="form-item-min" label="联系方式:" prop="phonenumber" label-width="120px">
                   <el-input
                     maxlength="11"
                     v-model="userform.phonenumber"
-                    placeholder="请输入手机号码"
+                    placeholder="请输入联系方式"
                     clearable
                     size="small"
                     onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
@@ -390,13 +390,13 @@
         this.$refs["userform"].validate(valid => {
           if (valid) {
             if(!this.userform.phonenumber&&!this.userform.email&&!this.userform.dateBirth){
-              this.msgError('手机号码/邮箱/出生年月,请至少填写一项进行修改')
+              this.msgError('联系方式/邮箱/出生年月,请至少填写一项进行修改')
               return
             }
             if((this.userform.phonenumber == this.userformData.phonenumber)&&
               (this.userform.email == this.userformData.email)&&
               (this.userform.dateBirth == this.userformData.dateBirth)){
-              this.msgError('手机号码/邮箱/出生年月,请至少修改一项再进行保存操作')
+              this.msgError('联系方式/邮箱/出生年月,请至少修改一项再进行保存操作')
               return
             }
             // let obj = JSON.parse(JSON.stringify(this.userform));
@@ -404,7 +404,7 @@
             if(this.userform.phonenumber){
               let regex = /^1[23456789]\d{9}$/;
               if(!regex.test(this.userform.phonenumber)){
-                this.msgError('请输入正确的手机号码')
+                this.msgError('请输入正确的联系方式')
                 return
               }else{
                 obj.phonenumber = this.userform.phonenumber;

+ 3 - 3
src/views/system/alarm/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container algorithm">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="手机号码" prop="phone">
-        <el-input v-model="queryParams.phone" placeholder="请输入手机号码" />
+      <el-form-item label="联系方式" prop="phone">
+        <el-input v-model="queryParams.phone" placeholder="请输入联系方式" />
       </el-form-item >
       <el-form-item label="报警状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择报警状态">
@@ -46,7 +46,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="手机号码" align="center" prop="phone" />
+      <el-table-column label="联系方式" align="center" prop="phone" />
       <el-table-column label="报警内容" align="center" prop="notice" width="500"/>
       <el-table-column label="拨打次数" align="center" prop="isBack" />
       <el-table-column label="回调时间" align="center" prop="updateTime" width="200"/>

+ 7 - 7
src/views/system/user/profile/index.vue

@@ -10,7 +10,7 @@
           <p>用户名称:<span>{{user.nickName}}</span></p>
         </div>
         <div class="text-box">
-          <p>手机号码:<span>{{user.phonenumber?user.phonenumber:'未填写'}}</span><span @click="phoneButton(1)">编辑</span></p>
+          <p>联系方式:<span>{{user.phonenumber?user.phonenumber:'未填写'}}</span><span @click="phoneButton(1)">编辑</span></p>
         </div>
         <div class="text-box" v-if="user.dept">
           <p>学院:<span>{{user.dept.deptName}}</span></p>
@@ -74,8 +74,8 @@
     <!--修改手机号-->
     <el-dialog title="修改手机号" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="phoneForm" :model="phoneForm" :rules="rules" label-width="80px">
-        <el-form-item label="手机号" prop="phone">
-          <el-input v-model="phoneForm.phone" placeholder="请输入手机号" maxLength="11"/>
+        <el-form-item label="联系方式" prop="phone">
+          <el-input v-model="phoneForm.phone" placeholder="请输入联系方式" maxLength="11"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -220,10 +220,10 @@ export default {
           { required: true, message: "确认密码不能为空", validator: this.spaceJudgment, trigger: "blur" }
         ],
         phone: [
-          { required: true, message: "请输入11位手机号码", trigger: "blur" },
+          { required: true, message: "请输入11位联系方式", trigger: "blur" },
           { validator: this.checkPhone, trigger: 'blur' },
-          { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
-          { required: true, message: "请输入11位手机号码", validator: this.spaceJudgment, trigger: "blur" }
+          { min: 11, max: 11, message: "请输入11位联系方式", trigger: "blur" },
+          { required: true, message: "请输入11位联系方式", validator: this.spaceJudgment, trigger: "blur" }
         ],
       },
       //上传签名开关
@@ -409,7 +409,7 @@ export default {
         if (reg.test(value)) {
           callback()
         } else {
-          return callback(new Error('请输入正确的手机号'))
+          return callback(new Error('请输入正确的联系方式'))
         }
       }
     },

+ 4 - 4
src/views/system/user/profile/userInfo.vue

@@ -3,7 +3,7 @@
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="user.nickName" maxlength="30" />
     </el-form-item>
-    <el-form-item label="手机号码" prop="phonenumber">
+    <el-form-item label="联系方式" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
@@ -49,13 +49,13 @@ export default {
           { required: true, message: "邮箱地址不能为空", validator: this.spaceJudgment, trigger: "blur" }
         ],
         phonenumber: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          { required: true, message: "联系方式不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
+            message: "请输入正确的联系方式",
             trigger: "blur"
           },
-          { required: true, message: "手机号码不能为空", validator: this.spaceJudgment, trigger: "blur" }
+          { required: true, message: "联系方式不能为空", validator: this.spaceJudgment, trigger: "blur" }
         ]
       }
     };