heyang

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/listPage.vue

@@ -220,7 +220,7 @@
           useStatus :null,
           chemicalLevel :null,
           chemicalCategory :null,
-          doorId :this.propsData.doorList[0].doorUniqueId,
+          doorId :this.queryParams.doorId,
         });
         this.getList();
       },

src/views/chemicalManage/chemicalsStatistics/alarmStatistics.vue

@@ -62,7 +62,7 @@ import { chemicalIndexChemicalGroup, chemicalIndexWarnCount } from '@/api/chemic
             left: '8%',
             right: '5%',
             top: '10%',
-            bottom: '15%',
+            bottom: '20%',
           },
           tooltip: {
             trigger: 'axis',
@@ -91,6 +91,28 @@ import { chemicalIndexChemicalGroup, chemicalIndexWarnCount } from '@/api/chemic
             },
             axisLabel: {
               fontSize: 14,
+              formatter: function (params) {
+                var str = "";                 // 最终拼接成的字符串
+                var paramsLen = params.length;// 获取每项文字的个数
+                var len = 2;                  // 每行能显示的字的个数（根据实际情况自己设置）
+                var rowNumber = Math.ceil(paramsLen / len); // 换行的话，需要显示几行，向上取整
+                if (paramsLen > len) {        //大于设定的len就换行，不大于就不变化
+                  for (var i = 0; i < rowNumber; i++) {
+                    var temp = "";            // 表示每一次截取的字符串
+                    var start = i * len;      // 开始截取的位置
+                    var end = start + len;    // 结束截取的位置
+                    if (i == rowNumber - 1) { // 最后一次不换行
+                      temp = params.substring(start, paramsLen);
+                    } else {                  // 每一次拼接字符串并换行
+                      temp = params.substring(start, end) + "\n";
+                    }
+                    str += temp;              // 最终拼成的字符串
+                  }
+                } else {                      // 给新的字符串赋值
+                  str = params;
+                }
+                return str;                   //返回字符串
+              }
             },
             data: dataName,
           },

src/views/integratedManagement/personnelManage/researchGroupManage/addPage.vue

@@ -329,6 +329,7 @@
             }
           }
           this.$set(this.addForm,'memberList',response.data.records);
+          this.$set(this,'maxUserNum',response.data.total);
         });
       },
     },

src/views/integratedManagement/personnelManage/teacherInfo/addPage.vue

@@ -206,6 +206,7 @@ export default {
           { required: true, message: "请输入手机号码", trigger: "blur" },
           { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
         ],
+        position: [{ required: true, message: "请选择身份", trigger: "blur" }],
       },
       //部门数据结构树
       treeselectList:[],

src/views/safetyCheck/dataStatistics/inspectContent.vue

@@ -56,7 +56,7 @@
     </div>
     <div class="page-content-box">
       <div class="num-data-box">
-        共搜索到隐患总数 {{numData.numData}}，已整改数 {{numData.sumYzg}}， 未整改数 {{numData.sumWzg}}，整改率 {{numData.rate}}
+        共搜索到隐患总数 {{numData.sumTotal}}，已整改数 {{numData.sumYzg}}， 未整改数 {{numData.sumWzg}}，整改率 {{numData.rate}}
       </div>
       <el-table class="table-box" border :data="tableList" ref="table-box"
                  :row-key="getRowKeys"