Merge branch 'main' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationPc into lijinlong

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 若依管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.108:9015'
+VUE_APP_BASE_API = 'http://192.168.0.119:9015'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -48,6 +48,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "node-forge": "^1.3.1",
     "nprogress": "0.2.0",
     "quill": "2.0.2",
     "screenfull": "5.0.2",

src/layout/components/TagsView/index.vue

@@ -27,7 +27,7 @@
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
-          <span class="user-name">{{ name }}</span>
+          <span class="user-name">{{ nickName }}</span>
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -73,7 +73,7 @@ export default {
     // }
     ...mapGetters([
       'avatar',
-      'name'
+      'nickName'
     ]),
   },
   watch: {

src/store/getters.js

@@ -8,6 +8,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  nickName: state => state.user.nickName,
   useer: state => state.user.useer,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,

src/store/modules/user.js

@@ -6,6 +6,7 @@ const user = {
     token: getToken(),
     id: '',
     name: '',
+    nickName: '',
     avatar: '',
     roles: [],
     permissions: [],
@@ -22,6 +23,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_NICK_NAME: (state, name) => {
+      state.nickName = name
+    },
     SET_NAMEUSE: (state, name) => {
       state.useer = name
     },
@@ -68,6 +72,7 @@ const user = {
           }
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.userName)
+          commit('SET_NICK_NAME', user.nickName)
           commit('SET_NAMEUSE', user)
           commit('SET_AVATAR', avatar)
           resolve(res)

src/views/auditPages/assetsManagement/assetsAuth.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="L-assets-info">
+    <el-backtop target=".L-assets-info" />
     <div class="assets-info-top">
       <el-row style="margin: 10px 0;">
         <span class="top-title-box">基本信息</span>
@@ -9,19 +10,19 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="系统名称" required>
-                <el-input v-model="ruleForm.xtmc"></el-input>
+                <el-input v-model="ruleForm.xtmc" placeholder="请输入系统名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="单位名称" required>
-                <el-input v-model="ruleForm.dwmc"></el-input>
+                <el-input v-model="ruleForm.dwmc" placeholder="请输入单位名称"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="系统域名">
-                <el-input v-model="ruleForm.xtym"></el-input>
+                <el-input v-model="ruleForm.xtym" placeholder="请输入系统域名"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -89,7 +90,7 @@
                   <el-col :span="23">
                     <el-input v-model="domain.key" placeholder="请输入关联域名"></el-input>
                   </el-col>
-                  <el-col :span="1" style="text-align: center;">
+                  <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                     <i @click="addForm('glymList')" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                     <i @click="removeDomainOne(domain,'glymList')" v-else class="el-icon-remove-outline" style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                   </el-col>
@@ -128,7 +129,7 @@
                   <el-col :span="23">
                     <el-input v-model="domain.key" placeholder="请输入关联IP"></el-input>
                   </el-col>
-                  <el-col :span="1" style="text-align: center;">
+                  <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                     <i @click="addForm('glIpList')" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                     <i @click="removeDomainOne(domain,'glIpList')" v-else class="el-icon-remove-outline" style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                   </el-col>
@@ -449,8 +450,8 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24" style="text-align: right;margin: 10px 0;" v-if="!isMore">
-              <el-button @click="isMore = true" :disabled="false">更多</el-button>
+            <el-col :span="24" style="text-align: right;margin: 10px 0;">
+              <el-button @click="isMore = !isMore" :disabled="false">{{ isMore ? '收起' : '更多' }}</el-button>
             </el-col>
           </el-row>
           <!-- 隐藏部分 -->
@@ -777,7 +778,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
+              <el-row v-if="$route.query.pageType !== 'look'">
                 <el-col :span="24">
                   <el-form-item prop="btn">
                     <el-button @click="addOtherConcat('otherConcat')">添加其他联系人</el-button>
@@ -1290,7 +1291,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :prop="'chepingUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
+                    :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]"
+                  >
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1314,7 +1323,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('chepingUnit', 1)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'chepingUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1328,7 +1337,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :prop="'yjgysUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
+                    :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]"
+                  >
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1352,7 +1369,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('yjgysUnit', 2)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'yjgysUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1366,7 +1383,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :prop="'jfywUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
+                    :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]"
+                  >
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1390,7 +1415,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('jfywUnit', 3)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'jfywUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1404,7 +1429,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :prop="'xtsjUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
+                    :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]"
+                  >
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1428,7 +1461,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('xtsjUnit', 4)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'xtsjUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1442,7 +1475,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" required :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" required :prop="'xtjsUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
+                    :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]"
+                  >
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1485,7 +1526,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('xtjsUnit', 5)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'xtjsUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1499,7 +1540,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" required :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :prop="'xtyyUnit.' + index + '.tyshxydm'" required :label="'统一社会信用代码' + (index == 0 ? '' : index)"
+                    :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]"
+                  >
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1542,7 +1591,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('xtyyUnit', 7)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'xtyyUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1556,7 +1605,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :prop="'aqfwUnit.' + index + '.tyshxydm'" :label="'统一社会信用代码' + (index == 0 ? '' : index)"
+                    :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]"
+                  >
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1580,7 +1637,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('aqfwUnit', 6)" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain,'aqfwUnit')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 </el-col>
@@ -1678,7 +1735,7 @@
                 </el-col>
               </el-row>
             </div>
