feature(系统管理): 系统管理模块、文件上传修改

.env

@@ -1,14 +1,17 @@
 VUE_GITHUB_USER_NAME=test
 VUE_APP_SECRET_KEY=preview
-VUE_APP_PROTOCOL="http://"
-# 文件上传
-VUE_APP_UPLOAD_WEED='http://192.168.0.252:9333/dir/assign',
+
 # 租户码
 VUE_APP_TENANT=default
 # 登录验证微服务名称
 VUE_APP_AdminPath  = dashoo.opms.admin-0.0.1
 VUE_APP_ParentPath = dashoo.opms.parent-0.0.1
 VUE_APP_MicroSrvProxy_API=http://192.168.0.81:9981/
+
+VUE_APP_PROTOCOL='http://'
+# 文件上传
+VUE_APP_UPLOAD_WEED='http://192.168.0.252:9333/dir/assign'
+
 SSO_LOGIN=''
 SSO_HREF=''
 

.env.development

@@ -3,19 +3,11 @@
 VUE_APP_TENANT=default
 
 # GateWay地址
-
-VUE_APP_MicroSrvProxy_API=http://192.168.0.252:8100/
-
+VUE_APP_MicroSrvProxy_API=http://127.0.0.1:9981/
 # 登录验证微服务名称
-VUE_APP_AdminPath=dashoo.labsop.lims_latest_opms_admin
-
+VUE_APP_AdminPath=dashoo.opms.admin-0.0.1
 # 业务接口微服务名称
-VUE_APP_ParentPath=dashoo.labsop.lims_latest_opms_parent
+VUE_APP_ParentPath=dashoo.opms.parent-0.0.1
 
-VUE_GITHUB_USER_NAME=test
-VUE_APP_SECRET_KEY=preview
-VUE_APP_PROTOCOL="http://"
 # 文件上传
-VUE_APP_UPLOAD_WEED='http://192.168.0.252:9333/dir/assign',
-
-
+VUE_APP_UPLOAD_WEED='http://192.168.0.252:9333/dir/assign'

.env.production

@@ -3,9 +3,10 @@ VUE_APP_TENANT=cp5vbwxy
 
 # GateWay地址
 VUE_APP_MicroSrvProxy_API=http://1.15.100.104:9982/
-
 # 登录验证微服务名称
 VUE_APP_AdminPath=dashoo.opms.admin-0.0.1
-
 # 业务接口微服务名称
 VUE_APP_ParentPath=dashoo.opms.parent-0.0.1
+
+# 文件上传
+VUE_APP_UPLOAD_WEED='http://1.15.100.104:9333/dir/assign'

src/views/contract/components/DetailsEnclosure.vue

