From 1d179c2105ea361bc1ae172874d1322df17b8a75 Mon Sep 17 00:00:00 2001
From: "YUN-PC5\\user" <bmdzh11713@163.com>
Date: Fri, 27 Oct 2023 16:38:11 +0800
Subject: [PATCH] =?UTF-8?q?docker=E4=B8=ADnginx=E5=90=8C=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=9A=E9=A1=B9=E7=9B=AE=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                              |   6 +-
 src/views/components/CommonMenu/index.vue    |  30 +--
 src/views/components/dictData.vue            | 182 ++++++++++---------
 src/views/system/user/profile/userAvatar.vue | 106 +++++------
 4 files changed, 165 insertions(+), 159 deletions(-)

diff --git a/.env.production b/.env.production
index c24c62b..c3b1c12 100644
--- a/.env.production
+++ b/.env.production
@@ -3,13 +3,13 @@ ENV = 'production'
 
 
 # 生产环境
-VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_API = '/zradminvue-api'
 
 # 路由前缀
-VITE_APP_ROUTER_PREFIX = '/'
+VITE_APP_ROUTER_PREFIX = '/zradminvue'
 
 # 默认上传地址
 VITE_APP_UPLOAD_URL = '/Common/UploadFile'
 
 #socket API
-VITE_APP_SOCKET_API = '/msghub'
+VITE_APP_SOCKET_API = '/zradminvuemsghub'
diff --git a/src/views/components/CommonMenu/index.vue b/src/views/components/CommonMenu/index.vue
index 289de43..8c38b16 100644
--- a/src/views/components/CommonMenu/index.vue
+++ b/src/views/components/CommonMenu/index.vue
@@ -1,19 +1,21 @@
 <template>
-  <div class="tool-wrap">
-    <template v-for="item in commonRouters">
-      <div class="tool-item" @mouseenter="onMouseOver(item)" @mouseleave="onMouseOut(item)">
-        <span class="close-used" @click="removeRoute(item)" v-if="item.hidden">
-          <el-icon><CloseBold /></el-icon>
-        </span>
-        <router-link :to="item.path">
-          <svg-icon :name="item.icon" class-name="card-panel-icon mb10" :color="item.color" />
-          <div class="title">{{ item.menuTitle }}</div>
-        </router-link>
-      </div>
-    </template>
-  </div>
+  <div>
+    <div class="tool-wrap">
+      <template v-for="item in commonRouters">
+        <div class="tool-item" @mouseenter="onMouseOver(item)" @mouseleave="onMouseOut(item)">
+          <span class="close-used" @click="removeRoute(item)" v-if="item.hidden">
+            <el-icon><CloseBold /></el-icon>
+          </span>
+          <router-link :to="item.path">
+            <svg-icon :name="item.icon" class-name="card-panel-icon mb10" :color="item.color" />
+            <div class="title">{{ item.menuTitle }}</div>
+          </router-link>
+        </div>
+      </template>
+    </div>
 
-  <el-empty :image-size="80" v-if="commonRouters && commonRouters.length <= 0" />
+    <el-empty :image-size="80" v-if="commonRouters && commonRouters.length <= 0" />
+  </div>
 </template>
 <script setup>
 import usePermissionStore from '@/store/modules/permission'
diff --git a/src/views/components/dictData.vue b/src/views/components/dictData.vue
index e54973d..6a69458 100644
--- a/src/views/components/dictData.vue
+++ b/src/views/components/dictData.vue
@@ -1,100 +1,102 @@
 <template>
