From 584587a9d9932762aad2d27027be348c810926d0 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 06 一月 2022 10:09:34 +0800
Subject: [PATCH] 冲突解决

---
 src/pages/library/components/carList.vue       |   96 +++++++++++++++++++++--
 src/pages/library/index/App.vue                |    4 
 src/pages/desktop/index/components/Desktop.vue |   24 ++++-
 src/pages/desktop/index/App.vue                |   11 +-
 src/pages/desktop/index/components/Tools.vue   |    2 
 src/pages/library/components/addBase.vue       |    4 
 src/pages/library/components/personList.vue    |   78 ++++++++++++-------
 7 files changed, 163 insertions(+), 56 deletions(-)

diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index a3b84ef..4b2728b 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="app" @contextmenu.prevent>
-    <tools @jumpToDock="onJumpToDock"></tools>
-    <desktop ref="desktop"></desktop>
+    <tools ref="tools" @jumpToDock="onJumpToDock"></tools>
+    <desktop @quit="quit" ref="desktop"></desktop>
     <tools-entry @changeBackground="onChangeBg" ref="dock_model"></tools-entry>
     <notice-tip ref="notice_tip_model"></notice-tip>
     <notification-center></notification-center>
@@ -103,8 +103,11 @@
     });
   },
   methods: {
-    onJumpToDock(name) {
-      this.$refs.dock_model.onJumpToDock(name);
+    quit(){
+      this.$refs.tools.toLogout()
+    },
+    onJumpToDock(name){
+      this.$refs.dock_model.onJumpToDock(name)
     },
     onChangeBg(v) {
       document.getElementById("app").style.backgroundImage = "url(" + v + ")";
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index 5e42597..e9e9615 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -11,8 +11,11 @@
     ></safari>
 
     <div class="warn-tag" v-if="showFreeVersion">
-      <span class="text"
+      <span v-if="!snExpire" class="text"
         >璇曠敤鐗堝皻鏈縺娲伙紝浠呮敮鎸侀儴鍒嗗姛鑳戒娇鐢紝濡傞渶浣跨敤鍏ㄩ儴鍔熻兘锛岃灏藉揩婵�娲荤郴缁熴��</span
+      >
+      <span v-else class="text"
+        >SmartAIOS 璇曠敤鏈熷凡鍒版湡锛岃鎮ㄥ敖蹇縺娲荤郴缁�</span
       >
       <span class="go-to" @click="gotoActive">鍓嶅線婵�娲�</span>
       <span class="icon iconfont" @click="showFreeVersion = false"
@@ -22,7 +25,7 @@
 
     <el-dialog
       title="婵�娲籗martAI"
-      :visible.sync="dialogVisible"
+      :visible.sync="activeDialog"
       width="750px"
       :show-close="false"
       :close-on-click-modal="false"
@@ -70,7 +73,8 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">缁х画璇曠敤</el-button>
+        <el-button v-if="!snExpire" @click="activeDialog = false">缁х画璇曠敤</el-button>
+        <el-button v-else @click="quit">閫�鍑虹櫥褰�</el-button>
         <el-button type="primary" @click="activateVersion">婵�娲�</el-button>
       </span>
     </el-dialog>
@@ -95,19 +99,24 @@
   data() {
     return {
       showFreeVersion: false,
-      dialogVisible: false,
+      activeDialog: false,
       version: "SmartAI璇曠敤鐗�",
       versionState: "灏氭湭婵�娲�",
       secrectKey: "",
+      snExpire: false
     };
   },
   mounted() {
     this.validateSn();
   },
   methods: {
+    quit(){
+      this.$emit("quit")
+    },
     validateSn() {
       getSN().then((res) => {
-        this.showFreeVersion = res.data.sn == "";
+        this.snExpire = res.data.expire;
+        this.showFreeVersion = res.data.sn == "" || res.data.expire;
       });
     },
     activateVersion() {
@@ -117,11 +126,12 @@
       }
       activateVersion({ code: this.secrectKey.trim() })
         .then((res) => {
+          debugger
           if (res.code == 200) {
             this.$notify.success("婵�娲绘垚鍔�");
             this.validateSn();
             this.goToSysInfo();
-            this.dialogVisible = false;
+            this.activeDialog = false;
           } else {
             this.$notify.error(res.msg);
           }
@@ -134,7 +144,7 @@
       window.parent.postMessage({ msg: `toVindicate?menu=绯荤粺淇℃伅` }, "*");
     },
     gotoActive() {
-      this.dialogVisible = true;
+      this.activeDialog = true;
     },
     uploadKey(params) {
       debugger;
diff --git a/src/pages/desktop/index/components/Tools.vue b/src/pages/desktop/index/components/Tools.vue
index 04fc852..6ef8db8 100644
--- a/src/pages/desktop/index/components/Tools.vue
+++ b/src/pages/desktop/index/components/Tools.vue
@@ -350,8 +350,6 @@
     });
     this.askSysUpdate();
     this.askAppUpdate();
-
-    
   },
   methods: {
     askAppUpdate() {
diff --git a/src/pages/library/components/addBase.vue b/src/pages/library/components/addBase.vue
index 540adb7..66011eb 100644
--- a/src/pages/library/components/addBase.vue
+++ b/src/pages/library/components/addBase.vue
@@ -601,12 +601,12 @@
     }
     .el-form-item__error {
       color: #fe6d68;
-      padding-top: 3px;
+      padding-top: 5px; 
       left: 15px;
     }
     .start-time-pick {
       .el-form-item__error {
-        top: 36px;
+        top: 34px;
         left: 105px;
       }
     }
diff --git a/src/pages/library/components/carList.vue b/src/pages/library/components/carList.vue
index bf58b6c..2696cc7 100644
--- a/src/pages/library/components/carList.vue
+++ b/src/pages/library/components/carList.vue
@@ -12,7 +12,8 @@
             >{{ this.baseObject.bwType === "1" ? "榛戝悕鍗�" : "鐧藉悕鍗�" }}</span
           >
           <span class="ok-time"
-            >鏈夋晥鏃堕棿锛歿{ this.baseObject.startTime }} -- {{
+            >鏈夋晥鏃堕棿锛歿{ this.baseObject.startTime }} --
+            {{
               this.baseObject.endTime ? this.baseObject.endTime : "姘镐箙鏈夋晥"
             }}</span
           >
@@ -112,11 +113,13 @@
 
       <el-table
         id="multipleTable"
+        class="tableBox"
         ref="multipleTable"
         :data="BaseManageData.personList"
         tooltip-effect="dark"
         style="width: 100%; overflow: auto"
         :fit="true"
+        border
         :default-sort="{ prop: 'createTime', order: 'descending' }"
         @selection-change="handleSelectionChange"
         :header-cell-style="{
@@ -234,19 +237,24 @@
                 popper-class="atooltip"
               >
                 <span
-                  class="iconfont iconbianji iconStyle1"
-                  style="font-size: 15px"
+                  class="iconfont iconbianjixinxi-09"
+                  style="    font-size: 24px;cursor: pointer"
                   @click="handleClick(scope.row)"
                 ></span>
               </el-tooltip>
             </fTemplate>
-            <el-tooltip
-              content="鏌ユ壘姝や汉"
+            <el-popover
+              placement="top"
+              trigger="click"
+              popper-class="popper-caozuo1"
+            >
+              <el-tooltip
+              content="鏌ユ壘姝よ溅"
               placement="top"
               popper-class="atooltip"
             >
               <span
-                class="iconfont iconsousuoren iconStyle1"
+                class="iconfont iconchazhaociren-09"
                 @click="tosearch(scope.row)"
               ></span>
             </el-tooltip>
@@ -257,7 +265,7 @@
                 popper-class="atooltip"
               >
                 <span
-                  class="iconfont iconfuzhi iconStyle1"
+                  class="iconfont iconfuzhi-09"
                   title="澶嶅埗"
                   @click="copyClick(scope.row)"
                 ></span>
@@ -270,8 +278,7 @@
                 popper-class="atooltip"
               >
                 <span
-                  class="iconfont iconyidongzhi iconStyle1"
-                  style="font-size: 15px"
+                  class="iconfont iconyidong-09"
                   title="绉诲姩"
                   @click="moveClick(scope.row)"
                 ></span>
@@ -284,13 +291,20 @@
                 popper-class="atooltip"
               >
                 <span
-                  class="iconfont iconshanchu iconStyle1"
+                  class="iconfont iconshanchu-09"
                   style="color: #e74c3c"
                   @click="deleteThis(scope.row.id)"
                   title="鍒犻櫎"
                 ></span>
               </el-tooltip>
             </fTemplate>
+             <span
+                slot="reference"
+                class="iconfont icongengduocaozuo-09"
+                style="font-size: 24px; cursor: pointer"
+              ></span>
+            </el-popover>
+            
           </template>
         </el-table-column>
       </el-table>
@@ -1625,6 +1639,36 @@
   border-bottom: none;
   height: calc(100% - 100px);
   overflow: auto;
+  .tableBox {
+    border: none;
+    &::before,
+    &::after {
+      display: none;
+    }
+    .el-table--border .el-table__cell,
+    .el-table__body-wrapper
+      .el-table--border.is-scrolling-left
+      ~ .el-table__fixed {
+      border-right: none;
+    }
+    td {
+      border: none;
+    }
+  }
+  .head-search {
+    .desc {
+      min-width: fit-content;
+      margin-right: 20px;
+    }
+    .right-group {
+      .iconshangchuanchepai-09:hover,
+      .icontianjiacheliang-09:hover {
+        border: 1px solid var(--colorCard);
+        background: var(--colorCard);
+        color: #fff;
+      }
+    }
+  }
 }
 .el-dialog__header {
   padding: 20px 0 10px;
@@ -1690,4 +1734,36 @@
   min-height: 100px;
   border: 1px solid #eee;
 }
+.el-popover.el-popper.popper-caozuo1 {
+  box-shadow: 0px 0px 10px rgb(0 0 0 / 12%);
+  border-radius: 8px;
+  padding: 0;
+  padding-right: 1px;
+  & > span {
+    width: 32px;
+    height: 32px;
+    cursor: pointer;
+    display: inline-block;
+    text-align: center;
+    line-height: 32px;
+    border-radius: 8px;
+    font-size: 24px;
+    .iconfont {
+      font-size: 24px;
+    }
+    .iconshanchu-09 {
+      color: #fe6d68;
+    }
+  }
+  & > span:hover {
+    background: var(--colorCard);
+    color: #fff;
+  }
+  & > .del-wrap:hover {
+    background: #fe6d68;
+    .iconshanchu-09 {
+      color: #fff;
+    }
+  }
+}
 </style>
diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index b47e9ca..bd0c414 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -108,6 +108,7 @@
       <el-table
         id="multipleTable"
         ref="multipleTable"
+        class="tableBox"
         :data="BaseManageData.personList"
         tooltip-effect="dark"
         style="width: 100%; overflow: auto"
@@ -117,6 +118,7 @@
         @row-click="pickRow"
         :default-sort="{ prop: 'createTime', order: 'descending' }"
         @selection-change="handleSelectionChange"
+        border
         :header-cell-style="{
           background: '#fff',
           color: '#222222',
@@ -582,7 +584,6 @@
                 size="small"
                 v-model="form.fromServerId"
                 disabled
-                placeholder="璇疯緭鍏�"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -597,7 +598,6 @@
                 size="small"
                 v-model="form.createTime"
                 disabled
-                placeholder="璇疯緭鍏�"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -1040,7 +1040,7 @@
           this.$notify({
             type: "warning",
             message: "璇烽�夋嫨瑕佸垹闄ょ殑浜哄憳",
-            duration:1000000,
+            duration: 1000000,
           });
           return;
         }
@@ -1580,25 +1580,25 @@
     }
     .el-dialog__body {
       padding-top: 0;
-       .el-table::before {
-    visibility: hidden;
-  }
-  .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-    background-color: var(--colorCard);
-    border-color: var(--colorCard);
-  }
-  .el-checkbox__input.is-checked .el-checkbox__inner {
-    background-color: var(--colorCard);
-    border-color: var(--colorCard);
-  }
-  .el-table th.el-table__cell > .cell {
-    background: #f7f8fa;
-    height: 38px;
-    line-height: 38px;
-  }
-  .el-table__body tr.hover-row > td.el-table__cell {
-    background-color: #ffffff !important;
-  }
+      .el-table::before {
+        visibility: hidden;
+      }
+      .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+        background-color: var(--colorCard);
+        border-color: var(--colorCard);
+      }
+      .el-checkbox__input.is-checked .el-checkbox__inner {
+        background-color: var(--colorCard);
+        border-color: var(--colorCard);
+      }
+      .el-table th.el-table__cell > .cell {
+        background: #f7f8fa;
+        height: 38px;
+        line-height: 38px;
+      }
+      .el-table__body tr.hover-row > td.el-table__cell {
+        background-color: #ffffff !important;
+      }
     }
     .el-dialog__header {
       box-shadow: 0px 2px 4px rgb(0 0 0 / 8%);
@@ -1745,12 +1745,12 @@
         border-color: var(--colorCard);
         background: var(--colorCard);
       }