@@ -210,9 +210,9 @@
       // 上传
       uploadrequest(option) {
         let _this = this
-        // let url = process.env.VUE_APP_UPLOAD_WEED
+        let url = process.env.VUE_APP_UPLOAD_WEED
         axios
-          .post('http://192.168.0.252:9333/dir/assign')
+          .post(url)
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
               option.action = `${process.env.VUE_APP_PROTOCOL}${res.data.publicUrl}/${res.data.fid}`

src/views/proj/business/components/DetailsFollow.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%">
     <ul v-if="followList.length" class="follow">
       <li v-for="(date, index) in followList" :key="index">
         <div class="date">
@@ -10,8 +10,7 @@
         </div>
         <ul class="content">
           <li v-for="(item, idx) in date.followupList" :key="idx">
-            <!-- <el-avatar class="user-avatar"
-      :src="avatar" />-->
+            <!-- <el-avatar class="user-avatar" :src="avatar" />-->
             <div class="text-container">
               <vab-icon class="user-avatar" icon="account-circle-fill" />
               <div class="text">

src/views/system/dict/components/DataEdit.vue

@@ -16,6 +16,9 @@
       <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="系统默认">
+        <el-switch v-model="form.isDefault" active-text="是" active-value="10" inactive-text="否" inactive-value="20" />
+      </el-form-item>
       <el-form-item label="回显样式" prop="listClass">
         <el-select v-model="form.listClass">
           <el-option

src/views/system/dict/dataList.vue

@@ -46,6 +46,11 @@
           {{ row.status === '10' ? '正常' : '停用' }}
         </template>
       </el-table-column>
+      <el-table-column align="center" label="是否默认" prop="isDefault">
+        <template #default="{ row }">
+          {{ row.isDefault === '10' ? '是' : '否' }}
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="备注" prop="remark" show-overflow-tooltip />
       <el-table-column align="center" label="创建时间" prop="createdTime">
         <template #default="scope">

src/views/system/menu/components/MenuEdit.vue

@@ -42,18 +42,15 @@
             <el-input-number v-model="form.sort" controls-position="right" :min="0" />
           </el-form-item>
         </el-col>
-        <el-col v-if="form.menuType != 'F'" :span="12">
-          <el-form-item prop="isFrame">
+        <el-col v-if="form.menuType == 'C'" :span="12">
+          <el-form-item prop="name">
             <span slot="label">
-              <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
+              <el-tooltip content="路由名称与页面组件name属性一致，使用建议保持唯一。" placement="top">
                 <i class="el-icon-question"></i>
               </el-tooltip>
-              是否外链
+              路由名称
             </span>
-            <el-radio-group v-model="form.isFrame">
-              <el-radio :label="1">是</el-radio>
-              <el-radio :label="0">否</el-radio>
-            </el-radio-group>
+            <el-input v-model="form.name" placeholder="请输入路由名称" />
           </el-form-item>
         </el-col>
         <el-col v-if="form.menuType != 'F'" :span="12">
@@ -115,6 +112,21 @@
             </span>
           </el-form-item>
         </el-col>
+        <el-col v-if="form.menuType != 'F'" :span="12">
+          <el-form-item prop="isFrame">
+            <span slot="label">
+              <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
+                <i class="el-icon-question"></i>
+              </el-tooltip>
+              是否外链
+            </span>
+            <el-radio-group v-model="form.isFrame">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
         <el-col v-if="form.menuType == 'C'" :span="12">
           <el-form-item prop="isCache">
             <span slot="label">
@@ -129,6 +141,8 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="10">
         <el-col v-if="form.menuType != 'F'" :span="12">
           <el-form-item prop="visible">
             <span slot="label">
@@ -277,6 +291,7 @@
         rules: {
           parentId: [{ required: true, trigger: 'blur', message: '请输入父级id' }],
           menuName: [{ required: true, trigger: 'blur', message: '请输入菜单名称' }],
+          name: [{ required: true, trigger: 'blur', message: '请输入路由名称' }],
           path: [{ required: true, trigger: 'blur', message: '请输入路由地址' }],
           component: [{ required: true, trigger: 'blur', message: '请输入组件路径' }],
           // 'meta.title': [

src/views/system/menu/index.vue

@@ -27,6 +27,7 @@
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column label="菜单名称" prop="menuName" show-overflow-tooltip />
       <!--            <el-table-column label="路径" prop="path" show-overflow-tooltip />-->
+      <el-table-column label="路由名称" prop="name" show-overflow-tooltip />
       <el-table-column label="组件路径" prop="component" show-overflow-tooltip />
       <el-table-column label="权限标识" prop="perms" show-overflow-tooltip />
       <el-table-column label="排序" prop="sort" width="60" />

src/views/system/role/components/RoleDataScopeEdit.vue

@@ -14,7 +14,7 @@
           <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item v-show="form.dataScope == 2" label="数据权限">
+      <el-form-item v-show="form.dataScope === '20'" label="数据权限">
         <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
         <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
         <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">

src/views/system/user/components/UserEdit.vue

@@ -104,6 +104,7 @@
       return {
         form: {
           roles: [],
+          status: '10',
         },
         rules: {
           userName: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],