-  <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-    <el-form-item label="字典名称" prop="dictType">
-      <el-select v-model="queryParams.dictType">
-        <el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="状态" prop="status">
-      <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
-        <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-      </el-select>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-      <el-button icon="refresh" @click="resetQuery">重置</el-button>
-    </el-form-item>
-  </el-form>
-
-  <el-row :gutter="10" class="mb8">
-    <el-col :span="1.5">
-      <el-button type="primary" plain icon="plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增数据</el-button>
-    </el-col>
-  </el-row>
-  <el-table :data="dataList">
-    <!-- <el-table-column type="selection" width="55" align="center" /> -->
-    <el-table-column label="字典编码" align="center" prop="dictCode" />
-    <el-table-column label="字典标签" align="center" prop="dictLabel">
-      <template #default="scope">
-        <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</span>
-        <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass"
-          >{{ scope.row.dictLabel }}
-        </el-tag>
-      </template>
-    </el-table-column>
-    <el-table-column label="字典键值" align="center" prop="dictValue" sortable />
-    <el-table-column label="字典排序" align="center" prop="dictSort" sortable />
-    <el-table-column label="状态" align="center" prop="status">
-      <template #default="scope">
-        <dict-tag :options="statusOptions" :value="scope.row.status" />
-      </template>
-    </el-table-column>
-    <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130px">
-      <template #default="scope">
-        <el-button text size="small" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">编辑</el-button>
-        <el-button text size="small" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除 </el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-  <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-
-  <!-- 添加或修改参数配置对话框 -->
-  <el-dialog :title="title" v-model="open" draggable width="500px" append-to-body>
-    <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="字典类型">
-        <el-input v-model="form.dictType" :disabled="true" />
-      </el-form-item>
-      <el-form-item label="数据标签" prop="dictLabel">
-        <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
-      </el-form-item>
-      <el-form-item label="数据键值" prop="dictValue">
-        <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
-      </el-form-item>
-      <el-form-item label="样式属性" prop="cssClass">
-        <!-- <el-input v-model="form.cssClass" placeholder="请输入样式属性" /> -->
-        <el-select v-model="form.cssClass" allow-create filterable clearable="">
-          <el-option v-for="dict in cssClassOptions" :class="dict.value" :key="dict.value" :label="dict.label" :value="dict.value">
-            <span style="float: left" :class="dict.value">{{ dict.label }}</span>
-            <span style="float: right">{{ dict.value }}</span>
-          </el-option>
-        </el-select>
-      </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="listClass">
-        <el-select v-model="form.listClass">
-          <el-option v-for="item in listClassOptions" :key="item.value" :label="item.label + '(' + item.value + ')'" :value="item.value">
-          </el-option>
+  <div>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="字典名称" prop="dictType">
+        <el-select v-model="queryParams.dictType">
+          <el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-radio-group v-model="form.status">
-          <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
-        </el-radio-group>
+        <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
+          <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+      <el-form-item>
+        <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+        <el-button icon="refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button text @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </template>
-  </el-dialog>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增数据</el-button>
+      </el-col>
+    </el-row>
+    <el-table :data="dataList">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="字典编码" align="center" prop="dictCode" />
+      <el-table-column label="字典标签" align="center" prop="dictLabel">
+        <template #default="scope">
+          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</span>
+          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass"
+            >{{ scope.row.dictLabel }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="字典键值" align="center" prop="dictValue" sortable />
+      <el-table-column label="字典排序" align="center" prop="dictSort" sortable />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130px">
+        <template #default="scope">
+          <el-button text size="small" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">编辑</el-button>
+          <el-button text size="small" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除 </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" v-model="open" draggable width="500px" append-to-body>
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="字典类型">
+          <el-input v-model="form.dictType" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="数据标签" prop="dictLabel">
+          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+        </el-form-item>
+        <el-form-item label="数据键值" prop="dictValue">
+          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+        </el-form-item>
+        <el-form-item label="样式属性" prop="cssClass">
+          <!-- <el-input v-model="form.cssClass" placeholder="请输入样式属性" /> -->
+          <el-select v-model="form.cssClass" allow-create filterable clearable="">
+            <el-option v-for="dict in cssClassOptions" :class="dict.value" :key="dict.value" :label="dict.label" :value="dict.value">
+              <span style="float: left" :class="dict.value">{{ dict.label }}</span>
+              <span style="float: right">{{ dict.value }}</span>
+            </el-option>
+          </el-select>
+        </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="listClass">
+          <el-select v-model="form.listClass">
+            <el-option v-for="item in listClassOptions" :key="item.value" :label="item.label + '(' + item.value + ')'" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button text @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 <script setup name="dictData">
 import { listData, getData, delData, addData, updateData } from '@/api/system/dict/data'
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 4339d98..d9cf22f 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -1,57 +1,59 @@
 <template>
-  <div class="user-info-head" @click="editCropper()">
-    <!-- <img :src="options.img" title="点击上传头像" class="img-circle img-lg" /> -->
-    <el-avatar shape="circle" :size="120" :src="options.img" />
+  <div>
+    <div class="user-info-head" @click="editCropper()">
+      <!-- <img :src="options.img" title="点击上传头像" class="img-circle img-lg" /> -->
+      <el-avatar shape="circle" :size="120" :src="options.img" />
+    </div>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
+      <el-row>
+        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            @realTime="realTime"
+            v-if="visible" />
+        </el-col>
+        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
+          <div class="avatar-upload-preview">
+            <img :src="options.previews.url" :style="options.previews.img" />
+          </div>
+        </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <el-col :lg="2" :md="2">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+            <el-button>
+              选择
+              <el-icon class="el-icon--right">
+                <Upload />
+              </el-icon>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 2 }" :md="2">
+          <el-button icon="Plus" @click="changeScale(1)"></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button icon="Minus" @click="changeScale(-1)"></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button icon="RefreshLeft" @click="rotateLeft()"></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
+        </el-col>
+        <el-col :lg="{ span: 2, offset: 6 }" :md="2">
+          <el-button type="primary" @click="uploadImg()">提 交</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
   </div>
-  <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
-    <el-row>
-      <el-col :xs="24" :md="12" :style="{ height: '350px' }">
-        <vue-cropper
-          ref="cropper"
-          :img="options.img"
-          :info="true"
-          :autoCrop="options.autoCrop"
-          :autoCropWidth="options.autoCropWidth"
-          :autoCropHeight="options.autoCropHeight"
-          :fixedBox="options.fixedBox"
-          @realTime="realTime"
-          v-if="visible" />
-      </el-col>
-      <el-col :xs="24" :md="12" :style="{ height: '350px' }">
-        <div class="avatar-upload-preview">
-          <img :src="options.previews.url" :style="options.previews.img" />
-        </div>
-      </el-col>
-    </el-row>
-    <br />
-    <el-row>
-      <el-col :lg="2" :md="2">
-        <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
-          <el-button>
-            选择
-            <el-icon class="el-icon--right">
-              <Upload />
-            </el-icon>
-          </el-button>
-        </el-upload>
-      </el-col>
-      <el-col :lg="{ span: 1, offset: 2 }" :md="2">
-        <el-button icon="Plus" @click="changeScale(1)"></el-button>
-      </el-col>
-      <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-        <el-button icon="Minus" @click="changeScale(-1)"></el-button>
-      </el-col>
-      <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-        <el-button icon="RefreshLeft" @click="rotateLeft()"></el-button>
-      </el-col>
-      <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-        <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
-      </el-col>
-      <el-col :lg="{ span: 2, offset: 6 }" :md="2">
-        <el-button type="primary" @click="uploadImg()">提 交</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
 </template>
 
 <script>