问题修复

src/views/stquery/deviceStatusRecord.vue

@@ -48,6 +48,26 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
+            <el-form-item label="一级类目" prop="typeLevelOneName">
+                <el-input
+                    v-model="queryParams.typeLevelOneName"
+                    placeholder="请输入一级类目"
+                    clearable
+                    :maxlength="20"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="二级类目" prop="typeLevelTwoName">
+                <el-input
+                    v-model="queryParams.typeLevelTwoName"
+                    placeholder="请输入二级类目"
+                    clearable
+                    :maxlength="20"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
             <el-form-item label="机具名称" prop="typeName">
                 <el-input
                     v-model="queryParams.typeName"
@@ -135,6 +155,20 @@
                     indexContinuation(queryParams.pageNum, queryParams.pageSize)
                 "
             />
+            <el-table-column
+                label="一级类目"
+                align="center"
+                prop="typeLevelOneName"
+                :show-overflow-tooltip="true"
+                width="100"
+            />
+            <el-table-column
+                label="二级类目"
+                align="center"
+                prop="typeLevelTwoName"
+                :show-overflow-tooltip="true"
+                width="150"
+            />
             <el-table-column
                 label="机具名称"
                 align="center"
@@ -267,6 +301,8 @@ export default {
                 status: undefined,
                 typeName: undefined,
                 typeModelName: undefined,
+                typeLevelOneName: undefined, //一级类目
+                typeLevelTwoName: undefined, //二级类目
                 time: null, //申请时间
                 unitId: null, //来往单位id
                 proId: null, //工程id
@@ -296,6 +332,8 @@ export default {
         agreementCode:this.queryParams.agreementCode, */
                 typeName: this.queryParams.typeName,
                 typeModelName: this.queryParams.typeModelName,
+                typeLevelOneName: this.queryParams.typeLevelOneName, //一级类目
+                typeLevelTwoName: this.queryParams.typeLevelTwoName, //二级类目
                 propId: this.queryParams.propId,
                 /* startTime:this.queryParams.time && this.queryParams.time[0],
         endTime:this.queryParams.time && this.queryParams.time[1], */
@@ -348,8 +386,12 @@ export default {
         /** 重置按钮操作 */
         resetQuery() {
             this.queryParams.time = []
+            this.queryParams.typeLevelOneName = '' //一级类目
+            this.queryParams.typeLevelTwoName = '' //二级类目
+            this.queryParams.typeName = '' //机具名称
+            this.queryParams.typeModelName = '' //规格型号
             this.resetForm('queryForm')
-            this.getPropData()
+            // this.getPropData()
             this.handleQuery()
         },
 

src/views/warehouseManage/machinery/coding-nw/component/MapDIalog.vue

@@ -214,8 +214,8 @@ export default {
 
             count: 0,
             trackAni: null, // 轨迹实例
-            calLon: 116.404,
+            calLon: null,
-            calLat: 39.915,
+            calLat: null,
 
             // 查询设备行程信息的参数
             tripParams: {

src/views/warehouseManage/machinery/coding-nw/index.vue

@@ -556,8 +556,8 @@
                     <div class="maCode">机具名称：{{ rowObj.deviceType }}</div>
                     <div class="maCode">规格型号：{{ rowObj.specificationType }}</div>
                     <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
+                    <div class="maCode" v-if="rowObj.assetsCode">资产编号：{{ rowObj.assetsCode }}</div>
                     <div class="maCode">二维码编号：{{ rowObj.qrCode }}</div>
-                    <div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
                 </div>
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: center">

src/views/warehouseManage/tagBind/bind/index.vue

@@ -455,8 +455,8 @@
                     <div class="maCode">机具名称：{{ rowObj.modelName }}</div>
                     <div class="maCode">规格型号：{{ rowObj.typeName }}</div>
                     <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
+                    <div class="maCode" v-if="rowObj.assetsCode">资产编号：{{ rowObj.assetsCode }}</div>
                     <div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
-                    <div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
                 </div>
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: center">

src/views/warehouseManage/tagBind/history/index.vue

@@ -175,8 +175,8 @@
                     <div class="maCode">机具名称：{{ rowObj.modelName }}</div>
                     <div class="maCode">规格型号：{{ rowObj.typeName }}</div>
                     <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
+                    <div class="maCode" v-if="rowObj.assetsCode">资产编号：{{ rowObj.assetsCode }}</div>
                     <div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
-                    <div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
                 </div>
             </div>
         </el-dialog>