Merge branch 'VERSIONS-FenJiFenLei' into VERSIONS-AnQuanJianCha

src/views/basicsModules/login.vue

@@ -399,7 +399,7 @@ export default {
               this.getExploitConfig();
               this.getHomeConfig();
               // localStorage.setItem('initPage',res.data.skipHomePage);
-              if(res.data.reset_password){
+              if(res.data.isInitPasswd){
                 this.$confirm('账号当前登录密码为默认密码,是否现在修改?', "提示", {
                   confirmButtonText: "确定",
                   cancelButtonText: "取消",
@@ -469,7 +469,7 @@ export default {
                 this.getExploitConfig();
                 this.getHomeConfig();
                 // localStorage.setItem('initPage',res.data.skipHomePage);
-                if(res.data.reset_password){
+                if(res.data.isInitPasswd){
                   this.$confirm('账号当前登录密码为默认密码,是否现在修改?', "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",

src/views/basicsModules/ssoLogin.vue

@@ -65,15 +65,6 @@
           });
         }
       } else {
-        // this.$alert('参数异常!', '提示', {
-        //   confirmButtonText: '确定',
-        //   callback: action => {
-        //     localStorage.removeItem('serviceType');
-        //     store.dispatch('LogOut').then(() => {
-        //       window.location.href = process.env.VUE_APP_OUT_URL;
-        //     })
-        //   }
-        // });
         window.location.href = process.env.VUE_APP_OUT_URL;
       }
       localStorage.setItem('windowHref', window.location.href)

src/views/chemicalManage/inventoryManagement/inventoryStatistics/infoPage.vue

@@ -8,7 +8,7 @@
       <div class="content-box-left scrollbar-box">
         <li class="chemical-name">{{newData.stock.chemicalName}}<p class="chemical-state">{{newData.stock.statusStr}}</p></li>
         <li>{{newData.stock.chemicalShape==1?'固体':'液体'}}/{{newData.stock.chemicalPurity}}/{{newData.stock.casNum}}</li>
-        <li>类别：{{newData.stock.chemicalCategoryName}}<p class="control-state">{{newData.stock.chemicalLevel?'管控':'非管控'}}</p></li>
+        <li>类别：{{newData.stock.chemicalCategoryName}}<p class="control-state">{{newData.stock.chemicalLevel == 1?'管控':'非管控'}}</p></li>
         <li>编码：{{newData.stock.tagCode}}</li>
         <li>RFID标签：{{newData.stock.rfidCode}}</li>
         <li>规格：{{newData.stock.specNum}}{{newData.stock.specUnit}}/{{newData.stock.packUnit}}</li>

src/views/chemicalManage/useLedger/index.vue

@@ -193,7 +193,7 @@
         //楼栋楼层
         buildFloorOptions:[],
         //级别
-        levelOptions:[{value:1,label:'管控'},{value:0,label:'非管控'}],
+        levelOptions:[{value:1,label:'管控'},{value:2,label:'非管控'}],
         //类别
         categoryOptions:[],
         cabinetOptions:[],