Merge branch 'xf_dev' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into xf_dev

src/layout/components/NavBar/components/NavbarRight.vue

@@ -77,6 +77,7 @@
       v-model="dialog.visible"
       :title="dialog.title"
       width="980px"
+      :append-to-body="true"
       min-height="800px"
       @close="dialog.visible = false"
     >
@@ -285,7 +286,6 @@ const userCenter = () => {
     background: rgb(0 0 0 / 10%);
   }
 }
-
 .layout-top,
 .layout-mix {
   .setting-item,
@@ -293,7 +293,9 @@ const userCenter = () => {
     color: var(--el-color-white);
   }
 }
-
+.el-scrollbar{
+  height: auto !important;
+}
 .dark .setting-item:hover {
   background: rgb(255 255 255 / 20%);
 }

src/views/device/data/index.vue

@@ -57,7 +57,7 @@ const searchPage = (params, done) =>{
         hide: true,
         type: "select",
         dicData: deviceList,
-        props: { label: "deviceName", value: "deviceNo", },
+        props: { label: "deviceNo", value: "deviceNo", },
       },
         {
           label: "任务信息",
@@ -120,7 +120,7 @@ option.value = Object.assign(option.value, {
     hide: true,
     type: "select",
     dicData: deviceList,
-    props: { label: "deviceName", value: "deviceNo", },
+    props: { label: "deviceNo", value: "deviceNo", },
   },
     {
       label: "任务信息",

src/views/quality/unqualified/columns.ts

@@ -27,7 +27,7 @@ export const columns = [
   },
 
   {
-    label: "流转卡号", prop: "seqNo", overHidden: true,search:true
+    label: "审理单号", prop: "trackingNumber", overHidden: true,search:true
 
   },
   {