From d862ddb914bdf1e6700dbb4fe094e55735225ff2 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 12 Jan 2022 15:50:36 +0800
Subject: [PATCH] 01

---
 ebts-ui/.env.development                      |  4 ++--
 .../views/sist/article/components/article.vue | 22 +++++++++----------
 ebts-ui/src/views/sist/articledic/index.vue   | 14 ++++++------
 ebts-ui/src/views/sist/navigation/index.vue   |  2 +-
 ebts-ui/src/views/system/role/index.vue       | 14 ++++++------
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ebts-ui/.env.development b/ebts-ui/.env.development
index 767fc82..0546770 100644
--- a/ebts-ui/.env.development
+++ b/ebts-ui/.env.development
@@ -3,8 +3,8 @@ ENV = 'development'
 
 # EBTS/开发环境
 #VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://localhost:8096/dev-api'
-#VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api'
+#VUE_APP_BASE_API = 'http://localhost:8096/dev-api'
+VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ebts-ui/src/views/sist/article/components/article.vue b/ebts-ui/src/views/sist/article/components/article.vue
index 112e8e5..5f1ebf0 100644
--- a/ebts-ui/src/views/sist/article/components/article.vue
+++ b/ebts-ui/src/views/sist/article/components/article.vue
@@ -19,15 +19,15 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否显示" prop="isView">
-            <el-radio-group v-model="formData.isView">
-              <el-radio-button v-for="(item, index) in isViewOptions" :key="index"
-                               :label="item.dictValue">{{ item.dictLabel }}
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="是否显示" prop="isView">-->
+<!--            <el-radio-group v-model="formData.isView">-->
+<!--              <el-radio-button v-for="(item, index) in isViewOptions" :key="index"-->
+<!--                               :label="item.dictValue">{{ item.dictLabel }}-->
+<!--              </el-radio-button>-->
+<!--            </el-radio-group>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="8">
           <el-form-item label="是否英语" prop="isEnglish">
             <el-radio-group v-model="formData.isEnglish">
@@ -140,8 +140,8 @@ export default {
       formData: {
         id: null,
         title: null,
-        isTop: null,
-        isEnglish: null,
+        isTop: '2',
+        isEnglish: '1',
         content: "",
         imgurl:null,
       },
diff --git a/ebts-ui/src/views/sist/articledic/index.vue b/ebts-ui/src/views/sist/articledic/index.vue
index 61ce5bc..4619f63 100644
--- a/ebts-ui/src/views/sist/articledic/index.vue
+++ b/ebts-ui/src/views/sist/articledic/index.vue
@@ -97,7 +97,7 @@
       <el-table-column label="类型编码" align="center" prop="dictCode" />
       <el-table-column label="网站类型" align="center" prop="attribute2" :formatter="attribute2Format" />
       <el-table-column label="类型名" align="center" prop="dictLabel" />
-      <el-table-column label="类型排序" align="center" prop="dictSort" />
+<!--      <el-table-column label="类型排序" align="center" prop="dictSort" />-->
 <!--      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />-->
       <el-table-column label="缩略图" align="center" prop="attribute1" :formatter="attribute1Format" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
@@ -142,9 +142,9 @@
         <el-form-item label="类型名" prop="dictLabel">
           <el-input v-model="form.dictLabel" placeholder="请输入类型名" />
         </el-form-item>
-        <el-form-item label="显示排序" prop="dictSort">
-          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
-        </el-form-item>
+<!--        <el-form-item label="显示排序" prop="dictSort">-->
+<!--          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />-->
+<!--        </el-form-item>-->
         <el-form-item label="缩略图" prop="attribute1">
           <el-radio-group v-model="form.attribute1">
             <el-radio
@@ -238,9 +238,9 @@ export default {
         attribute2: [
           { required: true, message: "网站类型不能为空", trigger: "blur" }
         ],
-        dictSort: [
-          { required: true, message: "数据顺序不能为空", trigger: "blur" }
-        ]
+        // dictSort: [
+        //   { required: true, message: "数据顺序不能为空", trigger: "blur" }
+        // ]
       }
     };
   },
diff --git a/ebts-ui/src/views/sist/navigation/index.vue b/ebts-ui/src/views/sist/navigation/index.vue
index b7fee4b..bf6a71c 100644
--- a/ebts-ui/src/views/sist/navigation/index.vue
+++ b/ebts-ui/src/views/sist/navigation/index.vue
@@ -67,7 +67,7 @@
             @click="handleUpdateDetails(scope.row)"
           >修改详情
           </el-button>
-          <el-button
+          <el-button v-show="scope.row.pid != 0"
             size="mini"
             type="text"
             icon="el-icon-edit"
diff --git a/ebts-ui/src/views/system/role/index.vue b/ebts-ui/src/views/system/role/index.vue
index d2a1a23..794b11f 100644
--- a/ebts-ui/src/views/system/role/index.vue
+++ b/ebts-ui/src/views/system/role/index.vue
@@ -118,7 +118,7 @@
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
 <!--      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />-->
-      <el-table-column label="显示顺序" prop="roleSort" width="100" />
+<!--      <el-table-column label="显示顺序" prop="roleSort" width="100" />-->
       <el-table-column label="状态" align="center" width="100">
         <template slot-scope="scope">
           <el-switch
@@ -178,9 +178,9 @@
 <!--        <el-form-item label="权限字符" prop="roleKey">-->
 <!--          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
-        </el-form-item>
+<!--        <el-form-item label="角色顺序" prop="roleSort">-->
+<!--          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />-->
+<!--        </el-form-item>-->
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
             <el-radio
@@ -346,9 +346,9 @@ export default {
         // roleKey: [
         //   { required: true, message: "权限字符不能为空", trigger: "blur" }
         // ],
-        roleSort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
-        ]
+        // roleSort: [
+        //   { required: true, message: "角色顺序不能为空", trigger: "blur" }
+        // ]
       }
     };
   },