-            <el-row>
+            <el-row v-if="$route.query.pageType !== 'look'">
               <el-form-item>
                 <el-button @click="addServer('fwqxx', 1)">添加服务器</el-button>
               </el-form-item>
@@ -1752,7 +1809,7 @@
                 </el-col>
               </el-row>
             </div>
-            <el-row>
+            <el-row v-if="$route.query.pageType !== 'look'">
               <el-form-item>
                 <el-button @click="addServer('wlsb', 2)">添加网络设备</el-button>
               </el-form-item>
@@ -1826,7 +1883,7 @@
                 </el-col>
               </el-row>
             </div>
-            <el-row>
+            <el-row v-if="$route.query.pageType !== 'look'">
               <el-form-item>
                 <el-button @click="addServer('aqsb', 3)">添加安全设备</el-button>
               </el-form-item>
@@ -2667,11 +2724,11 @@
                 </myUpload>
               </el-form-item>
             </el-row>
-            <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
-              <el-button type="danger">不通过</el-button>
-              <el-button type="primary" @click="newAssets" :loading="loading">通过</el-button>
-            </el-row>
           </div>
+          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType !== 'look'">
+            <el-button type="danger" @click="sendBack">取消</el-button>
+            <el-button type="primary" @click="newAssets" :loading="loading">保存</el-button>
+          </el-row>
         </el-form>
       </div>
     </div>
@@ -2872,6 +2929,16 @@ export default {
       this.getInfo(this.$route.query.id)
       this.disabled = true;
       this.isMore = true;
+      this.$nextTick(()=>{
+        const inputElements = document.querySelectorAll('.el-input__inner');
+        const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+        inputElements.forEach((input) => {
+          input.placeholder = '';
+        });
+        textareaInputElements.forEach((input) => {
+          input.placeholder = '';
+        });
+      })
     } else if(this.$route.query.pageType == 'change') {
       this.getInfo(this.$route.query.id)
       this.disabled = false;
@@ -3085,6 +3152,9 @@ export default {
         })
       }
     },
