From 851c7991a711510f4b8fb3e970f7964f2e9105f2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 07 Aug 2021 18:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

---
 src/views/commandQuery/taskDistribution.vue |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index a6f64a1..be261ff 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -60,7 +60,7 @@
         delBtn: false,
         editBtn: false,
         addBtn: false,
-        selection: false,
+        selection: true,
         menu: false,
 
         searchShowBtn: false,
@@ -110,8 +110,8 @@
             label: "发送指令人",
             prop: "sendName",
             search: true,
-            searchLabelWidth: 120,
-            searchSpan: 5,
+            searchLabelWidth: 90,
+            searchSpan: 4,
             //     hide: true,
             //     editDisplay: false,
             //     addDisplay: false
@@ -121,7 +121,8 @@
             label: "接收指令人",
             prop: "receiveName",
             search: true,
-            searchLabelWidth: 120,
+            searchLabelWidth: 90,
+            searchSpan: 4,
           },
           {
             label: "发送指令时间",
@@ -133,6 +134,12 @@
           {
             label: "指令内容",
             prop: "content",
+          },
+          {
+            label: "图片",
+            prop: "url",
+            dataType: "string",
+            type: "img",
           },
         ],
       },
@@ -262,6 +269,9 @@
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
+        // for (var k in this.data) {
+        //   this.data[k]["url"] = "https://avuejs.com/images/logo-bg.jpg";
+        // }
         console.log(this.data, "getLisperetaskDistribution");
         this.loading = false;
         // this.selectionClear();

--
Gitblit v1.9.3