yuhan 2 months ago
parent
commit
2a3a26178a

+ 2 - 1
src/views/module_interLock/baseScheduleSet/BaseScheduleSetList.vue

@@ -194,7 +194,8 @@
           }
           }
         ],
         ],
 		url: {
 		url: {
-          list: "/sys/quartzJob/list",
+          list: "/sys/quartzJob/list1",
+          // list: "/sys/quartzJob/list",
           delete: "/sys/quartzJob/delete",
           delete: "/sys/quartzJob/delete",
           deleteBatch: "/sys/quartzJob/deleteBatch",
           deleteBatch: "/sys/quartzJob/deleteBatch",
           pause: "/sys/quartzJob/pause",
           pause: "/sys/quartzJob/pause",

+ 6 - 6
src/views/module_interLock/systemUser/modules/SystemUserForm.vue

@@ -29,7 +29,7 @@
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
           </template>
           </template>
-          <template v-if="model.interlockUserType === 'normal' && !isExistSSO && !userDisabled">
+          <template v-if="model.interlockUserType === 'normal' && !model.isExistSSO && !userDisabled">
             <a-col :span="24">
             <a-col :span="24">
               <a-form-model-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password">
               <a-form-model-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password">
                 <a-input-password autocomplete="new-password" v-model="model.password" placeholder="请输入登录密码" />
                 <a-input-password autocomplete="new-password" v-model="model.password" placeholder="请输入登录密码" />
@@ -119,7 +119,8 @@ import { postAction } from '../../../../api/manage'
       return {
       return {
         userDisabled: false, // 修改时用户名不可修改
         userDisabled: false, // 修改时用户名不可修改
         model:{
         model:{
-          interlockUserType: 'email'
+          interlockUserType: 'email',
+          isExistSSO: true, // 用户是否为非邮箱格式且sso中无当前用户 true存在false不存在
         },
         },
         labelCol: {
         labelCol: {
           xs: { span: 24 },
           xs: { span: 24 },
@@ -193,7 +194,6 @@ import { postAction } from '../../../../api/manage'
         indeterminateManageHeader: false,
         indeterminateManageHeader: false,
         viewHeader: false,
         viewHeader: false,
         indeterminateViewHeader: false,
         indeterminateViewHeader: false,
-        isExistSSO: true, // 用户是否为非邮箱格式且sso中无当前用户 true存在false不存在
       }
       }
     },
     },
     computed: {
     computed: {
@@ -238,14 +238,14 @@ import { postAction } from '../../../../api/manage'
       handleBlur(){
       handleBlur(){
         // 本地测试
         // 本地测试
         // if(this.model.usernameNormal === 'asd'){
         // if(this.model.usernameNormal === 'asd'){
-        //   this.isExistSSO = false
+        //   this.model.isExistSSO = false
         // } else {
         // } else {
-        //   this.isExistSSO = true
+        //   this.model.isExistSSO = true
         // }
         // }
         // 判断sso中是否有当前账户
         // 判断sso中是否有当前账户
         postAction('/iotedgeCollectData/iotedgeCollectData/ifUserInSoo', {userName: this.model.username}).then(res => {
         postAction('/iotedgeCollectData/iotedgeCollectData/ifUserInSoo', {userName: this.model.username}).then(res => {
           if(res.success){
           if(res.success){
-            this.isExistSSO = res.result
+            this.model.isExistSSO = res.result
           } else {
           } else {
             this.$message.warning(res.message)
             this.$message.warning(res.message)
           }
           }