edit

mizhexiaoxiao · mizhexiaoxiao · commit 09f0f396014a · 2021-02-10T22:03:34.000+08:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <h1 align="center">WebsiteGuide</h1>
 
-<div align="center">WebsiteGuide网址导航系统基于Vue+djangorestframework开发，可用于企业内部系统导航，具有网址导航搜索、后台管理、系统管理等功能，后续考虑增加rbac和其他功能，欢迎使用和交流~</div>
+<div align="center">WebsiteGuide网址导航系统主要用于企业记录和管理内部系统地址，具有网址增删改查、icon图标替换等功能，后续考虑增加rbac和其他功能，欢迎使用和交流~</div>
 
 
 
@@ -9,18 +9,24 @@
 - Python 3.6+
 - Django 2.2.13
 - Djangorestframework 3.12.2
-- Node 13.14
-- Vue2.0
+- Node 12.20.1+
+- Vue 2.0
 
-![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/1.jpg)
+### 网址导航
 
-![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/2.jpg)
+![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/5.jpg)
 
-![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/3.jpg)
+### 支持批量添加
 
-![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/4.jpg)
+![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/6.jpg)
 
-![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/5.jpg)
+### 网址管理
+
+![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/7.jpg)
+
+### 用户管理
+
+![image](https://github.com/mizhexiaoxiao/WebsiteGuide/blob/main/websiteapp/media/sample-picture/8.jpg)
 
 ### 演示地址
 
diff --git a/websiteapp/media/sample-picture/5.jpg b/websiteapp/media/sample-picture/5.jpg
diff --git a/websiteapp/media/sample-picture/7.jpg b/websiteapp/media/sample-picture/7.jpg
diff --git a/websiteapp/media/sample-picture/8.jpg b/websiteapp/media/sample-picture/8.jpg
diff --git a/websiteapp/tools/Docker/Dockerfile b/websiteapp/tools/Docker/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache --virtual .build-deps  openssl-dev gcc musl-dev python3-d
     && mkdir /etc/supervisor.d
 
 RUN git clone https://github.com/mizhexiaoxiao/WebsiteGuide.git --depth=1 /WebsiteGuide && cd /WebsiteGuide && git pull
-#RUN cd /WebsiteGuide/websitefronted && npm i --registry=https://registry.npm.taobao.org && npm run build
+
 RUN cd /WebsiteGuide/websitefronted && npm install -g cnpm --registry=https://registry.npm.taobao.org && cnpm install &&  npm run build
 
 RUN pip config set global.index-url https://pypi.mirrors.ustc.edu.cn/simple/  && pip install --upgrade pip && pip install --no-cache-dir -r /WebsiteGuide/requirements.txt \
diff --git a/websitefronted/src/components/Admin/Group/index.vue b/websitefronted/src/components/Admin/Group/index.vue
@@ -109,7 +109,7 @@
                     title: `确定删除 ${row.name} ?`,
                     content: '<p>此分组下的数据都将被删除</p>',
                     onOk: () => {
-                        axios.delete(`/api/group/${row.id}/`).then(resp => {
+                        axios.delete(`api/group/${row.id}/`).then(resp => {
                             this.$Message.success('删除成功')
                             this.init()
                         }).catch(error => {
diff --git a/websitefronted/src/components/Admin/Group/module/addgroupform.vue b/websitefronted/src/components/Admin/Group/module/addgroupform.vue
@@ -37,7 +37,7 @@
             handleSubmit(name) {
                 this.$refs[name].validate((valid) => {
                     if (valid) {
-                        axios.post('/api/group/',this.form1).then(resp=>{
+                        axios.post('api/group/',this.form1).then(resp=>{
                             this.$Message.success('添加成功');
                             this.handleCancel(name)
                             console.log(this.$parent)
@@ -46,11 +46,6 @@
                             this.$Message.err('添加失败'+error)
                             console.log(error)
                         })
-                        // axios.get('/api/group/').then(resp=>{
-                        //     console.log(resp)
-                        // })
-                        console.log("这里提交axios数据.then")
-
                     }
                 })
             },
diff --git a/websitefronted/src/components/Admin/Group/module/addwebsiteform.vue b/websitefronted/src/components/Admin/Group/module/addwebsiteform.vue
@@ -142,7 +142,7 @@
                         this.form2.items.map(val => {
                             val.website_group = this.rowData.rowId
                         })
-                        axios.post('/api/website/', this.form2.items).then(resp => {
+                        axios.post('api/website/', this.form2.items).then(resp => {
                             this.handleCancel(name),
                                 this.$Message.success('添加成功')
                             this.$parent.init()
diff --git a/websitefronted/src/components/Admin/Group/module/editgroup.vue b/websitefronted/src/components/Admin/Group/module/editgroup.vue
@@ -41,7 +41,7 @@
             handleSubmit(name) {
                 this.$refs[name].validate((valid) => {
                     if (valid) {
-                        axios.put(`/api/group/${this.id}/`,this.form3).then(resp=>{
+                        axios.put(`api/group/${this.id}/`,this.form3).then(resp=>{
                             this.$Message.success('保存成功');
                             this.handleCancel(name)
                             this.$parent.init()
diff --git a/websitefronted/src/components/Admin/Website/module/editIcon.vue b/websitefronted/src/components/Admin/Website/module/editIcon.vue
@@ -50,7 +50,7 @@
                     data.append('file', this.file)
                     axios({
                         method: 'post',
-                        url: `/api/icon/`,
+                        url: `api/icon/`,
                         data: data,
                     }).then(resp => {
                         this.file = null
diff --git a/websitefronted/src/components/Admin/Website/module/editWebsite.vue b/websitefronted/src/components/Admin/Website/module/editWebsite.vue
@@ -64,7 +64,7 @@
             handleSubmit(name) {
                 this.$refs[name].validate((valid) => {
                     if (valid) {
-                        axios.patch(`/api/website/${this.rowData.id}/`, this.form).then(resp => {
+                        axios.patch(`api/website/${this.rowData.id}/`, this.form).then(resp => {
                             this.$Message.success('保存成功');
                             this.handleCancel(name)
                             this.$parent.refresh()
diff --git a/websitefronted/src/components/LayOut.vue b/websitefronted/src/components/LayOut.vue
@@ -27,7 +27,7 @@
                 <Icon type="ios-arrow-down"></Icon>
               </div>
               <DropdownMenu slot="list">
-                <DropdownItem name="center">个人中心</DropdownItem>
+                <DropdownItem name="center" disabled>个人中心</DropdownItem>
                 <DropdownItem name="logout" divided>登出系统</DropdownItem>
               </DropdownMenu>
             </Dropdown>
diff --git a/websitefronted/src/components/System/User/index.vue b/websitefronted/src/components/System/User/index.vue
@@ -17,14 +17,14 @@
           </Row>
           <Table :loading="loading" :columns="columns" :data="data">
             <template slot-scope="{ row }" slot="action">
-              <Button type="warning" @click="forbidden(row)">
+              <Button v-show="!row.is_superuser" type="warning" @click="forbidden(row)">
                 <span v-if="isActive(row)">禁用</span>
                 <span v-else>启用</span>
               </Button>
-              <Button type="primary" @click="resetPassword(row)">重置密码
+              <Button v-show="!row.is_superuser" type="primary" @click="resetPassword(row)">重置密码
               </Button>
-              <Button type="info" @click="editUser(row)">编辑</Button>
-              <Button type="error" @click="remove(row)">删除</Button>
+              <Button v-show="!row.is_superuser" type="info" @click="editUser(row)">编辑</Button>
+              <Button v-show="!row.is_superuser" type="error" @click="remove(row)">删除</Button>
             </template>
           </Table>
           <br>
diff --git a/websitefronted/src/components/Websites.vue b/websitefronted/src/components/Websites.vue
@@ -16,19 +16,17 @@
       <Row :gutter="32">
         <Col span="6" style="padding: 12px;" v-for="(data,index) in item.websites" :key="index">
           <div style="cursor: pointer;" @click="redirect(data.path)">
-            <Tooltip id="tooltip-1" :content="data.path" transfer max-width="300" placement="top">
-              <Card style="border-radius: 30px;">
-                <div class="card-div">
-                  <div style="width: 30%;display: flex;align-items: center">
-                    <img :src="icon(data.id)" style="border-radius: 50%;width: 80%;height: 80%;">
-                  </div>
-                  <div style="width: 70%;">
-                    <div class="website-title">{{data.title}}</div>
-                    <p class="website-desc">{{data.description}}</p>
-                  </div>
+            <Card style="border-radius: 30px;">
+              <div class="card-div">
+                <div style="width: 30%;display: flex;align-items: center">
+                  <img :src="icon(data.id)" style="border-radius: 50%;width: 80%;height: 80%;">
                 </div>
-              </Card>
-            </Tooltip>
+                <div style="width: 70%;">
+                  <div class="website-title">{{data.title}}</div>
+                  <p class="website-desc">{{data.description}}</p>
+                </div>
+              </div>
+            </Card>
           </div>
         </Col>
       </Row>
@@ -38,6 +36,7 @@
 
 <script>
     import axios from 'axios'
+
     export default {
         name: 'Websites',
         created() {
@@ -50,7 +49,7 @@
         },
         methods: {
             icon(id) {
-                return axios.defaults.baseURL + '/api/icon/?id=' + id
+                return axios.defaults.baseURL + 'api/icon/?id=' + id
             },
             redirect(path) {
                 if (path.startsWith('http')) {
@@ -111,8 +110,8 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    height: 75px;
-    max-height: 75px
+    height: 70px;
+    max-height: 70px
   }
 
 </style>
diff --git a/websitefronted/src/main.js b/websitefronted/src/main.js
@@ -21,7 +21,7 @@ Vue.use(ViewUI)
 if (process.env.NODE_ENV === 'development') {
   axios.defaults.baseURL = 'http://127.0.0.1:8000/'
 } else if (process.env.NODE_ENV === 'production') {
-  axios.defaults.baseURL = window.location.protocol + "//" + window.location.host;
+  axios.defaults.baseURL = window.location.protocol + "//" + window.location.host + "/";
 }
 
 //请求超时时间
diff --git a/websitefronted/src/store/index.js b/websitefronted/src/store/index.js
@@ -37,7 +37,7 @@ const store = new Vuex.Store({
   actions: {
     login: (context, data) => {
       return new Promise((resolve, reject) => {
-        axios.post('/api/login/', data).then(resp => {
+        axios.post('api/login/', data).then(resp => {
           context.commit('updateToken', resp.data.detail.token)
           context.commit('decodeToken', resp.data.detail.token)
           resolve(resp)
@@ -51,7 +51,7 @@ const store = new Vuex.Store({
     },
     getWebsitesList: (context, data) => {
       return new Promise((resolve, reject) => {
-        axios.get('/api/alldata/', {params:data}).then(resp => {
+        axios.get('api/alldata/', {params:data}).then(resp => {
           context.commit('updatewebsiteList', resp.data)
           resolve(resp)
         }).catch(error => {
