Merge remote-tracking branch 'origin/dev' into dev-tree

src/assets/sass/renderSass/drawer.scss

@@ -0,0 +1,40 @@
+.el-drawer {
+  &.ltr,
+  &.rtl {
+    height: calc(100% - 16px);
+    margin-top: 8px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #ebeef2;
+  }
+  &.rtl {
+    right: 10px;
+  }
+  &.ltr {
+    left: 10px;
+  }
+  & .el-drawer__header {
+    padding: 27px 20px 10px 20px;
+    margin-bottom: 0px;
+    position: relative;
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 600;
+    font-size: 16px;
+    color: #000000;
+    &:after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      border-bottom: 1px solid #ddd;
+      left: 20px;
+      right: 20px;
+      transform: scaleY(0.4);
+    }
+  }
+  & .el-drawer__body {
+    padding: 20px;
+    &::-webkit-scrollbar {
+      width: 0px;
+    }
+  }
+}

src/assets/sass/renderSass/label.scss

@@ -2,11 +2,31 @@
   & .el-form-item__label {
     padding: 0;
     font-family: PingFangSC, PingFang SC;
-    font-weight: 500;
+    font-weight: 700;
     font-size: 13px;
     color: $--color-primary-label;
     //line-height: 18px;
     text-align: left;
     font-style: normal;
   }
+  & .el-form-item__content {
+    margin-left: unset !important;
+  }
 }
+
+//.top-label {
+//  & .el-form-item__label {
+//    float: none;
+//    display: inline-block;
+//    padding: 0;
+//    font-family: PingFangSC, PingFang SC;
+//    font-weight: 500;
+//    font-size: 13px;
+//    color: #70778d;
+//    text-align: left;
+//    font-style: normal;
+//  }
+//  & .el-form-item__content {
+//    margin-left: unset !important;
+//  }
+//}

src/assets/sass/renderSass/radio.scss

@@ -12,6 +12,7 @@
     }
     .el-radio__inner {
       background: #fff;
+      border-color: $--color-primary;
       &:after {
         background: $--color-primary;
         width: 7px;
@@ -21,3 +22,64 @@
     }
   }
 }
+.el-switch {
+  & .el-switch__core {
+    border-radius: 5px;
+    &:after {
+      border-radius: 4px;
+    }
+  }
+  &.is-checked {
+    & .el-switch__core {
+      background-color: $--color-primary;
+      border-color: $--color-primary;
+      border-radius: 5px;
+      &:after {
+        border-radius: 4px;
+      }
+    }
+  }
+}
+.el-radio-button__orig-radio {
+  & + .el-radio-button__inner {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 600;
+    font-size: 13px;
+    text-align: left;
+    font-style: normal;
+    background: #f8f8f8;
+    border-radius: 5px;
+    border: none;
+    box-shadow: unset;
+    &:hover {
+      color: $--color-primary;
+    }
+  }
+
+  &:checked {
+    & + .el-radio-button__inner {
+      background: #fff;
+      border-radius: 8px;
+      border: unset;
+      box-shadow: unset;
+      color: $--color-primary;
+    }
+  }
+}
+
+.el-radio-button {
+  background: #f8f8f8;
+  padding: 5px;
+  &:first-child {
+    border-radius: 8px 0 0 8px;
+    & .el-radio-button__inner {
+      border: none;
+    }
+  }
+  &:last-child {
+    border-radius: 0 8px 8px 0;
+    & .el-radio-button__inner {
+      border: none;
+    }
+  }
+}

src/assets/sass/renderUi.scss

@@ -5,6 +5,7 @@
 @import 'renderSass/table';
 @import 'renderSass/label';
 @import 'renderSass/radio';
+@import 'renderSass/drawer';
 
 html,
 body,

src/store/modules/user.js