+    sendBack(){
+      this.$router.go(-1);
+    },
   },
   beforeRouteEnter(to,from,next){
     if(to.query.pageType == 'add') {

src/views/auditPages/assetsManagement/index.vue

@@ -280,12 +280,12 @@ export default {
     handleExport(){
       this.download('/tc/assetCurrent/export', {
         ...this.formInline
-      }, `asset_${new Date().getTime()}.xlsx`)
+      }, `资产${new Date().getTime()}.xlsx`)
     },
     /** 下载模板操作 */
     importTemplate() {
       this.download('/tc/assetCurrent/importTemplate', {
-      }, `asset${new Date().getTime()}.xlsx`)
+      }, `资产导入模板${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {

src/views/auditPages/unitManagement/index.vue

@@ -42,7 +42,7 @@
               <el-form-item label="所属行业" required>
                 <el-select v-model="ruleForm.sshy" placeholder="请选择所属行业">
                   <el-option
-                    v-for="dict in dict.type.zc_xtzyx"
+                    v-for="dict in dict.type.sshy"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -110,7 +110,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="统一社会信用代码" required>
+              <el-form-item label="统一社会信用代码" prop="userName">
                 <el-input v-model="ruleForm.userName" placeholder="请输入统一社会信用代码"></el-input>
               </el-form-item>
             </el-col>
@@ -353,14 +353,14 @@
                         <el-input v-model="domain.qtlxrzwzc" style="width: 100%;" placeholder="请输入职务职称"></el-input>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="1" style="text-align: center;">
+                    <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                       <i @click="removeDomain(domain,'otherConcat')" class="el-icon-remove-outline" style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                     </el-col>
                   </el-row>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
+            <el-row v-if="$route.query.pageType !== 'look'">
               <el-col :span="24">
                 <el-form-item prop="btn">
                   <el-button @click="addForm('otherConcat')">添加其他联系人</el-button>
@@ -395,7 +395,7 @@
                   <el-input v-model="domain.lxdh" placeholder="请输入系统名称"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="1" style="text-align: center;">
+              <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                 <i @click="addGongyinglian('jcxxList')" v-if="index == 0" class="el-icon-circle-plus-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                 <i @click="removeDomain(domain,'jcxxList')" v-else class="el-icon-remove-outline" style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
               </el-col>
@@ -462,7 +462,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
+          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType !== 'look'">
             <el-button type="danger" @click="cancel" :disabled="false">取消</el-button>
             <el-button type="primary" @click="newUnit" :disabled="false">确定</el-button>
           </el-row>
@@ -477,6 +477,20 @@ import { lookUnit, postUnit } from "@/api/auditPagesApi/index";
 export default {
   dicts:['zc_xtzyx', 'is_no', 'sshy', 'dwlx', 'dwjs', 'dwzsxz', 'dbxx_dbdj'],
   data() {
+    const validateTyshxydm = (rule, value, callback) => {
+      const pattern = /^[a-zA-Z0-9]{18}$/;
+      if (!pattern.test(value)) {
+        callback(new Error('请输入正确格式的18位统一社会信用代码'));
+        return;
+      } 
+      callback();
+      // if (value.length!== 18) {
+      //   callback(new Error('请输入18位统一社会信用代码'));
+      //   return;
+      // } else {
+      //   callback();
+      // }
+    }
     return {
       options: pcas ,
       props:{
@@ -506,19 +520,8 @@ export default {
         ],
       },
       rules:{
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
+        userName: [
+          { required: true, trigger: "blur" ,validator: validateTyshxydm},
         ]
       },
       disabled:false,
@@ -529,6 +532,16 @@ export default {
     if(this.$route.query.pageType == 'look') {
       this.getInfo(this.$route.query.id)
       this.disabled = true;
+      this.$nextTick(()=>{
+        const inputElements = document.querySelectorAll('.el-input__inner');
+        const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+        inputElements.forEach((input) => {
+          input.placeholder = '';
+        });
+        textareaInputElements.forEach((input) => {
+          input.placeholder = '';
+        });
+      })
     } else if(this.$route.query.pageType == 'change') {
       this.getInfo(this.$route.query.id)
       this.disabled = false;
@@ -583,7 +596,7 @@ export default {
         this.$router.go(-1);
         return;
       }
-      if(this.ruleForm.ssqy.length > 0) {
+      if(this.ruleForm.ssqy?.length > 0) {
         this.ruleForm.ssqyprovince = this.ruleForm.ssqy[0]
         this.ruleForm.ssqycity = this.ruleForm.ssqy[1]
         this.ruleForm.ssqycounty = this.ruleForm.ssqy[2]

src/views/login.vue

@@ -55,9 +55,9 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-login-footer">
+    <!-- <div class="el-login-footer">
       <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -65,6 +65,7 @@
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import forge from 'node-forge'
 
 export default {
   name: "Login",
@@ -92,7 +93,8 @@ export default {
       captchaEnabled: true,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
+      publicKey:`MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl8bS1kYTiMhIS5MZU253bc0ukaxrA1lfCziABFxQrC2c09tMrQGjuH6V1x2ofNBMGhOD9uWN/qkAQy/HwOe/NKUqCw6N0ov6guSrqMDW/BdZ3Bl0rmM1/95jTC1xffFFvej7xWNffIbaPI+bJ4WLX9NViNi9HmT0BRNzJ4d2R86LPPCa+bxLaPjsh2R2tBkbLkUot9769aJaPPiwPCZHMkuQenjHSmpWL0okleqMH8EGX7j6A5A/4IUXPMNKMMzkiSRpsIJ65GJmDAbnR3ZXRfC8MzVBBJB6zr5N0F4N9xZfF+JS/Yx726tCu+rA6GDCyTxtQ/wnKpPdwFP5nUWCWQIDAQAB`
     };
   },
   watch: {
@@ -140,7 +142,27 @@ export default {
             Cookies.remove("password");
             Cookies.remove('rememberMe');
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
+          // 生成一个 2048 位的 RSA 密钥对
+          const lines = [];
+          lines.push('-----BEGIN PUBLIC KEY-----');
+          for (let i = 0; i < this.publicKey.length; i += 64) {
+            lines.push(this.publicKey.slice(i, i + 64));
+          }
+          lines.push('-----END PUBLIC KEY-----');
+          lines.join('\n')
+          const publicKey = forge.pki.publicKeyFromPem(lines.join('\n'));
+          // 将待加密的字符串转换为字节数组
+          var dataBytes = forge.util.encodeUtf8(this.loginForm.password);
+          // 加密数据
+          var encryptedBytes = publicKey.encrypt(dataBytes, 'RSA-OAEP', {
+            md: forge.md.sha256.create(),
+            mgf1: {
+              md: forge.md.sha1.create()
+            }
+          });
+          // 将加密后的字节数组转换为 Base64 编码的字符串
+          var encryptedBase64 = forge.util.encode64(encryptedBytes);
+          this.$store.dispatch("Login", {...this.loginForm, password: encryptedBase64}).then(() => {
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;

src/views/system/user/index.vue

@@ -156,7 +156,7 @@
             <el-form-item label="单位类型：" prop="dwlx">
               <el-select
                 v-model="queryParams.dwlx"
-                placeholder="用户状态"
+                placeholder="请选择单位类型"
                 clearable
               >
                 <el-option
@@ -198,7 +198,6 @@
               icon="el-icon-upload2"
               size="mini"
               @click="handleImport"
-              v-hasPermi="['system:user:import']"
             >导入</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -208,7 +207,6 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['system:user:export']"
             >导出</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -218,7 +216,6 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['system:user:add']"
             >新增单位</el-button>
           </el-col>
         </el-row>
@@ -238,7 +235,7 @@
             <template slot-scope="scope">{{ scope.row.userName }}</template>
           </el-table-column>
           <el-table-column label="所属区域" align="center" key="ssqycounty" prop="ssqycounty">
-            <template slot-scope="scope">{{ scope.row.ssqycity }}</template>
+            <template slot-scope="scope">{{ getSsqu(scope.row) }}</template>
           </el-table-column>
           <el-table-column label="所属行业" align="center" key="sshy" prop="sshy">
             <template slot-scope="scope">
@@ -252,17 +249,17 @@
           <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
             <template slot-scope="scope">
               <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;cursor: pointer;">
+                <div style="display: flex;align-items: center;cursor: pointer;"@click="handleLookdate(scope.row)">
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="handleLookdate(scope.row)" style="color: #1485EF;">查看</span>
+                  <span class="look-info" style="color: #1485EF;">查看</span>
                 </div>
-                <div style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;">
+                <div style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;" @click="handleUpdate(scope.row)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" @click="handleUpdate(scope.row)" style="color: #1485EF;">编辑</span>
+                  <span class="look-info" style="color: #1485EF;">编辑</span>
                 </div>
-                <div style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;">
+                <div style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;" @click="handleDelete(scope.row)">
                   <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="handleDelete(scope.row)" style="color: #F50C0C;">删除</span>
+                  <span class="look-info" style="color: #F50C0C;">删除</span>
                 </div>
               </div>
             </template>
@@ -443,6 +440,17 @@ export default {
         }
       );
     },
+    getSsqu(row) {
+      if(row.ssqyprovince && row.ssqycity && row.ssqycounty) {
+        return row.ssqyprovince + "/" + row.ssqycity + '/' + row.ssqycounty
+      } else if(row.ssqyprovince && row.ssqycity) {
+        return row.ssqyprovince + "/" + row.ssqycity
+      } else if(row.ssqyprovince) {
+        return row.ssqyprovince
+      } else {
+        return
+      }
+    },
     // 页码获取
     getPagination(pages){
       this.queryParams.current = pages.page;
@@ -495,7 +503,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除单位id为"' + userIds + '"的数据项？').then(function() {
         return delUnit(userIds);
       }).then(() => {
         this.getList();

src/views/unitPages/myAssets/index.vue

@@ -24,15 +24,13 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="系统状态：" prop="xtzt">
-              <el-select v-model="formInline.xtzt" placeholder="请选择">
-                <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
-                  <el-option
-                    v-for="dict in dict.type.zc_xtzt"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value">
-                  </el-option>
-                </el-select>
+              <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
+                <el-option
+                  v-for="dict in dict.type.zc_xtzt"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>