Merge branch 'zxm' of http://124.70.32.114:3100/zhangxiaomeng/kechengfuzhu into wzx

kcui/src/view/Graph.vue

@@ -38,7 +38,7 @@
       <div class="rightContent">
 
         <div style="color: white; margin:1vw 2vw 0vw 2vw;width: 100%;">
-          <div style="width: 20vw;display: flex;flex-direction: row;justify-content: space-around;">
+          <div style="width: 100%;display: flex;flex-direction: row;justify-content: space-around;">
               <div style="width: 4vw;">关键字：</div>
 
               <input style="background-color: transparent; border: none; border-bottom: 1px solid white; color: white; outline: none;" placeholder="请输入关键字" v-model="keywords"/>
@@ -55,6 +55,35 @@
                   @change="handleFileChange"
               />
             </div>
+            <div style="margin-left: 1vw;width: 80%;display: flex;flex-direction: row;">
+              <div style="width: 4vw;margin-left: 1vw;margin-top: 0.5vw;">飞机类型:</div>
+              <el-select v-model="value1" filterable placeholder="请选择" style="width: 10vw;">
+                <el-option
+                    v-for="item in options1"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+              <div style="width: 4vw;margin-left: 1vw;margin-top: 0.5vw;">飞行任务:</div>
+              <el-select v-model="value2" filterable placeholder="请选择" style="width: 10vw;">
+                <el-option
+                    v-for="item in options2"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+              <div style="width: 4vw;margin-left: 1vw;margin-top: 0.5vw;">飞机载荷:</div>
+              <el-select v-model="value3" filterable placeholder="请选择" style="width: 10vw;">
+                <el-option
+                    v-for="item in options3"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
 
           </div>
 
@@ -183,6 +212,63 @@ export default {
       newBranchRelation: '',
       typeValue: '',
       keywords: '',
+
+
+      options1: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value1: '',
+
+
+      options2: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value2: '',
+
+
+      options3: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value3: '',
     }
 
   },

kcui/src/view/TWInfoXq.vue

@@ -53,7 +53,7 @@
 
 import headInfo from "@/components/Head.vue";
 import Foot from "@/components/Foot.vue";
-import {getTwInfo} from "@/api/kcInfo";
+import {getInfo} from "@/api/kcInfo";
 export default {
   // eslint-disable-next-line vue/multi-word-component-names
   name: 'TWInfoXq',
@@ -88,7 +88,7 @@ export default {
       var data = {
         id:this.docId
       }
-      getTwInfo(data).then((res)=>{
+      getInfo(data).then((res)=>{
         this.contentInfo.title = res.data.data.name
         this.contentInfo.content = res.data.data.contentInfo