修改优化意见_11_12

src/components/equipmentManagement/components/health/index.vue

@@ -7,7 +7,7 @@
           {{ props.title === "维修统计" ? "维修统计" : props.title }}
         </div>
 
-        <div class="el-select1">
+        <div class="el-select2">
           <el-select
             v-model="params.facName"
             placeholder="请选择"
@@ -21,7 +21,7 @@
             <el-option v-for="item in allName" :key="item" :label="item" :value="item" />
           </el-select>
         </div>
-        <div class="el-select2">
+        <div class="el-select1">
           <el-select
             v-if="props.title === '维修统计'"
             v-model="isMaintain"

src/components/productionInformation/inOutboundMsg.vue

@@ -303,17 +303,26 @@ function getBrandChart(boolean) {
     console.log(params.month.slice(0, -2));
     // params.month = params.month.slice(-2)
   }
+  
   if (props.title === "入库信息") {
     getBrandTimeCount(params).then((res) => {
       drawBarChart(res.result);
       getChartList()
       getStoreDetail()
+      getBrandNames(params).then((res) => {
+      brandList.value = res.result;
+      params.brandName = brandList.value[0];
+    });
     });
   } else {
     getOutBrandTimeCount(params).then((res) => {
       drawBarChart(res.result);
       getChartList()
       getStoreDetail()
+      getOutBrandNames(params).then((res) => {
+      brandList.value = res.result;
+      params.brandName = brandList.value[0];
+    });
     });
   }
 }

src/views/home/components/homeDialog/brand.vue

@@ -57,7 +57,7 @@
           <div>
             <ul>
               <li>
-                <span>货位：</span><span>{{ areaNum.storeNum }}</span>
+                <span>库存总量：</span><span>{{ areaNum.storeNum }}</span>
               </li>
               <li>
                 <span>实箱：</span><span>{{ areaNum.hasBox }}</span>
@@ -283,14 +283,14 @@ onMounted(() => {
   // 获取货位 批次数据
   getBrandBox().then((res) => {
     for (let key in res.result) {
-      console.log(res.result, key);
+      console.log(res.result, key,'huowei');
-      if (key === "货位") {
+      if (key === "inventoryNum") {
         areaNum.storeNum = res.result[key];
-      } else if (key === "实箱") {
+      } else if (key === "fullBoxNum") {
         areaNum.hasBox = res.result[key];
-      } else if (key === "空箱") {
+      } else if (key === "emptyBoxNum") {
         areaNum.noBox = res.result[key];
-      } else {
+      } else if (key === "batchNum") {
         areaNum.batchNo = res.result[key];
       }
     }

src/views/login.vue

@@ -69,7 +69,7 @@ const ruleForm = reactive({
   id: 0,
   status: 0,
   remark: "",
-  userName: "admin14",
+  userName: "",
   userPassword: "",
 });
 // 是否允许登录