zc

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

@@ -21,7 +21,7 @@
           <div class="for-big-box" v-for="(item,index) in formData.hxpAlarmConfigList">
             <div class="for-left-box">
               <p class="top-null"></p>
-              <p class="center-num">{{index+1}}</p>
+              <p class="center-num">{{item.sort}}</p>
               <p class="bottom-null"></p>
             </div>
             <div class="for-right-box" :class="index==0?'for-right-box-none-border':''">
@@ -157,7 +157,8 @@
             for(let i=0;i<self.formData.hxpAlarmConfigList.length;i++){
               let minObj = {
                 // alarmMode:self.formData.hxpAlarmConfigList[i].alarmMode,
-                alarmMode:3,
+                sort:i+1,
+                alarmMode:4,
                 timeInterval:self.formData.hxpAlarmConfigList[i].timeInterval,
                 alarmContent:self.formData.hxpAlarmConfigList[i].alarmContent,
               }

src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/infoPage.vue

@@ -41,7 +41,7 @@
           <p>{{propsInfoData.operate}}</p>
         </div>
       </div>
-      <p class="bottom-button" v-if="propsInfoData.handlingStatus == 1 && propsInfoData.alarmModeStatus == 3" @click="handle">处理</p>
+      <p class="bottom-button" v-if="propsInfoData.handlingStatus == 1 && propsInfoData.alarmModeStatus == 4" @click="handle">处理</p>
     </div>
   </div>
 </template>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue

@@ -253,11 +253,11 @@
             <template slot="append">秒</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="处理时长：" prop="dealTime">
-          <el-input v-model="setUpForm.dealTime" placeholder="请输入处理时长" maxlength="3" style="width:360px;">
-            <template slot="append">分钟</template>
-          </el-input>
-        </el-form-item>
+<!--        <el-form-item label="处理时长：" prop="dealTime">-->
+<!--          <el-input v-model="setUpForm.dealTime" placeholder="请输入处理时长" maxlength="3" style="width:360px;">-->
+<!--            <template slot="append">分钟</template>-->
+<!--          </el-input>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="setUpSubmitForm">确 定</el-button>
@@ -272,6 +272,7 @@
   import { listHardware, delHardware, addHardware, updateHardware, hardWareControl } from "@/api/medicUniversity-3_1/index";
   import { listRelay } from "@/api/laboratory/relay";
   import { listDepartments } from "@/api/system/dept";
+  import {subjectDictList } from "@/api/laboratory/record";
   import { getToken } from "@/utils/auth";
   export default {
     name: "smartAlarm",
@@ -529,7 +530,7 @@
             }
           }
           //查询院系下实验室
-          getSubList(idText).then(response => {
+          subjectDictList(idText).then(response => {
             //当前列表
             this.selectList = JSON.parse(JSON.stringify(response.data));
             //原始列表数据