From e865a3d45a06ea57484313668051b607c963860f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Thu, 15 Sep 2022 16:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development              |  4 ++--
 src/views/ops/log_request.vue | 23 +++++++++++++++++++++--
 src/views/rpm/rparty.vue      |  9 ++++++---
 src/views/rpm/rpj_show.vue    |  2 +-
 src/views/vm/visit_detial.vue |  2 +-
 src/views/vm/visitor.vue      | 12 ++++--------
 6 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/.env.development b/.env.development
index e15c8e77..2283b396 100644
--- a/.env.development
+++ b/.env.development
@@ -8,8 +8,8 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
 #VUE_APP_WS_API = 'ws://localhost:8000'
 VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
-#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
-VUE_APP_BASEURL = http://127.0.0.1:8000
+VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
+#VUE_APP_BASEURL = http://127.0.0.1:8000
 
 
 # 本地端口
diff --git a/src/views/ops/log_request.vue b/src/views/ops/log_request.vue
index 52970228..abfbfe68 100644
--- a/src/views/ops/log_request.vue
+++ b/src/views/ops/log_request.vue
@@ -1,13 +1,24 @@
 <template>
   <el-container>
     <el-header>
-      <div class="left-panel"></div>
+      <div class="left-panel">
+        <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        start-placeholder="请求时间始"
+        end-placeholder="请求时间止"
+        value-format="YYYY-MM-DD HH:mm:ss"
+        @change="handleQuery"
+        clearable
+      />
+      </div>
       <div class="right-panel">
         <div class="right-panel-search">
           <el-input
             v-model="query.id"
             placeholder="logId"
-            clearable
+            @keyup.enter="handleQuery"
           ></el-input>
           <el-button
             type="primary"
@@ -97,6 +108,7 @@ export default {
   data() {
     return {
       apiObj: this.$API.ops.logs.list,
+      timeRange: [],
       query: {},
       logLists: [],
       infoDrawer: false,
@@ -106,6 +118,13 @@ export default {
   mounted() {},
   methods: {
     handleQuery() {
+       if(this.timeRange){
+        this.query.start_request = this.timeRange[0]
+        this.query.end_request = this.timeRange[1]
+      }else{
+        this.query.start_request = null
+        this.query.end_request = null
+      }
       this.$refs.table.queryData(this.query);
     },
     resetQuery() {
diff --git a/src/views/rpm/rparty.vue b/src/views/rpm/rparty.vue
index ee5ecaca..647dab8a 100644
--- a/src/views/rpm/rparty.vue
+++ b/src/views/rpm/rparty.vue
@@ -32,7 +32,7 @@
        
       >
         <el-table-column label="#" type="index" width="50"></el-table-column>
-        <el-table-column label="名称" prop="name" width="180"></el-table-column>
+        <el-table-column label="名称" prop="name" width="220"></el-table-column>
         <el-table-column label="信用代码" prop="number" width="180">
         </el-table-column>
         <el-table-column
@@ -50,8 +50,11 @@
         ></el-table-column> -->
           <el-table-column
           label="管理员"
-          prop="admin_username"
-        ></el-table-column>
+        >
+        <template #default="scope">
+          <span v-if="scope.row.admin">{{ scope.row.admin_.name }}-{{scope.row.admin_.phone}}</span>
+        </template>
+        </el-table-column>
         
         <el-table-column label="操作" fixed="right" align="left" width="200">
           <template #default="scope">
diff --git a/src/views/rpm/rpj_show.vue b/src/views/rpm/rpj_show.vue
index 2cd1ff6a..8725f1f0 100644
--- a/src/views/rpm/rpj_show.vue
+++ b/src/views/rpm/rpj_show.vue
@@ -92,7 +92,7 @@
 										type="primary"
 										size="small"
 										@click="bindCard(scope.row,10)"
-										v-auth="'visit.update'"
+										v-auth="'blt_bind.create'"
 									>绑卡
 									</el-button>
 							</template>
diff --git a/src/views/vm/visit_detial.vue b/src/views/vm/visit_detial.vue
index 68ceb4c6..f67f354d 100644
--- a/src/views/vm/visit_detial.vue
+++ b/src/views/vm/visit_detial.vue
@@ -94,7 +94,7 @@
 								type="primary"
 								size="small"
 								@click="bindCard(scope.row,10)"
-								v-auth="'visit.update'"
+								v-auth="'blt_bind.create'"
 							>绑卡
 							</el-button>
 					</template>
diff --git a/src/views/vm/visitor.vue b/src/views/vm/visitor.vue
index 4cc55ef2..def3eeae 100644
--- a/src/views/vm/visitor.vue
+++ b/src/views/vm/visitor.vue
@@ -6,7 +6,6 @@
           type="primary"
           icon="el-icon-plus"
           @click="handleForm('add')"
-          v-auth="'visit.create'"
         ></el-button>
         <!--
 				<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
@@ -44,27 +43,24 @@
             <sc-upload v-model="scope.row.photo" :disabled="true" width="70" height="80"></sc-upload>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="操作" fixed="right" align="left" width="170">
+        <el-table-column label="操作" fixed="right" align="left" width="170">
           <template #default="scope">
               <el-button
                 link
                 type="warning"
                 size="small"
-                @click="handleForm('edit', scope.row)"
-                v-auth="'visit.update'"
-                >编辑</el-button
+                @click="handleForm('edit', scope.row)">编辑</el-button
               >
               <el-popconfirm
                 title="确定删除该访客吗？"
                 @confirm="delVisitor(scope.row)"
               >
                 <template #reference>
-                  <el-button link type="danger" size="small"
-                   v-auth="'visit.delete'">删除</el-button>
+                  <el-button link type="danger" size="small">删除</el-button>
                 </template>
               </el-popconfirm>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </scTable>
     </el-main>
   </el-container>