@@ -26,7 +26,7 @@ const actions = {
   setGroupList({ commit }, data) {
     commit('SET_GROUPLIST', data)
   },
-  setToken({ commit },data){
+  setToken({ commit }, data) {
     commit('SET_TOKEN', data)
   },
   // user login

src/views/knowledge/detail/components/preprocessing.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="preprocessing-container " class="mt20">
-    <el-form label-width="170px" :model="form" ref="processForm">
+    <el-form label-width="180px" :model="form" ref="processForm">
-      <el-form-item label="数据来源：" required prop="radio">
+      <el-form-item label="数据来源：" required prop="radio" position="top" class="el-form--label-top">
         <el-radio-group v-model="form.radio" size="medium" @change="getFileType">
           <el-radio-button label="1" size="medium">使用本地文件</el-radio-button>
           <el-radio-button label="2" size="medium">使用通用知识文件模板</el-radio-button>
@@ -12,7 +12,7 @@
         </div>
       </el-form-item>
       <!-- 文件上传-->
-      <el-form-item label="" required prop="file">
+      <el-form-item label="" required prop="file" label-width="0" class="el-form--label-top">
         <div
           @click="createFiled"
           @dragover.prevent="handleDragOver"
@@ -51,10 +51,10 @@
             </el-tooltip>
             ：
           </template>
-          <el-radio-group v-model="form.beMinerU" size="medium">
+          <el-switch v-model="form.beMinerU" size="medium">
-            <el-radio :label="true" size="medium">是</el-radio>
+            <!--            <el-radio :label="true" size="medium">是</el-radio>-->
-            <el-radio :label="false" size="medium">否</el-radio>
+            <!--            <el-radio :label="false" size="medium">否</el-radio>-->
-          </el-radio-group>
+          </el-switch>
         </el-form-item>
 
         <el-form-item label="是否ocr协助处理：" v-if="form.beMinerU" required prop="beOcr">
@@ -65,10 +65,10 @@
             </el-tooltip>
             ：
           </template>
-          <el-radio-group v-model="form.beOcr" size="medium">
+          <el-switch v-model="form.beOcr" size="medium">
-            <el-radio :label="true" size="medium">是</el-radio>
+            <!--            <el-radio :label="true" size="medium">是</el-radio>-->
-            <el-radio :label="false" size="medium">否</el-radio>
+            <!--            <el-radio :label="false" size="medium">否</el-radio>-->
-          </el-radio-group>
+          </el-switch>
         </el-form-item>
       </div>
     </el-form>
@@ -230,22 +230,26 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+@import '@/assets/sass/renderSass/theme.scss';
+.inline {
+}
+
 .upload-demo {
   //dashed 间隔大一点
   border-radius: 6px;
   border-style: dashed;
-  border-width: 2px;
+  border-width: 1px;
   border-color: #d9d9d9;
   height: 330px;
   width: 50%;
   text-align: center;
 
   &:hover {
-    border-color: #409eff;
+    border-color: var(--color-primary);
   }
 
   &.drag-over {
-    border-color: #409eff;
+    border-color: var(--color-primary);
     background-color: #ecf5ff;
   }
 

src/views/knowledge/detail/create.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container create-container">
+  <div class="render-container create-container">
     <el-card shadow="hover">
       <div slot="header" class="clearfix">
         <h3>创建知识库</h3>

src/views/knowledge/index.vue

@@ -29,6 +29,12 @@
         <el-card v-for="(item, index) in datasetList" class="item datasetList" shadow="hover" :key="index" @click.native.stop="knowLedgeDetail(item)">
           <div class="dataset-header">
             <div class="folder-content">
+              <!--              <div class="folder">-->
+              <!--                &lt;!&ndash;                字符串第一个&ndash;&gt;-->
+
+              <!--                {{ item.name[0] }}-->
+              <!--              </div>-->
+
               <img :src="konwledgePng_1" alt="" class="folder" />
               <!--              <svg-icon iconClass="folder" className="folder"></svg-icon>-->
             </div>
@@ -212,8 +218,16 @@ export default {
     border-radius: 8px;
     //padding: 10px;
     & .folder {
-      width: 40px;
+      width: 50px;
-      height: 40px;
+      //background: #409eff;
+      text-align: center;
+      line-height: 50px;
+      border-radius: 8px;
+      height: 50px;
+      font-size: 18px;
+      overflow: hidden;
+      font-weight: 600;
+      color: #fff;
     }
   }
 }

src/views/rules/Index.vue

@@ -34,20 +34,17 @@ export default {
             isRedraw: true,
             render: (h, params) => {
               return h('div', [
-                h(
+                h('el-button', {
-                  'el-button',
+                  props: { type: 'text', size: 'mini', icon: 'el-icon-tickets', title: '查看详情' },
-                  {
+                  on: { click: () => this.handleInfoVisible(params.row) }
-                    props: { type: 'text', size: 'mini', icon: 'el-icon-tickets', title: '查看详情' },
+                }),
-                    on: { click: () => this.handleInfoVisible(params.row) }
-                  }
-                ),
                 h(
                   'el-button',
                   {
                     props: { type: 'text', size: 'mini', icon: 'el-icon-edit-outline', title: '修改' },
                     on: { click: () => this.handleEdit(params.row) }
                   },
-                  "修改"
+                  '修改'
                 ),
                 h(
                   'el-button',
@@ -55,7 +52,7 @@ export default {
                     props: { type: 'danger', size: 'mini', icon: 'el-icon-delete', title: '删除' },
                     on: { click: () => this.handleDelete(params.row, params.index) }
                   },
-                  "删除"
+                  '删除'
                 )
               ])
             }
@@ -107,7 +104,7 @@ export default {
   },
   watch: {
     form: {
-      handler() { },
+      handler() {},
       deep: true
     }
   },
@@ -243,8 +240,7 @@ export default {
               <el-form-item label="规则类型">
                 <el-select v-model="form.ruleType" placeholder="请选择规则类型">
                   <el-option label="全部规则" value="">全部规则</el-option>
-                  <el-option v-for="item in tableConfig.ruleType" :key="item" :label="item"
+                  <el-option v-for="item in tableConfig.ruleType" :key="item" :label="item" :value="reverseRuleType(item)" />
-                    :value="reverseRuleType(item)" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -257,8 +253,15 @@ export default {
             <!-- 创建时间 -->
             <el-col :span="6">
               <el-form-item label="创建时间">
-                <el-date-picker v-model="form.createdDate" type="daterange" unlink-panels range-separator="-"
+                <el-date-picker
-                  start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="form.pickerOptions">
+                  v-model="form.createdDate"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :picker-options="form.pickerOptions"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -277,14 +280,19 @@ export default {
 
       <!-- 下方规则列表 -->
       <div class="p20">
-        <r-table :columns="tableConfig.columns" :data="tableData" :deletion="false" :total="tableConfig.total"
+        <r-table
-          @currentChange="handleCurrentChange" @sizeChange="handleSizeChange" :currentPage="tableConfig.currentPage"
+          :columns="tableConfig.columns"
-          :pageSize="tableConfig.pageSize" />
+          :data="tableData"
+          :deletion="false"
+          :total="tableConfig.total"
+          @currentChange="handleCurrentChange"
+          @sizeChange="handleSizeChange"
+          :currentPage="tableConfig.currentPage"
+          :pageSize="tableConfig.pageSize"
+        />
       </div>
     </el-card>
-    <edit-prompt-rule ref="editPromptRule" v-if="dialogOptions.currentComponent === 'EditPromptRule'"
+    <edit-prompt-rule ref="editPromptRule" v-if="dialogOptions.currentComponent === 'EditPromptRule'" @getDataList="handleQuery" />
-      @getDataList="handleQuery" />
+    <edit-split-rule ref="editSplitRule" v-else-if="dialogOptions.currentComponent === 'EditSplitRule'" @getDataList="handleQuery" />
-    <edit-split-rule ref="editSplitRule" v-else-if="dialogOptions.currentComponent === 'EditSplitRule'"
-      @getDataList="handleQuery" />
   </div>
 </template>

src/views/system/menu/index.vue

@@ -36,14 +36,20 @@
         </el-form>
       </div>
 
-      <r-table :columns="tableConfig.columns" :data="tableData" :deletion="false" :total="tableConfig.total"
+      <r-table
-        @currentChange="handleCurrentChange" @sizeChange="handleSizeChange" :currentPage="tableConfig.currentPage"
+        :columns="tableConfig.columns"
-        :pageSize="tableConfig.pageSize" />
+        :data="tableData"
+        :deletion="false"
+        :total="tableConfig.total"
+        @currentChange="handleCurrentChange"
+        @sizeChange="handleSizeChange"
+        :currentPage="tableConfig.currentPage"
+        :pageSize="tableConfig.pageSize"
+      />
     </el-card>
 
     <!-- 菜单新增 编辑 弹窗 -->
-    <menu-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView"
+    <menu-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView" :menu-data="currentMenuData" @submit="handleSubmit" />
-      :menu-data="currentMenuData" @submit="handleSubmit" />
   </div>
 </template>
 

src/views/system/user/components/UserDialog.vue

@@ -173,7 +173,7 @@ export default {
     },
     // 处理角色选择变化
     handleRolesChange(roleIds) {
-      this.form.sysUserRoleDTOs = roleIds.map(id => ({ roleId: id }));
+      this.form.sysUserRoleDTOs = roleIds.map(id => ({ roleId: id }))
     }
   }
 }

src/views/system/user/index.vue

@@ -24,9 +24,16 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="创建时间">
-                <el-date-picker v-model="queryParams.dateRange" type="daterange" range-separator="-"
+                <el-date-picker
-                  start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" size="small"
+                  v-model="queryParams.dateRange"
-                  style="width: 100%" />
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  size="small"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -41,14 +48,20 @@
           </el-row>
         </el-form>
       </div>
-      <r-table :columns="tableConfig.columns" :data="tableData" :deletion="false" :total="tableConfig.total"
+      <r-table
-        @currentChange="handleCurrentChange" @sizeChange="handleSizeChange" :currentPage="tableConfig.currentPage"
+        :columns="tableConfig.columns"
-        :pageSize="tableConfig.pageSize" />
+        :data="tableData"
+        :deletion="false"
+        :total="tableConfig.total"
+        @currentChange="handleCurrentChange"
+        @sizeChange="handleSizeChange"
+        :currentPage="tableConfig.currentPage"
+        :pageSize="tableConfig.pageSize"
+      />
     </el-card>
 
     <!-- 用户新增弹窗 -->
-    <user-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView"
+    <user-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView" :user-data="currentUserData" @submit="handleSubmit" />
-      :user-data="currentUserData" @submit="handleSubmit" />
 
     <!-- 重置密码弹窗 -->
     <reset-password-dialog :visible.sync="resetPasswordVisible" :user-id="currentUserId" @success="getUserList" />
@@ -122,7 +135,7 @@ export default {
                   'el-button',
                   {
                     props: { type: 'text', size: 'mini' },
-                    class: "normal-button",
+                    class: 'normal-button',
                     on: { click: () => this.handleEdit(params.row) }
                   },
                   '编辑'
@@ -151,7 +164,7 @@ export default {
                   'el-button',
                   {
                     props: { type: 'text', size: 'mini', style: 'color: #409EFF' },
-                    class: "normal-button",
+                    class: 'normal-button',
                     on: { click: () => this.handleResetPassword(params.row) }
                   },
                   '重置密码'