Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/views/systemSettings/warningEdit/index.vue

@@ -501,15 +501,23 @@ const sysServiceWarn = async () => {
   }
 };
 //获取弹框-下拉数据
-const getSelectData = async (id, name) => {
+const getSelectData = async (id, name, dataNme) => {
   const { code, returnData } = await Query({
     id,
     dataContent: name ? [name] : name === null ? [null] : [],
   });
   if (code == 0) {
-    return returnData.listValues;
+    // return returnData.listValues;
+    if (dataNme === "beginNode") {
+      tableOptionser.value = returnData.listValues;
+    } else if (dataNme === "endNode") {
+      tableOptionbegin.value = returnData.listValues;
+    } else if (dataNme === "endPosition") {
+      tableOptionend.value = returnData.listValues;
+    } else if (dataNme === "endPosition") {
+      tableOptionendPos.value = returnData.listValues;
+    }
   } else {
-    return [];
   }
 };
 //获取表格数据
@@ -535,20 +543,24 @@ const getQuery = async () => {
       tableCols.value = returnData.columnSet;
       returnData.columnSet.forEach((item) => {
         if (item.listqueryTemplateID && item.columnName === "beginNode") {
-          tableOptionser.value = getSelectData(item.listqueryTemplateID);
+          getSelectData(item.listqueryTemplateID, "", "beginNode");
+          // tableOptionser.value = getSelectData(item.listqueryTemplateID);
         } else if (
           item.listqueryTemplateID &&
           item.columnName === "beginPosition"
         ) {
-          tableOptionbegin.value = getSelectData(item.listqueryTemplateID);
+          getSelectData(item.listqueryTemplateID, "", "beginPosition");
+          // tableOptionbegin.value = getSelectData(item.listqueryTemplateID);
           beginPositionId.value = item.listqueryTemplateID;
         } else if (item.listqueryTemplateID && item.columnName === "endNode") {
-          tableOptionend.value = getSelectData(item.listqueryTemplateID);
+          getSelectData(item.listqueryTemplateID, "", "endNode");
+          // tableOptionend.value = getSelectData(item.listqueryTemplateID);
         } else if (
           item.listqueryTemplateID &&
           item.columnName === "endPosition"
         ) {
-          tableOptionendPos.value = getSelectData(item.listqueryTemplateID);
+          getSelectData(item.listqueryTemplateID, "", "endPosition");
+          // tableOptionendPos.value = getSelectData(item.listqueryTemplateID);
           endPositionId.value = item.listqueryTemplateID;
         }
       });

src/views/systemSettings/warningSet/index.vue

@@ -244,12 +244,13 @@ const addForm = () => {
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
-  tableForm.text = "";
+  tableForm.IATACode = "";
+  tableForm.departmentAirport = "";
+  tableForm.landingAirport = "";
+  tableForm.flightNo = "";
+  tableForm.startDate = "";
+  tableForm.endDate = "";
+  tableForm.event = "";
 };
 //编辑
 // const editDialog = (data) => {

src/views/userManagement/role/auth.vue

@@ -13,8 +13,8 @@
             </el-form-item>
             <el-form-item label="是否启用" prop="role_status">
               <el-radio-group disabled v-model="ruleForm.role_status">
-                <el-radio label="1">启用</el-radio>
-                <el-radio label="2"> 禁用</el-radio>
+                <el-radio :label="1">启用</el-radio>
+                <el-radio :label="2"> 禁用</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-form>