Browse Source

爆米花更新

soobin 2 years ago
parent
commit
7d6192baa2
3 changed files with 4 additions and 4 deletions
  1. 1 1
      public/index.html
  2. 2 2
      src/views/device/deviceSearch.vue
  3. 1 1
      src/views/device/index.vue

+ 1 - 1
public/index.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>shenze</title>
+    <title>Sunzee</title>
     <link rel="stylesheet" href="./fontIcon.css">
     <script type="text/javascript" src="./echarts.min.js"></script>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>

+ 2 - 2
src/views/device/deviceSearch.vue

@@ -10,14 +10,14 @@
             :placeholder="$t('device.equipmentNamePlaceholder')" />
           <van-field v-model="adminName" name="adminName" :label="$t('device.merchantNameLabel')"
             :placeholder="$t('device.merchantNamePlaceholder')" />
-          <div v-if="isShowCompany()">
+          <!-- <div v-if="isShowCompany()">
             <van-field label-width="86" v-model="companyTypeText" is-link readonly :label="$t('device.companyTypeLabel')"
               :placeholder="$t('device.companyTypePlaceholder')" @click="companyTypeShow = true" class="field" />
             <van-popup v-model:show="companyTypeShow" round position="bottom">
               <van-cascader v-model="companyType" :title="$t('device.companyTypePlaceholder')"
                 :options="companyTypeOptions" @close="companyTypeShow = false" @finish="companyTypeFinish" />
             </van-popup>
-          </div>
+          </div> -->
           <!-- <van-field
             v-model="areaName"
             name="areaName"

+ 1 - 1
src/views/device/index.vue

@@ -132,7 +132,7 @@
                       }}</van-button>
                     </span>
                   </div>
-                  <van-row class="layer5 o-ptb-10 kBordBott" justify="space-between" v-if="item.machineType == '0' || item.machineType == null">
+                  <van-row class="layer5 o-ptb-10 kBordBott" justify="space-between" v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'POP320'">
                     <van-col class="word5">{{ $t("device.furnaceHeadTemperature") }}:{{
                       item.furnaceTm
                     }}{{ $t("device.degree") }}</van-col>