From 15d3dd67afb21b7000dc8d9ccbd48feba7238432 Mon Sep 17 00:00:00 2001
From: mengqiang <>
Date: Sun, 7 Feb 2021 11:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sso-auth-center-vue/.env.development          |   2 +-
 sso-auth-center-vue/.env.production           |   2 +-
 sso-auth-center-vue/.env.staging              |   2 +-
 sso-auth-center-vue/README.md                 |  28 ++
 .../src/views/sso/dept/index.vue              | 257 +++++++++---------
 .../src/views/sso/platform/platformDetail.vue |  17 +-
 .../src/views/sso/platform/platformMgmt.vue   |   2 +-
 7 files changed, 172 insertions(+), 138 deletions(-)

diff --git a/sso-auth-center-vue/.env.development b/sso-auth-center-vue/.env.development
index 80846b8..fecc91d 100755
--- a/sso-auth-center-vue/.env.development
+++ b/sso-auth-center-vue/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-#  VUE_APP_BASE_API = '/dev-api'
+#  VUE_APP_BASE_API = '/api'
 VUE_APP_BASE_API = 'http://localhost:9901/api'
diff --git a/sso-auth-center-vue/.env.production b/sso-auth-center-vue/.env.production
index 80c8103..07d391e 100755
--- a/sso-auth-center-vue/.env.production
+++ b/sso-auth-center-vue/.env.production
@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/api'
 
diff --git a/sso-auth-center-vue/.env.staging b/sso-auth-center-vue/.env.staging
index a8793a0..d69f663 100755
--- a/sso-auth-center-vue/.env.staging
+++ b/sso-auth-center-vue/.env.staging
@@ -4,5 +4,5 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = '/api'
 
diff --git a/sso-auth-center-vue/README.md b/sso-auth-center-vue/README.md
index e69de29..fb1310f 100755
--- a/sso-auth-center-vue/README.md
+++ b/sso-auth-center-vue/README.md
@@ -0,0 +1,28 @@
+# 小强认证中心前端项目
+
+```bash
+
+# 进入项目目录
+cd sso-auth-center-vue
+
+# 安装依赖
+npm install
+
+# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
+npm install --registry=https://registry.npm.taobao.org
+
+# 启动服务
+npm run dev
+```
+
+浏览器访问 http://localhost:端口
+
+## 发布
+
+```bash
+# 构建测试环境
+npm run build-test
+
+# 构建生产环境
+npm run build
+```
diff --git a/sso-auth-center-vue/src/views/sso/dept/index.vue b/sso-auth-center-vue/src/views/sso/dept/index.vue
index b0e5231..d0b3830 100755
--- a/sso-auth-center-vue/src/views/sso/dept/index.vue
+++ b/sso-auth-center-vue/src/views/sso/dept/index.vue
@@ -4,138 +4,141 @@
       <el-breadcrumb-item>{{ targetSysName }}</el-breadcrumb-item>
       <el-breadcrumb-item>部门管理</el-breadcrumb-item>
     </el-breadcrumb>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="deptNameLike">
-        <el-input
-            v-model="queryParams.deptNameLike"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="状态" @keyup.enter.native="handleQuery" @change="handleQuery"
-                   size="small" style="width: 90px">
-          <el-option :key="-1" label="全部" :value="-1"/>
-          <el-option :key="0" label="正常" :value="0"/>
-          <el-option :key="1" label="停用" :value="1"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-
-    <el-row>
-      <el-form>
-        <el-form-item style="margin: 0">
-          <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd(null)" v-hasPermission="['dept:add']">新增
-          </el-button>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+        <el-form-item label="部门名称" prop="deptNameLike">
+          <el-input
+              v-model="queryParams.deptNameLike"
+              placeholder="请输入部门名称"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="状态" @keyup.enter.native="handleQuery"
+                     @change="handleQuery"
+                     size="small" style="width: 90px">
+            <el-option :key="-1" label="全部" :value="-1"/>
+            <el-option :key="0" label="正常" :value="0"/>
+            <el-option :key="1" label="停用" :value="1"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-    </el-row>
 
-    <el-table
-        border
-        v-loading="loading"
-        :data="deptList"
-        row-key="deptId"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column fixed prop="deptName" label="部门名称" min-width="180" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="status" label="状态" align="center" min-width="80" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span v-if="scope.row.status === 0"> <el-tag type="success" size="mini">启用</el-tag></span>
-          <span v-if="scope.row.status === 1"><el-tag type="danger" size="mini">停用</el-tag></span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="sortNum" label="显示顺序" align="center" min-width="100" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="createTime" min-width="165" label="创建时间" align="center"/>
-      <el-table-column prop="updateTime" min-width="165" label="修改时间" align="center"/>
-      <el-table-column fixed="right" label="操作" align="center" width="200">
-        <template slot-scope="scope">
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermission="['dept:update']"
-          >修改
-          </el-button>
-          <el-button
-              v-if="scope.row.status===0"
-              size="mini"
-              type="text"
-              icon="el-icon-plus"
-              @click="handleAdd(scope.row)"
-              v-hasPermission="['dept:add']"
-          >新增
-          </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermission="['dept:delete']"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
 
