From 2374bba98bb179394cdbaaa44167a57d5136fd10 Mon Sep 17 00:00:00 2001
From: Jo <479214531@qq.com>
Date: Fri, 18 Mar 2022 10:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AD=89=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue                 |  8 ++++--
 src/setting.js                            |  4 +--
 src/utils/api.js                          | 32 +++++++++++------------
 src/views/order/AddOrder.vue              | 30 ++++++++++-----------
 src/views/serve/backstage/model.vue       |  4 ++-
 src/views/serve/backstage/sourceModel.vue |  2 +-
 src/views/serve/projectList.vue           |  2 +-
 src/views/system/addLog.vue               |  2 +-
 src/views/system/manageLog.vue            |  5 +++-
 9 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index e3b6d1c..9b853c6 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -49,7 +49,7 @@ export default {
     },
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .header {
     position: relative;
     box-sizing: border-box;
@@ -85,6 +85,7 @@ export default {
 .user-avator {
     cursor: pointer;
     margin-left: 10px;
+    font-size: 12px;
 }
 .ml20{
     margin-left: 20px;
@@ -95,8 +96,11 @@ export default {
     height: 40px;
     border-radius: 50%;
 }
-.header-right .el-button--text{
+/deep/.header-right .el-button--text{
     color: #333;
+    span {
+        font-size: 12px;
+    }
 }
 .header-right .el-divider--vertical{
     width: 2px;
diff --git a/src/setting.js b/src/setting.js
index e84dd24..9bd76ea 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -13,8 +13,8 @@ if (isDev) {
     // jumpPath = "http://39.108.250.202/judgmentPoint/";
     jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
     // host = "http://www.huorantech.cn:9000";//线上
-    // host = "http://39.108.250.202:9000";//测试
-    host = 'http://192.168.31.151:9000/'// 榕
+    host = "http://39.108.250.202:9000";//测试
+    // host = 'http://192.168.31.151:9000/'// 榕
     // host = 'http://192.168.31.137:9000'// 赓
 } else if (isTest) {
     // jumpPath = "http://124.71.12.62/judgmentPoint/";
diff --git a/src/utils/api.js b/src/utils/api.js
index 0b47056..4e96d16 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -5,8 +5,8 @@ const host1 = 'http://192.168.31.137:9000'
 
 export default {
 
-    logins: `${host1}/users/users/user/login`, //登录
-    verification: `${host1}/users/users/user/captcha`,// 验证码图片
+    logins: `users/users/user/login`, //登录
+    verification: `${Setting.host}/users/users/user/captcha`,// 验证码图片
     bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机
     sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码
 
@@ -211,20 +211,20 @@ export default {
     getKeywordByCategoryId: `data/keyword/getKeywordByCategoryId`,
     
     // 角色管理
-    batchRemove: `${host1}/users/role/batchRemove`, //批量删除角色
-    checkRoleIsExist: `${host1}/users/role/checkRoleIsExist`, //判断该角色是否存在
-    delRoleByAccountId: `${host1}/users/role/delRoleByAccountId`, //删除某用户下的某个角色
-    roleList: `${host1}/users/role/list`, //角色分页列表查询
-    obtainDetails: `${host1}/users/role/obtainDetails`, //获取角色详情
-    saveOrUpdate: `${host1}/users/role/saveOrUpdate`, //新增或更新角色
-    queryAllMenus: `${host1}/users/users/permission/queryAllMenus`, //查询所有菜单
-    getUserRolesPermissionMenu: `${host1}/users/user-role/getUserRolesPermissionMenu`,
+    batchRemove: `users/role/batchRemove`, //批量删除角色
+    checkRoleIsExist: `users/role/checkRoleIsExist`, //判断该角色是否存在
+    delRoleByAccountId: `users/role/delRoleByAccountId`, //删除某用户下的某个角色
+    roleList: `users/role/list`, //角色分页列表查询
+    obtainDetails: `users/role/obtainDetails`, //获取角色详情
+    saveOrUpdate: `users/role/saveOrUpdate`, //新增或更新角色
+    queryAllMenus: `users/users/permission/queryAllMenus`, //查询所有菜单
+    getUserRolesPermissionMenu: `users/user-role/getUserRolesPermissionMenu`,
 
     // 日志管理
-    logAdd: `${host1}/nakadai/log/add`,
-    logDel: `${host1}/nakadai/log/delete`,
-    logGet: `${host1}/nakadai/log/get`,
-    logManagementList: `${host1}/nakadai/log/logManagementList`,
-    platformLogList: `${host1}/nakadai/log/platformLogList`,
-    listUpdate: `${host1}/nakadai/log/update`,
+    logAdd: `nakadai/log/add`,
+    logDel: `nakadai/log/delete`,
+    logGet: `nakadai/log/get`,
+    logManagementList: `nakadai/log/logManagementList`,
+    platformLogList: `nakadai/log/platformLogList`,
+    listUpdate: `nakadai/log/update`,
 };
\ No newline at end of file
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index 7765508..761f1cf 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -115,7 +115,7 @@
                                 </el-table-column>
                                 <el-table-column prop="productName" label="课程名称" align="center" min-width="150" show-overflow-tooltip>
                                 </el-table-column>
-                                <el-table-column label="使用期限" align="center" min-width="150">
+                                <el-table-column label="使用期限" align="center" min-width="170">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input
@@ -136,7 +136,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="起止日期" align="center" min-width="150">
+                                <el-table-column label="起止日期" align="center" min-width="240">
                                     <template slot-scope="scope">
                                         <p v-if="!scope.row.startTime">
                                             <el-date-picker
@@ -160,7 +160,7 @@
                                             <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="剩余期限" align="center" min-width="80">
+                                <el-table-column label="剩余期限" align="center" min-width="110">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input disabled v-model="scope.row.remainingPeriod" placeholder=""
@@ -169,7 +169,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="市场价" align="center" min-width="80">
+                                <el-table-column label="市场价" align="center" min-width="110">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input disabled v-model="scope.row.marketValue" placeholder=""
@@ -178,7 +178,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="成交价" align="center" min-width="80">
+                                <el-table-column label="成交价" align="center" min-width="110">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''"
@@ -191,15 +191,13 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="折扣率 " align="center" min-width="80">
+                                <el-table-column label="折扣率 " align="center" min-width="100">
                                     <template slot-scope="scope">
-                                        <div class="small">
                                             <el-input disabled v-model="scope.row.discountRate" placeholder=""
-                                                      type="text"></el-input>
-                                        </div>
+                                                      type="text" size="small" style="width: 100%"></el-input>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="端口地址 " align="center" min-width="80">
+                                <el-table-column label="端口地址 " align="center" min-width="100">
                                     <template slot-scope="scope">
                                         <el-button @click="configure(scope.row)">配置</el-button>
                                     </template>
@@ -257,7 +255,7 @@
                                 </el-table-column>
                                 <el-table-column prop="productName" label="产品名称" align="center" min-width="100">
                                 </el-table-column>
-                                <el-table-column label="使用期限" align="center" min-width="120">
+                                <el-table-column label="使用期限" align="center" min-width="150">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input onkeyup="value=this.value.replace(/\D+/g,'')"
@@ -276,7 +274,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="起止日期" align="center" min-width="180">
+                                <el-table-column label="起止日期" align="center" min-width="240">
                                     <template slot-scope="scope">
                                         <p v-if="!scope.row.startTime">
                                             <el-date-picker
@@ -300,7 +298,7 @@
                                             <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="剩余期限" align="center" min-width="70">
+                                <el-table-column label="剩余期限" align="center" min-width="120">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input disabled v-model="scope.row.remainingPeriod" placeholder=""
@@ -309,7 +307,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="市场价" align="center" min-width="120">
+                                <el-table-column label="市场价" align="center" min-width="160">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input disabled v-model="scope.row.marketValue" placeholder=""
@@ -318,7 +316,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="成交价" align="center" min-width="120">
+                                <el-table-column label="成交价" align="center" min-width="170">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''"
@@ -331,7 +329,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="折扣率" align="center" min-width="80">
+                                <el-table-column label="折扣率" align="center" min-width="140">
                                     <template slot-scope="scope">
                                         <!-- <div class="discountRate"> -->
                                         <div class="small">
diff --git a/src/views/serve/backstage/model.vue b/src/views/serve/backstage/model.vue
index ad4ae59..4c6a77f 100644
--- a/src/views/serve/backstage/model.vue
+++ b/src/views/serve/backstage/model.vue
@@ -22,7 +22,7 @@
                 <el-table-column type="selection" width="55" align="center"></el-table-column>
                 <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
                 <el-table-column prop="modelName" label="模型名称" align="center"></el-table-column>
-                <el-table-column prop="categoryName" label="分类" width="150" align="center"></el-table-column>
+                <el-table-column v-if="isTopLevel" prop="categoryName" label="分类" width="150" align="center"></el-table-column>
                 <el-table-column prop="createTime" label="导入时间" align="center"></el-table-column>
                 <el-table-column label="状态" align="center">
                     <template slot-scope="scope">
@@ -63,6 +63,7 @@ export default {
     data() {
         return {
             systemId: this.$route.query.systemId,
+            isTopLevel: true, // 是否是在顶级分类
             listData: [],
             keyword: '',
             page: 1,
@@ -89,6 +90,7 @@ export default {
     methods: {
         getData() {
           const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类
+          this.isTopLevel = !curNode.level
           // 如果是首级，要调另一个接口
           if (!curNode.level) {
             this.$post(this.api.getAllModelList, {
diff --git a/src/views/serve/backstage/sourceModel.vue b/src/views/serve/backstage/sourceModel.vue
index d975dd5..c14c9cf 100644
--- a/src/views/serve/backstage/sourceModel.vue
+++ b/src/views/serve/backstage/sourceModel.vue
@@ -24,7 +24,7 @@
                 <el-table-column type="selection" width="55" align="center"></el-table-column>
                 <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
                 <el-table-column prop="modelName" label="模型名称" align="center"></el-table-column>
-                <el-table-column prop="categoryName" label="分类" width="150" align="center"></el-table-column>
+                <el-table-column v-if="isTopLevel" prop="categoryName" label="分类" width="150" align="center"></el-table-column>
                 <el-table-column prop="modifyName" label="编辑人" align="center"></el-table-column>
                 <el-table-column prop="updateTime" label="最新编辑时间" width="150" align="center"></el-table-column>
                 <el-table-column prop="workNumber" label="状态" width="100" align="center">
diff --git a/src/views/serve/projectList.vue b/src/views/serve/projectList.vue
index a0f84b0..23b9ff0 100644
--- a/src/views/serve/projectList.vue
+++ b/src/views/serve/projectList.vue
@@ -93,7 +93,7 @@
                                 {{ stateKeys[scope.row.state] }}
                             </template>
                         </el-table-column>
-                        <el-table-column label="操作">
+                        <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <el-button type="text" @click="edit(scope.row)">
                                     编辑
diff --git a/src/views/system/addLog.vue b/src/views/system/addLog.vue
index e29b3dd..959b3d0 100644
--- a/src/views/system/addLog.vue
+++ b/src/views/system/addLog.vue
@@ -160,7 +160,7 @@ export default {
                 versionName,
                 coverUrl: this.form.coverUrl,
                 logContents,
-                draft
+                draft // 0:发布，1:草稿
             }
             if (id) {
                 data.logId = id
diff --git a/src/views/system/manageLog.vue b/src/views/system/manageLog.vue
index 6524c3d..90dea63 100644
--- a/src/views/system/manageLog.vue
+++ b/src/views/system/manageLog.vue
@@ -30,7 +30,7 @@
           </div>
           <el-timeline class="timeline">
               <el-timeline-item placement="top" v-for="(item, i) in listData" :key="i">
-                  <p class="sign" :id="'ver' + i">{{ item.updateTime }}</p>
+                  <p :class="['sign', {draft: item.draft}]" :id="'ver' + i">{{ item.draft ? '未发布' : item.updateTime }}</p>
                   <div class="ver">
                       <div>
                           {{ platformName + item.versionName }}
@@ -164,6 +164,9 @@ export default {
         font-size: 14px;
         color: #9076FF;
     }
+    .draft {
+        color: #ccc;
+    }
     .ver {
         display: flex;
         justify-content: space-between;