-.el-form-item__label {
-    line-height: 32px;
-}
-.el-form-item__content {
-    line-height: 32px;
-}
+      .el-form-item__label {
+        line-height: 32px;
+      }
+      .el-form-item__content {
+        line-height: 32px;
+      }
       .el-input--small {
         font-size: 14px;
         .el-input__inner {
@@ -1764,7 +1764,7 @@
       }
       .el-form-item__error {
         color: #fe6d68;
-        padding-top: 0px;
+        padding-top: 2px;
         left: 15px;
       }
       .el-form-item.is-required:not(.is-no-asterisk)
@@ -1812,6 +1812,22 @@
   padding: 10px;
   margin-top: 8px;
   box-shadow: 0px 0px 6px 1px rgb(143 159 191 / 15%);
+  .tableBox {
+    border: none;
+    &::before,
+    &::after {
+      display: none;
+    }
+    .el-table--border .el-table__cell,
+    .el-table__body-wrapper
+      .el-table--border.is-scrolling-left
+      ~ .el-table__fixed {
+      border-right: none;
+    }
+    td {
+      border: none;
+    }
+  }
   .cell-classname {
     background-color: #ffffff;
   }
@@ -1823,6 +1839,10 @@
     margin: 15px 10px 20px 10px;
     justify-content: space-between;
     align-items: center;
+    .desc {
+      min-width: fit-content;
+      margin-right: 20px;
+    }
     .right-group {
       display: flex;
       .el-input--small {
diff --git a/src/pages/library/index/App.vue b/src/pages/library/index/App.vue
index 96ac9b0..2622da2 100644
--- a/src/pages/library/index/App.vue
+++ b/src/pages/library/index/App.vue
@@ -181,12 +181,12 @@
   height: 100%;
   .el-table {
     .cell:empty::before {
-      content: "-";
+      content: "--";
       color: #ccc;
     }
     .is-leaf {
       .cell:empty::before {
-        content: "-";
+        content: "--";
         color: #ccc;
       }
     }

--
Gitblit v1.8.0