-    <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="上级部门" prop="deptParentId">
-              <treeselect v-model="form.deptParentId" :options="deptOptions" :normalizer="normalizer"
-                          placeholder="选择上级部门"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门状态" prop="status">
-              <el-radio-group v-model="form.status">
-                <el-radio :label="0">正常</el-radio>
-                <el-radio :label="1">停用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示顺序" prop="sortNum">
-              <el-input-number v-model="form.sortNum" controls-position="right" :min="0" :max="999999999"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remarks">
-              <el-input v-model="form.remarks" type="textarea"
-                        :autosize="{ minRows: 2, maxRows: 5}"
-                        placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+      <el-row>
+        <el-form>
+          <el-form-item style="margin: 0">
+            <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd(null)" v-hasPermission="['dept:add']">新增
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+
+      <el-table
+          border
+          v-loading="loading"
+          :data="deptList"
+          row-key="deptId"
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+        <el-table-column fixed prop="deptName" label="部门名称" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="status" label="状态" align="center" min-width="80" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="scope.row.status === 0"> <el-tag type="success" size="mini">启用</el-tag></span>
+            <span v-if="scope.row.status === 1"><el-tag type="danger" size="mini">停用</el-tag></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sortNum" label="显示顺序" align="center" min-width="100"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createTime" min-width="165" label="创建时间" align="center"/>
+        <el-table-column prop="updateTime" min-width="165" label="修改时间" align="center"/>
+        <el-table-column fixed="right" label="操作" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermission="['dept:update']"
+            >修改
+            </el-button>
+            <el-button
+                v-if="scope.row.status===0"
+                size="mini"
+                type="text"
+                icon="el-icon-plus"
+                @click="handleAdd(scope.row)"
+                v-hasPermission="['dept:add']"
+            >新增
+            </el-button>
+            <el-button
+                v-if="scope.row.children.length<=0"
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermission="['dept:delete']"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 添加或修改部门对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="上级部门" prop="deptParentId">
+                <treeselect v-model="form.deptParentId" :options="deptOptions" :normalizer="normalizer"
+                            placeholder="选择上级部门"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="部门名称" prop="deptName">
+                <el-input v-model="form.deptName" placeholder="请输入部门名称"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="部门状态" prop="status">
+                <el-radio-group v-model="form.status">
+                  <el-radio :label="0">正常</el-radio>
+                  <el-radio :label="1">停用</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="显示顺序" prop="sortNum">
+                <el-input-number v-model="form.sortNum" controls-position="right" :min="0" :max="999999999"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remarks">
+                <el-input v-model="form.remarks" type="textarea"
+                          :autosize="{ minRows: 2, maxRows: 5}"
+                          placeholder="请输入内容"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
   </div>
-</div>
 </template>
 
 <script>
diff --git a/sso-auth-center-vue/src/views/sso/platform/platformDetail.vue b/sso-auth-center-vue/src/views/sso/platform/platformDetail.vue
index f1fa9ae..1000825 100755
--- a/sso-auth-center-vue/src/views/sso/platform/platformDetail.vue
+++ b/sso-auth-center-vue/src/views/sso/platform/platformDetail.vue
@@ -26,10 +26,13 @@
           </el-card>
         </el-col>
         <el-col :md="3" :lg="3" v-if="hasUpdatePermission">
-          <sysIcon :sysId="detailData.sysId" :imgUrl="detailData.sysIcon"/>
+          <sysIcon v-if="detailData.sysIcon !=='' && detailData.sysIcon !==undefined"  :sysId="detailData.sysId" :imgUrl="detailData.sysIcon"/>
+          <sysIcon  v-else :sysId="detailData.sysId" :imgUrl="detailData.sysDefaultIcon"/>
         </el-col>
         <el-col :md="3" :lg="3" v-if="!hasUpdatePermission">
-          <img :src="detailData.sysIcon" style="width: 260px; height: 160px"/>
+          <img v-if="detailData.sysIcon !=='' && detailData.sysIcon !==undefined" :src="detailData.sysIcon"
+               style="width: 260px; height: 160px"/>
+          <img v-else :src="detailData.sysDefaultIcon" style="width: 260px; height: 160px"/>
         </el-col>
       </el-row>
       <el-row :gutter="10">
@@ -122,7 +125,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="系统编码" prop="sysCode">
-              <el-input  readonly="true"  disabled="true" v-model="updateForm.sysCode" placeholder="请输入系统编码"/>
+              <el-input readonly="true" disabled="true" v-model="updateForm.sysCode" placeholder="请输入系统编码"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -301,13 +304,13 @@ export default {
             this.detailData = response.data
             //系统图标-如果非外链则添加前缀处理
             if ('' !== this.detailData.sysIcon && !isExternal(this.detailData.sysIcon)) {
-               this.detailData.sysIcon = process.env.VUE_APP_BASE_API + this.detailData.sysIcon
+              this.detailData.sysIcon = process.env.VUE_APP_BASE_API + this.detailData.sysIcon
             }
             //处理默认图片地址
-            if (null ==  this.detailData.sysIcon || '' ===  this.detailData.sysIcon) {
-               this.detailData.sysIcon = require('@/assets/image/default-system.jpg')
+            if (null == this.detailData.sysIcon || '' === this.detailData.sysIcon) {
+              this.detailData.sysDefaultIcon = require('@/assets/image/default-system.jpg')
             }
-         }
+          }
       )
     },
     updateSystem() {
diff --git a/sso-auth-center-vue/src/views/sso/platform/platformMgmt.vue b/sso-auth-center-vue/src/views/sso/platform/platformMgmt.vue
index 02a7e03..28d06ba 100755
--- a/sso-auth-center-vue/src/views/sso/platform/platformMgmt.vue
+++ b/sso-auth-center-vue/src/views/sso/platform/platformMgmt.vue
@@ -198,7 +198,7 @@ export default {
     submitForm() {
       this.$refs['addForm'].validate(valid => {
         if (valid) {
-
+          this.addForm.sysIcon='';
           this.$confirm(
               '是否确认新增,请注意!新增后系统编码将不可修改?',
               '确认警告',