ronaldo9Zhang 2 lat temu
rodzic
commit
9416a07666

+ 4 - 1
src/views/page/breadCrumb.vue

@@ -227,10 +227,13 @@ export default {
     .nameBox {
         position: absolute;
         top: 4px;
-        right: 20px;
+        // right: 20px;
+        right: 0;
         z-index: 669;
         display: flex;
         height: 40px;
+        padding: 0 20px;
+        background-color: #ffffff;
 
         div {
             height: 40px;

+ 4 - 2
src/views/personalInformation/personalInformation.vue

@@ -303,7 +303,8 @@
                     nickname: this.userInfo.nickname,
                     phone: this.userInfo.phone
                 }
-                this.phoneDialogVisible = true
+                this.phoneDialogVisible = true;
+                this.$refs.phoneForm.clearValidate();
             },
             changePassword(){
                 this.passwordForm = {
@@ -311,7 +312,8 @@
                     newPassword: '',
                     confirmPassword: ''
                 }
-                this.passwordDialogVisible = true
+                this.passwordDialogVisible = true;
+                this.$refs.passwordForm.clearValidate();
             },
             confirmChangePhone(){
                 this.$refs.phoneForm.validate(valid => {

+ 3 - 2
src/views/workManagement/manualRunProjectList.vue

@@ -150,6 +150,7 @@
                 <el-table-column label="操作" slot="cgInfos" align="center">
                     <template v-slot="scope">
                         <i
+                            v-if="scope.row.nowRunState != '10'"
                             @click="
                                 viewRow(scope.row.id, scope.row.projectName)
                             "
@@ -548,8 +549,8 @@ export default {
 
             for (let index = 0; index < checkedArr.length; index++) {
                 const row = checkedArr[index];
-                if (row.nowRunState != "10") {
-                    this.$message.error("存在执行数据,请重新选择");
+                if (row.nowRunState === "20") {
+                    this.$message.error("存在执行中的数据,请重新选择");
                     return;
                 }
                 arr.push(row.id);