修改bug

src/components/Drawer/src/BasicDrawer.vue

@@ -88,7 +88,7 @@
             opt.getContainer = `.${prefixVar}-layout-content` as any;
           }
         }
-        console.log('getProps:opt',opt);
+        // console.log('getProps:opt',opt);
         return opt as DrawerProps;
       });
 

src/components/Modal/src/components/ModalWrapper.vue

@@ -161,7 +161,7 @@
       }
 
       async function setModalHeight(option?) {
-        console.log("---------性能监控--------setModalHeight----------")
+        // console.log("---------性能监控--------setModalHeight----------")
         const options = option || {};
         const source = options.source;
         const callBack = options.callBack;

src/components/registerGlobComp.ts

@@ -131,5 +131,4 @@ export function registerGlobComp(app: App) {
     .use(Cascader)
     .use(Rate)
     .use(Progress);
-    console.log("---初始化---， 全局注册Antd、仪表盘、流程设计器、online、流程等组件--------------")
 }

src/hooks/web/useWebSocket.ts

@@ -28,10 +28,10 @@ export function connectWebSocket(url: string) {
     protocols: [token],
     // update-begin--author:liaozhiyang---date:20240726---for：[issues/6662] 演示系统socket总断，换一个写法
     onConnected: function (ws) {
-      console.log('[WebSocket] 连接成功', ws);
+      // console.log('[WebSocket] 连接成功', ws);
     },
     onDisconnected: function (ws, event) {
-      console.log('[WebSocket] 连接断开：', ws, event);
+      // console.log('[WebSocket] 连接断开：', ws, event);
     },
     onError: function (ws, event) {
       console.log('[WebSocket] 连接发生错误: ', ws, event);

src/layouts/default/header/components/user-dropdown/index.vue

@@ -150,6 +150,11 @@
         await getRefPromise(updatePasswordRef);
         updatePasswordRef.value.show(userStore.getUserInfo.username);
       }
+      console.log('userStore.getUserInfo',userStore.getUserInfo);
+      var loginInfo = userStore.getUserInfo;
+      if(loginInfo.passwordType == '0'){
+        updatePassword();
+      }
       // update-end--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
       function handleMenuClick(e: { key: MenuEvent }) {
         switch (e.key) {

src/router/guard/permissionGuard.ts

@@ -59,7 +59,7 @@ export function createPermissionGuard(router: Router) {
     const token = userStore.getToken;
 
     // Whitelist can be directly entered
-      console.log('whitePathList2222--->',whitePathList);
+      // console.log('whitePathList2222--->',whitePathList);
     if (whitePathList.includes(to.path as PageEnum)) {
       if (to.path === LOGIN_PATH && token) {
         const isSessionTimeout = userStore.getSessionTimeout;

src/views/admin/employeesapply/EmployeesApplyList.vue

@@ -188,12 +188,12 @@ function getTableAction(record) {
     {
       label: '员工入驻审核',
       onClick: handleEdit.bind(null, record),
-      ifShow: record.status == 1 && (record.modifyStatus == null || record.modifyStatus == undefined) && record.izHistory == 'N'
+      ifShow: record.status == '1' && (record.modifyStatus == null || record.modifyStatus == undefined  || record.modifyStatus == '') && record.izHistory == 'N'
     },
     {
       label: '信息变更审核',
       onClick: handleUpEdit.bind(null, record),
-      ifShow: record.status == 1 && record.modifyStatus == 1 && record.izHistory == 'N'
+      ifShow: record.status == '1' && record.modifyStatus == '1' && record.izHistory == 'N'
     },
     {
       label: '审核历史',

src/views/services/serviceTag/components/ConfigServiceDirectiveList.vue

@@ -46,7 +46,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        <TableAction :actions="getTableAction(record)"  />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -113,6 +113,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     useSearchForm: false,
     showIndexColumn: true,
     showTableSetting: false,
+    immediate: false,
     actionColumn: {
       width: 90,
       fixed: 'center',
@@ -164,9 +165,30 @@ function handleSuccess() {
  */
 function handleSelect(directive_) {
   // createMessage.success('选择成功！');
-  emit('addDirective', directive_)
+  // emit('addDirective', directive_)
+
+
+  let res_ = props.directiveList.filter(item => item.id == directive_.id)
+  if (res_.length > 0) {
+    createMessage.warning('服务指令已选择');
+  } else {
+    createMessage.success('选择成功');
+    props.directiveList.push(directive_)
+    let notId = "";
+    props.directiveList.forEach(item => {
+      notId += item.id + ','
+    })
+    // if(notId){
+    //   notId = notId.substring(0, notId.length - 1);
+    // }
+    queryParam.notId = notId;
+    // queryParam.notId = 'ni '+"1"
+    reload();
   }
 
+}
+
+
 /**
  * 操作栏
  */
@@ -179,14 +201,7 @@ function getTableAction(record) {
   ];
 }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
 
-  ]
-}
 
 /**
  * 查询
@@ -249,7 +264,21 @@ function handleTags(prefix, tagList, suffix) {
   }
 }
 
+function init() {
+  console.log('init')
+  let notId = "";
+  props.directiveList.forEach(item => {
+    notId += item.id + ','
+  })
+  // if(notId){
+  //   notId = notId.substring(0, notId.length - 1);
+  // }
+  queryParam.notId = notId;
+  reload();
+}
+
 defineExpose({
+  init
 });
 </script>
 

src/views/services/serviceTag/components/ServiceTagModal.vue

@@ -199,6 +199,9 @@ function handleCancel() {
  */
 const handleAddDirectives = () => {
   directiveEditDrawer.value = true;
+  nextTick(() => {
+    configServiceDirectiveListRef.value.init()
+  });
 };
 
 /**