Merge branch 'AIControl' of http://192.168.2.236:10080/zhouna/platformFront into AIControl

src/components/qualityControl/AddCombineFeild.vue

@@ -361,7 +361,7 @@
     overflow-y: auto;
     background: #fff;
     z-index: 2;
-    border: 1px solid #dcdfe6;
+    border: 1px solid #48c5d7;
 }
 .searchItem{
     height: 40px;

src/components/qualityControl/AddQualityControlTemp.vue

@@ -497,7 +497,7 @@ export default {
     overflow-y: auto;
     background: #fff;
     z-index: 2;
-    border: 1px solid #dcdfe6;
+    border: 1px solid #48c5d7;
 }
 .searchItem{
     height: 40px;

src/components/qualityControl/BaseFieldList.vue

@@ -122,10 +122,9 @@
       }
     },
     created() {
-      this.getAllTypes();
       const _this=this;
       setTimeout(function() {
-        _this.getDataList();
+        _this.getAllTypes()
       },100);
     },
     watch:{
@@ -156,11 +155,13 @@
         if(localStorage.getItem("qcModuleTypes")){
           this.hisTypes = JSON.parse(localStorage.getItem("qcHospitalTypes"));
           this.fieldTypes = JSON.parse(localStorage.getItem("qcModuleTypes"));
+          this.getDataList();
           return ;
         }
         //获取枚举信息
         api.getQcTypes().then((res)=>{
           if(res.data.code==="0"){
+            this.getDataList();
             const data = res.data.data;
             localStorage.setItem("qcFieldTypes",JSON.stringify(data[11]));
             localStorage.setItem("qcModuleTypes",JSON.stringify(data[12]));

src/components/recordInput/ManageItemBatch.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="ManageItemBatchWrapper">
-        <crumbs :title="title" :param="$route.params" linkTo="RecordItemList"></crumbs>
+        <crumbs :title="title" :param="$route.params" linkTo="RecordItemList" minWidth="1210px"></crumbs>
         <div class="contents">
             <div class="content">
                 <el-form ref="form" :label-position="labelPosition" label-width="125px" class="add-record-form" >
@@ -439,14 +439,11 @@
 <style lang="less">
     @import "../../less/admin.less";
     .ManageItemBatchWrapper{
-      .container{
-        min-width: 1050px;
-      }
       .content{
         background: #fff;
         padding: 20px 20px 50px;
         color: #545455;
-        min-width: 1040pxpx;
+        min-width: 1200px;
         position: relative;
         .short-inp{
             width: 200px;