Browse Source

修改显示

lex 1 year ago
parent
commit
6e67abd912

+ 11 - 9
src/page-instrument/view-figner/change-subject/index.tsx

@@ -17,27 +17,28 @@ export default defineComponent({
   emits: ["close", "confirm"],
   setup(props, { emit }) {
     const state = reactive({
-      subjectValue: props.subject || "",
-      instrumentCode: "",
+      subjectValue: null as any,
+      instrumentCode: null as any,
       selectList: [] as any,
     });
 
     //
     const selectItem = () => {
-      const i = props.subjectList.find((item: any) => item.value === props.subject);
+      const i: any = props.subjectList.find((item: any) => item.value === props.subject);
       if (!i) {
         props.subjectList.forEach((item: any) => {
           if (item.children && item.children.length > 0) {
             item.children.forEach((child: any) => {
               if (child.value === props.subject) {
                 state.instrumentCode = child.value;
+                state.subjectValue = item.id;
+                state.selectList = item.children;
               }
             });
           }
-          if (state.instrumentCode) {
-            state.subjectValue = item.value;
-          }
         });
+      } else {
+        state.subjectValue = i.id;
       }
     };
 
@@ -52,13 +53,14 @@ export default defineComponent({
           <div class={styles.subjectContainer}>
             {props.subjectList.map((item: any) => (
               <div
-                class={[styles.subjectItem, item.children.length > 0 && styles.arrow, item.value === state.subjectValue && styles.active]}
+                class={[styles.subjectItem, item.children.length > 0 && styles.arrow, item.id === state.subjectValue && styles.active]}
                 onClick={() => {
-                  state.subjectValue = item.value;
-                  state.selectList = item.children;
                   if (item.children.length <= 0) {
                     state.instrumentCode = "";
                   }
+                  state.subjectValue = item.id;
+                  state.instrumentCode = item.value;
+                  state.selectList = item.children;
                 }}
               >
                 {item.text}

+ 8 - 2
src/page-instrument/view-figner/index.tsx

@@ -290,6 +290,7 @@ export default defineComponent({
       try {
         // api_subjectList
         const subjects = await api_subjectList({
+          hasInstrument: true,
           enableFlag: true,
           delFlag: 0,
           page: 1,
@@ -323,8 +324,13 @@ export default defineComponent({
           }
           data.subjects.push(tempList);
         });
-        // console.log(data.subjects, "subjects");
-      } catch {
+
+        data.subjects.forEach((item: any) => {
+          if (item.value === data.subject && item.children?.length > 1) {
+            data.subject = item.children[0].value;
+          }
+        });
+      } catch (e) {
         //
       }
     };

+ 2 - 2
vite.config.ts

@@ -64,8 +64,8 @@ export default defineConfig({
         rewrite: (path) => path.replace(/^\/orchestra/, ""),
       },
       "^/instrument/.*": {
-        target: "https://dev.kt.colexiu.com",
-        // target: "https://test.lexiaoya.cn",
+        // target: "https://dev.kt.colexiu.com",
+        target: "https://test.lexiaoya.cn",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),
       },