新增组件及页面

dgtis-ui/package.json

@@ -47,18 +47,20 @@
     "echarts": "4.2.1",
     "element-ui": "2.13.2",
     "file-saver": "2.0.1",
-    "js-beautify": "1.10.2",
     "fuse.js": "3.4.4",
+    "html2canvas": "^1.0.0-rc.7",
+    "jquery": "^3.5.1",
+    "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "quill": "1.3.7",
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",
     "vue": "2.6.10",
     "vue-count-to": "1.0.13",
-    "quill": "1.3.7",
     "vue-cropper": "0.4.9",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",

dgtis-ui/src/layout/components/Navbar.vue

@@ -8,13 +8,13 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
+<!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
+<!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
@@ -94,7 +94,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          // location.href = '/index';
+          this.$router.push({ path:'/login'  })
         })
       })
     }

dgtis-ui/src/router/index.js

@@ -122,6 +122,7 @@ export const constantRoutes = [
 
 export default new Router({
   mode: 'history', // 去掉url中的#
+  base: '/shanghaiecif/',
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })

dgtis-ui/src/views/system/role/index.vue

@@ -134,13 +134,13 @@
               @click="handleDataScope(scope.row)"
               v-hasPermi="['system:role:edit']"
             >数据权限</el-button>
-            <el-button
-              size="mini"
-              type="warning"
-              icon="el-icon-s-custom"
-              @click="handleDataScope(scope.row)"
-              v-hasPermi="['system:role:edit']"
-            >分配用户</el-button>
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="warning"-->
+<!--              icon="el-icon-s-custom"-->
+<!--              @click="handleDataScope(scope.row)"-->
+<!--              v-hasPermi="['system:role:edit']"-->
+<!--            >分配用户</el-button>-->
             <el-button
               size="mini"
               type="danger"

dgtis-ui/src/views/system/user/index.vue

@@ -722,7 +722,7 @@ export default {
 <style>
   .deptCol.el-col-0 {
     display: inline-block;
-    padding: 0;
+    padding: 0 !important;
   }
   .el-col-0 .bgWhite{
     padding: 0;

dgtis-ui/vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/shanghaiecif/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）