Merge branch 'cpq-dev' of wangfan/adweb3-web into master

src/layouts/default/header/components/notify/index.vue

@@ -144,16 +144,17 @@
 
         if (data.cmd === 'enquiry') {
           notification.info({
-            message: `询盘通知`,
+            message: `${data.msgTitle}`,
             icon: () => h(SmileOutlined, { style: 'color: #108ee9' }),
             description: `${data.msgTxt}`,
             duration: 0,
           });
         }
 
-        if (data.cmd === 'create_site') {
+        console.log(data, 'websocket MSG');
+        if (data.cmd === 'manage_site') {
           notification.info({
-            message: `站点创建完成通知`,
+            message: `${data.msgTitle}`,
             icon: () => h(SmileOutlined, { style: 'color: #108ee9' }),
             description: `${data.msgTxt}`,
             duration: 0,

src/views/adweb/site/AdwebSiteList.vue

@@ -67,21 +67,21 @@
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-        <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined" />
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button
-            >批量操作
-            <Icon icon="mdi:chevron-down" />
-          </a-button>
-        </a-dropdown>
+        <!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
+        <!--        <a-dropdown v-if="selectedRowKeys.length > 0">-->
+        <!--          <template #overlay>-->
+        <!--            <a-menu>-->
+        <!--              <a-menu-item key="1" @click="batchHandleDelete">-->
+        <!--                <Icon icon="ant-design:delete-outlined" />-->
+        <!--                删除-->
+        <!--              </a-menu-item>-->
+        <!--            </a-menu>-->
+        <!--          </template>-->
+        <!--          <a-button-->
+        <!--            >批量操作-->
+        <!--            <Icon icon="mdi:chevron-down" />-->
+        <!--          </a-button>-->
+        <!--        </a-dropdown>-->
         <!-- 高级查询 -->
         <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
@@ -369,7 +369,7 @@
       dropDown.push({
         label: '资源删除',
         popConfirm: {
-          title: '该站点将从系统中删除，站点资源将会保留10天，是否确认删除',
+          title: '该站点将从系统中删除，站点资源将会保留15天，是否确认删除',
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },