zc

src/assets/styles/ZDelement.scss

@@ -298,6 +298,13 @@ background: rgba(255,255,255,0);
 .el-table td div{
   font-weight:500;
 }
+//左侧导航滚动条
+.scrollbar-wrapper{
+  padding-right:17px;
+}
+.scrollbar-wrapper::-webkit-scrollbar{
+  display: none;
+}
 /*顶部按钮滚动条*/
 .tags-view-container{
   padding:0!important;

src/views/emergencyEvacuationBig.vue

@@ -250,7 +250,7 @@
               speed:"",
               params:{
                 tid:"",
-                vol:"",
+                vol:self.trumpetList[i].deviceVol,
                 urls:[]
               }
             };

src/views/emergencyEvacuationBigOne.vue

@@ -252,7 +252,7 @@
               speed:"",
               params:{
                 tid:"",
-                vol:"",
+                vol:self.trumpetList[i].deviceVol,
                 urls:[]
               }
             };

src/views/emergencyManagement/evacuation/sparseHardware/addPage.vue

@@ -22,6 +22,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="喇叭音量" prop="deviceVol" v-if="typeDisabled">
+          <el-slider :min="0" :max="100" v-model="form.deviceVol" :step="1" style="width:400px;"></el-slider>
+        </el-form-item>
         <el-form-item label="设备编号" prop="hardwareNum" >
           <el-input
             style="width:400px;"
@@ -45,8 +48,8 @@
         </el-form-item>
         <el-form-item label="设备类别" prop="deviceType">
           <template>
-            <el-radio v-model="form.deviceType" :label="1" @change="radioChange" :disabled="typeDisabled">楼层设备</el-radio>
-            <el-radio v-model="form.deviceType" :label="2" @change="radioChange" :disabled="typeDisabled">实验室设备</el-radio>
+            <el-radio v-model="form.deviceType" :label="1" @change="radioChange">楼层设备</el-radio>
+            <el-radio v-model="form.deviceType" :label="2" @change="radioChange">实验室设备</el-radio>
           </template>
         </el-form-item>
         <el-form-item label="楼栋" prop="buildId" v-if="form.deviceType == '1'">
@@ -116,6 +119,9 @@
           type: [
             { required: true, message: "请选择设备类型", trigger: "change" }
           ],
+          // deviceVol: [
+          //   { required: true, message: "请设置喇叭音量", trigger: "change" }
+          // ],
           hardwareNum: [
             { required: true, message: "请输入设备编号", trigger: "change" },
             { required: true, message: "请输入设备编号", validator: this.spaceJudgment, trigger: "blur" }
@@ -156,6 +162,7 @@
         this.form.type = parseInt(this.form.type);
         if(this.form.type == 2){
           this.$set(this,'typeDisabled',true);
+          this.$set(this.form,'deviceVol',parseInt(this.form.deviceVol));
         }
         if(this.form.deviceType == 1){
           this.form.buildId = parseInt(this.form.buildId);
@@ -210,6 +217,9 @@
               }else if(this.form.deviceType == '2'){
                 obj.subjectId = this.form.subjectId;
               }
+              if(this.form.type == '2'){
+                obj.deviceVol = this.form.deviceVol;
+              }
               updateSparseHardware(obj).then( response => {
                 this.msgSuccess("操作成功");
                 this.$parent.pageTypeClick(1);
@@ -229,6 +239,9 @@
               }else if(this.form.deviceType == '2'){
                 obj.subjectId = this.form.subjectId;
               }
+              if(this.form.type == '2'){
+                obj.deviceVol = this.form.deviceVol;
+              }
               addSparseHardware(obj).then( response => {
                 this.msgSuccess("操作成功");
                 this.$parent.pageTypeClick(1);