Merge branch 'master' of http://192.168.1.222:3000/jiayi/base-callcenter-web

src/components/main/TagsView/index.vue

@@ -20,20 +20,20 @@
     </scroll-pane>
     <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">
-        <refresh-right style="width: 1em; height: 1em" /> 刷新页面
+        <refresh-right style="width: 1em; height: 1em ; vertical-align: middle" /> 刷新页面
       </li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
-        <close style="width: 1em; height: 1em" /> 关闭当前
+        <close style="width: 1em; height: 1em; vertical-align: middle" /> 关闭当前
       </li>
       <li @click="closeOthersTags"> <circle-close style="width: 1em; height: 1em" /> 关闭其他 </li>
       <li v-if="!isFirstView()" @click="closeLeftTags">
-        <back style="width: 1em; height: 1em" /> 关闭左侧
+        <back style="width: 1em; height: 1em; vertical-align: middle" /> 关闭左侧
       </li>
       <li v-if="!isLastView()" @click="closeRightTags">
-        <right style="width: 1em; height: 1em" /> 关闭右侧
+        <right style="width: 1em; height: 1em; vertical-align: middle" /> 关闭右侧
       </li>
       <li @click="closeAllTags(selectedTag)">
-        <circle-close style="width: 1em; height: 1em" /> 全部关闭
+        <circle-close style="width: 1em; height: 1em; vertical-align: middle" /> 全部关闭
       </li>
     </ul>
   </div>
@@ -142,9 +142,9 @@
   }
   function addTags() {
     const { name } = route;
-    if (route.path.indexOf('/inComming/callScreen') !== -1) {
-      return
-    }
+    // if (route.path.indexOf('/inComming') !== -1) {
+    //   return
+    // }
     if (name) {
       console.log(route)
       useTagsViewStore().addView(route);
@@ -310,12 +310,12 @@
       font-weight: 400;
       color: #333;
       box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
-
+      
       li {
         margin: 0;
         padding: 7px 16px;
         cursor: pointer;
-
+        display: flex;
         &:hover {
           background: #eee;
         }

src/components/main/drawer-phone/index.vue

@@ -341,8 +341,9 @@ const initWs = () => {
                         currentCall.value.truePhone = hidePhone(telWSData.Number)
                         getUserInfo(currentCall.value.phone)
                         router.push({
-                            path: '/inComming/callScreen/' + telWSData.Number,
+                            path: '/inComming/callScreen/'+telWSData.Number,
                             query: {
+                                callNumber:telWSData.Number,
                                 callid: telWSData.CallID,
                             }
                         });

src/router/index.js

@@ -206,7 +206,6 @@ export const constantRoutes = [
         path: 'callScreen/:callNumber(\\d+)',
         component: () => import('@/views/main/phone/index'),
         name: 'CallScreen',
-        // meta: { title: ':callNumber(\\d+)' }
       }
     ]
   },

src/store/modules/tagsView.js

@@ -12,6 +12,7 @@ const useTagsViewStore = defineStore('tags-view', {
     },
     addIframeView(view) {
       if (this.iframeViews.some((v) => v.path === view.path)) return
+      console.log(view)
       this.iframeViews.push(
         Object.assign({}, view, {
           title: view.meta.title || 'no-name'
@@ -19,13 +20,15 @@ const useTagsViewStore = defineStore('tags-view', {
       )
     },
     addVisitedView(view) {
-      console.log(view.meta.title)
-      if (this.visitedViews.some((v) => v.path === view.path)) return
-      this.visitedViews.push(
-        Object.assign({}, view, {
-          title: view.meta.title || 'no-name'
-        })
-      )
+     
+      setTimeout(()=>{
+        if (this.visitedViews.some((v) => v.path === view.path)) return
+        this.visitedViews.push(
+          Object.assign({}, view, {
+            title: view.meta.title || 'no-name',
+          })
+        )
+      })
     },
     addCachedView(view) {
       if (this.cachedViews.includes(view.name)) return

src/views/main/knowledgeBase/knowledgeList/cpns/detail/detail.vue

@@ -96,7 +96,13 @@
   import { fetchExportBill } from '@/utils';
   import { getPageDetail } from '@/api/main/system/system';
   import { watch } from 'vue';
-
+  const props = defineProps({
+    docId: {
+      type: Number,
+      default: 0,
+    },
+    
+  });
   const docId = ref('');
   const defaultInfo = ref({});
   const fileInfo = ref({});
@@ -109,6 +115,10 @@
     docId.value = newValue;
     getKnowledgeDetail(newValue);
   });
+  watch(props, (newValue) => {
+    docId.value = props.docId;
+    getKnowledgeDetail(newValue);
+  });
   onMounted(() => {
     docId.value = useRouter().currentRoute.value.query.docId;
   });

src/views/main/knowledgeBase/knowledgeList/cpns/konwlegelist/konwlegelist.vue

@@ -185,14 +185,25 @@
         </div>
       </div>
     </div>
+    <!-- <el-drawer
+      v-model="detailDrawer"
+      title="知识库详情"
+      :direction="direction"
+      :before-close="handleCloseDrawer"
+    >
+      11111
+      <knowledge-detail :docId="drawerDocId"/>
+    </el-drawer> -->
   </div>
   
 </template>
-<script setup>
+<script setup name="KnowledgeList">
   import { onMounted, ref } from 'vue';
   import { ElMessageBox } from 'element-plus';
   import { Search, Document, Tickets } from '@element-plus/icons-vue';
   import { useRouter } from 'vue-router';
+  import knowledgDetail from "@/views/main/knowledgeBase/knowledgeList/cpns/detail/detail.vue";
+
   import {
     getPageListData,
     getPageHandle,
@@ -216,6 +227,10 @@
       type: Number,
       default: 0,
     },
+    isSreen:{
+      type: Number,
+      default: 0,
+    }
   });
   const inputValue = ref('');
   const dynamicTags = ref([]);
@@ -385,7 +400,19 @@
       },
     });
   }
