lwj-查询航班顺位

@@ -8,7 +8,7 @@ export function login(username, password, rememberMe) {
     rememberMe
   }
   return request({
-    url: '/hello',
+    url: '/auth/login',
     method: 'post',
     data: data
   })

+import request from '@/utils/request'
+
+// 原航班顺位规则界面查询
+export function findSourceFlightRulesApi(data) {
+  return request({
+    url: '/sourceFlight/findSourceFlightRules',
+    method: 'post',
+    data: data
+  })
+}

@@ -55,7 +55,7 @@ export default {
   data() {
     return {
       headers: {
-        Authorization: "Bearer " + getToken()
+        Authorization:  getToken()
       },
       Quill: null,
       currentValue: "",

@@ -65,7 +65,7 @@ export default {
     return {
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken(),
+        Authorization:  getToken(),
       },
       fileList: [],
     };

@@ -45,7 +45,7 @@ export default {
       dialogVisible: false,
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken(),
+        Authorization:  getToken(),
       },
     };
   },

@@ -37,8 +37,8 @@ const user = {
 
       return new Promise((resolve, reject) => {
         login(username, password,rememberMe).then(res => {
-          setToken(res.data.token)
-          commit('SET_TOKEN', res.data.token)
+          setToken(res.data)
+          commit('SET_TOKEN', res.data)
           resolve()
         }).catch(error => {
           reject(error)
@@ -71,7 +71,7 @@ const user = {
     LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {
         logout(state.token).then(() => {
-          
+
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           commit('SET_PERMISSIONS', [])

@@ -9,7 +9,9 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   //baseURL: process.env.VUE_APP_BASE_API,
-  baseURL: 'http://192.168.1.45:8080',
+  //baseURL: 'http://192.168.1.45:18080',
+   baseURL: 'http://192.168.1.134:18080',
+
   // 超时
   timeout: 10000
 })
@@ -18,7 +20,7 @@ service.interceptors.request.use(config => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    config.headers['Authorization'] =  getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
@@ -66,6 +68,7 @@ service.interceptors.response.use(res => {
         })
       })
     } else if (code === 403) {
+      //无权限页面
        location.href = '/401';
     }else if (code === 500) {
       Message({

@@ -13,7 +13,7 @@ export function downLoadZip(str, filename) {
     method: 'get',
     url: url,
     responseType: 'blob',
-    headers: { 'Authorization': 'Bearer ' + getToken() }
+    headers: { 'Authorization':  getToken() }
   }).then(res => {
     resolveBlob(res, mimeMap.zip)
   })

@@ -52,8 +52,8 @@ export default {
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "root",
+        password: "123",
         rememberMe: false
       },
       loginRules: {

 <template>
-  <div>index role</div>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="原航班" prop="sourceFlightNo">
+        <el-input v-model="queryParams.sourceFlightNo" placeholder="请输入原航班" clearable size="small" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
+          <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
+        </el-select>
+
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询原航班配置</el-button>
+      </el-form-item>
+      <br />
+      <el-form-item label="日期" prop="flightDate">
+
+        <el-date-picker v-model="queryParams.flightDate" type="date" placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询实际目的航班</el-button>&#12288;
+        <span style="color: red;">注：原航班+日期查询该日期的航班实际情况</span>
+      </el-form-item>
+      <br />
+      <el-form-item>
+        <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-plus" size="mini">添加规则</el-button>
+        </el-col>
+        &#12288; <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+
+    <el-table v-loading="loading" :data="sourceFlightRulesList">
+
+      <el-table-column label="原航班" align="center" prop="sourceFlightNo"/>
+      <el-table-column label="目的航班排序" align="center" prop="flightRank" width="280"/>
+      <el-table-column label="优先级" align="center" prop="priority"  />
+      <el-table-column label="周期" align="center" prop="dayOfWeek" />
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="开始时间" align="center" prop="startDate"  width="100"/>
+      <el-table-column label="结束时间" align="center" prop="endDate" width="100"/>
+      <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100"/>
+      <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"width="200">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" >修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" >启用</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" >停用</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total>0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
+      :page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" />
+
+  </div>
 </template>
+<script>
+  import {
+  	findSourceFlightRulesApi
+  } from "@/api/sourceFlightRules";
+  export default {
+    name: "SourceFlightRules",
+    data() {
+      return {
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 110,
+        // 原航班规则数据
+        sourceFlightRulesList: [],
+        statusList: [{'id':1,'name':'有效'}, {'id':2,'name':'配置中'},{'id':3,'name':'停用'}],
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          start: 0, //当前条数【代表第几条数据 +1开始】
+          pageNum: 1,
+          limit: 20, //一页显示多少条数据
+          sourceFlightNo: undefined, //原航班号
+          status: undefined, //状态
+          flightDate: undefined //日期
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {}
+      };
+    },
+    created() {
+      this.findSourceFlightRules();
+    },
+    methods: {
+      /** 查询原航班顺位规则*/
+      findSourceFlightRules() {
+        //this.loading = true;
+        if (this.queryParams.pageNum > 1) {
+          this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit + 1
+        }
+       findSourceFlightRulesApi(this.queryParams).then(response => {
+        this.sourceFlightRulesList = response.list;
+        this.total = response.totalCount;
+        this.loading = false;
+      });
 
+      },
+      // 状态字典翻译
+      statusFormat(row) {
+        if(row.status==='1'){
+          return '有效'
+        }else if(row.status==='2'){
+          return '配置中'
+        }else if(row.status==='3'){
+          return '停用'
+        }
+       return row.status;
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.findSourceFlightRules();
+      }
 
+    }
+  };
+</script>

@@ -34,8 +34,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-       // target: `http://localhost:8080`,
-        target: `http://192.168.1.45:8080`,
+        //target: `http://localhost:8080`,
+       // target: `http://192.168.1.45:18080`,
+          target: `http://192.168.1.134:18080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''