Selaa lähdekoodia

Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

dedsudiyu 2 vuotta sitten
vanhempi
commit
5c99eaa63e

+ 2 - 2
.env.production

@@ -6,9 +6,9 @@ ENV = 'production'
 
 # ####################外网接口配置####################
 
-VUE_APP_BASE_API = 'lab.sxitdlc.com/labAppTest'
+VUE_APP_BASE_API = 'lab.sxitdlc.com/labSystem'
 
 
 # ####################内网接口配置####################
 
-VUE_APP_BASE_LOCAL_API = '192.168.1.43/labSystem'
+VUE_APP_BASE_LOCAL_API = '180.76.134.43:19319'

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

@@ -404,7 +404,7 @@ export default {
     queryHardByTypeList(){
       let _this=this;
       let obj={
-        subjectId:'85',
+        subjectId:this.subId,
         type:'HK_DOOR',
       }
       queryHardByTypeList(obj).then( response => {

+ 5 - 0
src/views/securityCheck/checkRecord/unsubmittedInfo.vue

@@ -282,6 +282,8 @@
         imgIndex:"",
         //临时存储房间号
         fjNumber:"",
+        //临时存储隐患信息ID
+        hiddenDangerIdList:[],
         // 表单校验
         rules: {
           fjNumber: [
@@ -501,7 +503,9 @@
       },
       //删除隐患
       delDanger(index){
+        this.hiddenDangerIdList.push(this.form.detailsList[index].id)
         this.form.detailsList.splice(index,1)
+
         this.$forceUpdate();
       },
       //新增隐患项
@@ -587,6 +591,7 @@
               obj.detailsList[i].voice = null;
             }
             obj.zgStatus = 0;
+            obj.ids=this.hiddenDangerIdList
             if(type == 1){
               obj.isCg = 1;
               obj.isFabu = 0;