gaibug

src/views/department/MyFile.vue

@@ -33,7 +33,7 @@
                                         <el-dropdown-menu>
                                             <el-dropdown-item @click="restName(item, index)">重命名</el-dropdown-item>
                                             <el-dropdown-item v-if="item.dirType == '2' && isDept" @click="upFirstFoler(item)">编辑</el-dropdown-item>
-                                            <el-dropdown-item v-if="item.dirType == '1'" @click="delName(item, index)">删除</el-dropdown-item>
+                                            <el-dropdown-item v-if="isDept" @click="delName(item, index)">删除</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </template>
                                 </el-dropdown>
@@ -1200,10 +1200,10 @@ export default {
         }
         function getMenu(row, num,canDo) {
             // console.log('delMoreFile',delMoreFile.value);
-            if(delMoreFile.value[0].dirType === "2") return ElMessage({
-                message: "删除失败，组织目录不可删除",
-                type: "error"
-            })
+            // if(delMoreFile.value[0].dirType === "2") return ElMessage({
+            //     message: "删除失败，组织目录不可删除",
+            //     type: "error"
+            // })
             if (row.name === '删除') {
                 if(!canDo) return
                 const datas = []

src/views/myfile/MyFile.vue

@@ -34,8 +34,7 @@
                                     <template #dropdown>
                                         <el-dropdown-menu>
                                             <el-dropdown-item @click="restName(item, index)">重命名</el-dropdown-item>
-                                            <el-dropdown-item v-if="!item.encryptLevel"
-                                                @click="delName(item, index)">删除</el-dropdown-item>
+                                            <el-dropdown-item @click="delName(item, index)">删除</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </template>
                                 </el-dropdown>

src/views/publicment/MyFile.vue

@@ -33,7 +33,7 @@
                                         <el-dropdown-menu>
                                            <el-dropdown-item @click="restName(item, index)">重命名</el-dropdown-item>
                                             <el-dropdown-item v-if="item.dirType == '2' && isDept" @click="upFirstFoler(item)">编辑</el-dropdown-item>
-                                            <el-dropdown-item v-if="item.dirType == '1'" @click="delName(item, index)">删除</el-dropdown-item>
+                                            <el-dropdown-item v-if="isDept" @click="delName(item, index)">删除</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </template>
                                 </el-dropdown>
@@ -1200,10 +1200,10 @@ export default {
             rename.value = true
         }
         function getMenu(row, num,canDo) {
-            if(delMoreFile.value[0].dirType === "2") return ElMessage({
-                message: "删除失败，组织目录不可删除",
-                type: "error"
-            })
+            // if(delMoreFile.value[0].dirType === "2") return ElMessage({
+            //     message: "删除失败，组织目录不可删除",
+            //     type: "error"
+            // })
             if (row.name === '删除') {
                 if(!canDo) return
                 const datas = []

src/views/scanner/info/index.vue

@@ -58,14 +58,14 @@
           删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['scanner:info:export']">
           导出
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="info"
+          type="warning"
           plain
           icon="View"
           :disabled="single"

src/views/system/user/profile/resetPwd.vue

@@ -35,9 +35,21 @@ const equalToPassword = (rule, value, callback) => {
     callback();
   }
 };
+const newPassRule = (rule, value, callback) => {
+  var pPattern = new RegExp(
+    /^.*(?=.{8,})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*?,.?/|!@#$%^&*()~ ]).*$/
+  );
+  if (value === "") {
+    callback(new Error("请输入新密码"));
+  } else if (!pPattern.test(value)) {
+    callback(new Error("密码长度最少为8位，包含大小写字母、数字、特殊字符"));
+  } else {
+    callback();
+  }
+};
 const rules = ref({
   oldPassword: [{ required: true, message: "旧密码不能为空", trigger: "blur" }],
-  newPassword: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }],
+  newPassword: [{ required: true, validator: newPassRule, trigger: "change" }],
   confirmPassword: [{ required: true, message: "确认密码不能为空", trigger: "blur" }, { required: true, validator: equalToPassword, trigger: "blur" }]
 });