+  const detailDrawer = ref(false)
+  const detailDirection = ref('rtl')
+  const drawerDocId =ref()
+  function handleCloseDrawer(e) {
+    detailDrawer.value =false
+  }
   function trunDetail(item) {
+    // if (props.isSreen) {
+    //   detailDrawer.value = true
+    //   drawerDocId.value = Number(item.docId)
+    //   console.log(item)
+    //   console.log(props)
+    // } else 
     if (outerFlag.value) {
       router.push({
         path: '/knowledge/detail',

src/views/main/phone/index.vue

@@ -252,7 +252,7 @@
                             </div>
                         </template>
                         <div class="space-y-4">
-                            <knowledge-list :toExamine="2"></knowledge-list>
+                            <knowledge-list :toExamine="2" :isSreen="1"></knowledge-list>
                             <!-- <el-input v-model="searchQuery" placeholder="搜索解决方案..." :prefix-icon="Search" />
                             <div class="space-y-2">
                                 <div v-for="(item, index) in knowledgeBase" :key="index"
@@ -324,7 +324,7 @@
 
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="CallScreen">
 import { ref, computed, onMounted, onUnmounted } from 'vue';
 import moment from 'moment';
 import {
@@ -362,8 +362,9 @@ let { proxy } = getCurrentInstance()
 const showCallPanel = ref(false);
 const searchQuery = ref('');
 console.log('proxy', proxy.$route);
+// console.log(proxy.$route.query.callNumber)
 const telNumber = ref(proxy.$route.query.phone || proxy.$route.query.callNumber || proxy.$route.params.callNumber);
-
+console.log(telNumber.value)
 proxy.$route.meta.title = telNumber.value || '来电弹屏';
 const callid = ref(proxy.$route.query.callid || 0);
 onMounted(() => {
@@ -635,7 +636,7 @@ const submit = async () => {
                 if (data.state === 'success') {
                     ElMessage.success('提交成功');
                     resetForm()
-                    router.push({ path: '/' })
+                    close()
                 } else {
                     ElMessage.error(data.message || '提交失败');
                 }
@@ -648,7 +649,11 @@ const submit = async () => {
         
     });
 }
-
+/** 关闭按钮 */
+function close() {
+  const obj = { path: '/' }
+  proxy.$tab.closeOpenPage(obj)
+}
 const orderSearchQuery = ref()
 const createtime = ref()
 const endtime = ref()