初步完成设备管理页

src/components/Pagination/index.vue

@@ -30,7 +30,7 @@ export default {
     },
     limit: {
       type: Number,
-      default: 20
+      default: 10
     },
     pageSizes: {
       type: Array,

src/main.js

@@ -76,12 +76,6 @@ Vue.mixin({
     deptId:()=>{
       return store.state.user.deptId
     },
-  },
-  created: function () {
-    var myOption = this.$options.myOption
-    if (myOption) {
-      console.log(myOption)
-    }
   }
 })
 

src/views/station/configuration.vue

@@ -11,6 +11,9 @@
         <child3></child3>
       </el-tab-pane>
     </el-tabs>
+
+
+
   </div>
 </template>
 <script>
@@ -18,7 +21,7 @@
   import tabZujianChild2 from './pay/index.vue'
   import tabZujianChild3 from './manage/index.vue'
   export default {
-    name: 'tabZujian',
+    name: 'configuration',
     components:{
       child1:tabZujianChild1,
       child2:tabZujianChild2,

src/views/station/employee.vue

@@ -1,41 +0,0 @@
-<template>
-  <div class="tabZujian">
-    <el-tabs v-model="activeName" >
-      <el-tab-pane label="油站信息" name="info" :key="'info'">
-        <child1></child1>
-      </el-tab-pane>
-      <el-tab-pane label="支付配置" name="pay" :key="'pay'">
-        <child2></child2>
-      </el-tab-pane>
-      <el-tab-pane label="设备管理" name="notice" :key="'notice'">
-        <child3></child3>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-<script>
-  import tabZujianChild1 from './info/index.vue'
-  import tabZujianChild2 from './pay/index.vue'
-  import tabZujianChild3 from './manage/index.vue'
-  export default {
-    name: 'tabZujian',
-    components:{
-      child1:tabZujianChild1,
-      child2:tabZujianChild2,
-      child3:tabZujianChild3
-    },
-    data() {
-      return {
-        activeName: 'info'
-      };
-    },
-    methods: {
-    }
-  };
-</script>
-<style>
-  .tabZujian {
-    margin-left: 20px;
-    margin-top: 20px;
-  }
-</style>

src/views/station/equipment.vue

@@ -0,0 +1,384 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryForm"
+      ref="queryForm"
+      :inline="true"
+      label-width="88px"
+    >
+      <el-form-item label="设备类型" prop="deviceType">
+        <el-select
+          v-model="queryForm.deviceType"
+          clearable
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="dict in deviceTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="设备序列号" prop="deviceSerialNum">
+        <el-input
+          v-model="queryForm.deviceSerialNum"
+          placeholder="请输入设备序列号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button
+          type="info"
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+          >重置</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-table :data="equipmentList">
+      <el-table-column
+        label="主键自增id"
+        v-if="false"
+        align="center"
+        prop="deviceId"
+      />
+      <el-table-column 
+        label="油站名称" 
+        align="center" 
+        prop="stationName"
+        v-if="jiBie===3" 
+      />
+      <el-table-column
+        label="设备序列号"
+        align="center"
+        prop="deviceSerialNum"
+      />
+      <el-table-column label="设备厂家" align="center" prop="deviceFactory" />
+      <el-table-column
+        label="油站名称id"
+        v-if="false"
+        align="center"
+        prop="stationId"
+      />
+      <el-table-column label="绑定油枪号" align="center" prop="gunNo" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      :hidden="total>0? false: true"
+      :total="total"
+      :page.sync="queryForm.pageNum"
+      :limit.sync="queryForm.pageSize"
+      @pagination="getList"
+      :autoScroll="true"
+    />
+
+    <!-- 添加或修改油站设备管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="100px">
+        <el-form-item label="设备编号" prop="deviceNo">
+          <el-input v-model="dialogForm.deviceNo" placeholder="请输入设备编号" />
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="dialogForm.deviceName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="设备序列号" prop="deviceSerialNum">
+          <el-input
+            v-model="dialogForm.deviceSerialNum"
+            placeholder="请输入设备序列号"
+          />
+        </el-form-item>
+        <el-form-item label="设备类型">
+          <el-select
+            v-model="dialogForm.deviceType"
+            placeholder="请选择"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in deviceTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="绑定油枪号" prop="gunNo">
+          <el-checkbox-group v-model="checkedGunList">
+            <el-checkbox
+              v-for="item in gunList"
+              :key="item.oilGunId"
+              :label="item.oilGunNo"
+              :value="item.oilGunNo"
+            >
+              {{ item.oilGunNo + "号枪/" + item.oilName }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="设备状态">
+          <el-select
+            v-model="dialogForm.deviceStatus"
+            clearable
+            size="small"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="dict in deviceStatusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备厂家" prop="deviceFactory">
+          <el-input v-model="dialogForm.deviceFactory" placeholder="请输入设备厂家" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listManage,
+  getManage,
+  delManage,
+  addManage,
+  updateManage,
+  exportManage,
+  changeManageStatus,
+} from "@/api/station/manage";
+import { listGun } from "@/api/station/gun";
+export default {
+  name: "equipment",
+  data() {
+    return {
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 油站设备管理表格数据
+      equipmentList: [],
+      // 油枪复选
+      gunList: [],
+      // 已选的油枪
+      checkedGunList: [],
+      //设备状态
+      deviceStatusOptions: [],
+      //设备类型
+      deviceTypeOptions: [],
+      stationOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 总条数
+      total: 100,
+      // 查询参数
+      queryForm: {
+        pageNum: 1,
+        pageSize: 10, // 初始值只能比10大
+        deviceNo: null,
+        stationId: this.deptId,
+        deviceType: null,
+        deviceSerialNum: null,
+      },
+      // 表单参数
+      dialogForm: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+    //字典设备状态
+    this.getDicts("device_status").then((response) => {
+      this.deviceStatusOptions = response.data;
+    });
+    //字典设备类型
+    this.getDicts("device_type").then((response) => {
+      this.deviceTypeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询油站设备管理列表 */
+    getList() {
+      listManage(this.queryForm).then((response) => {
+        console.log(response)
+        this.equipmentList = response.rows;
+        this.total = response.total;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.dialogForm = {};
+      this.checkedGunList = [];
+    },
+    deviceStatusFotmat(row, column) {
+      if (row.deviceStatus === "1") {
+        return "在用";
+      } else if (row.deviceStatus === "2") {
+        return "停用";
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryForm.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if (this.jiBie === 2) {
+        this.open = true;
+        this.title = "添加油站设备管理";
+        listGun({
+          stationId: this.deptId
+        }).then((response) => {
+          this.gunList = response.rows;
+        });
+      } else {
+        this.msgSuccess("请登录对应的账号");
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      const deviceId = row.deviceId;
+      getManage(deviceId).then((response) => {
+        this.dialogForm = response.data;
+        if (this.dialogForm.gunNo != null && this.dialogForm.gunNo != "") {
+          this.checkedGunList = this.dialogForm.gunNo.split(",");
+        }
+        listGun({
+          stationId:this.deptId
+        }).then((response) => {
+          this.gunList = response.rows;
+        });
+        this.open = true;
+        this.title = "修改油站设备管理";
+      });
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["dialogForm"].validate((valid) => {
+        if (valid) {
+          if (this.dialogForm.deviceId != null) {
+            updateManage(this.dialogForm).then((response) => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addManage(this.dialogForm).then((response) => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceIds = row.deviceId;
+      this.$confirm("是否确认删除油站设备管理", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return delManage(deviceIds);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        });
+    },
+    onInstitutionChang(e) {
+      let obj = {};
+      obj = this.stationOptions.find((item) => {
+        //这里的userList就是上面遍历的数据源
+        return item.deptId === e; //筛选出匹配数据
+      });
+      this.dialogForm.stationName = obj.deptName;
+      listGun({
+        stationId:this.deptId
+      }).then((response) => {
+        this.gunList = response.rows;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryForm = this.queryForm;
+      this.$confirm("是否确认导出所有油站设备管理数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportManage(queryForm);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
+};
+</script>

src/views/station/manage/index.vue

@@ -1,8 +1,17 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="88px"
+    >
       <el-form-item label="设备类型" prop="deviceType">
-        <el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
+        <el-select
+          v-model="queryParams.deviceType"
+          clearable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in deviceTypeOptions"
             :key="dict.dictValue"
@@ -23,52 +32,77 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="info"  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button
+          type="info"
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+          >重置</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
-      <el-table-column label="主键自增id" v-if="false" align="center" prop="deviceId" />
+    <el-table :data="manageList">
+      <el-table-column
+        label="主键自增id"
+        v-if="false"
+        align="center"
+        prop="deviceId"
+      />
       <el-table-column label="油站名称" align="center" prop="stationName" />
-      <el-table-column label="设备序列号" align="center" prop="deviceSerialNum" />
+      <el-table-column
+        label="设备序列号"
+        align="center"
+        prop="deviceSerialNum"
+      />
       <el-table-column label="设备厂家" align="center" prop="deviceFactory" />
-      <el-table-column label="油站名称id" v-if="false" align="center" prop="stationId" />
+      <el-table-column
+        label="油站名称id"
+        v-if="false"
+        align="center"
+        prop="stationId"
+      />
       <el-table-column label="绑定油枪号" align="center" prop="gunNo" />
-      <el-table-column label="设备状态" align="center">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.deviceStatus"
-            active-value="1"
-            inactive-value="2"
-            @change="handleStatusUpdate(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['station:manage:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['station:manage:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
+      :total="100"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
@@ -84,10 +118,18 @@
           <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
         </el-form-item>
         <el-form-item label="设备序列号" prop="deviceSerialNum">
-          <el-input v-model="form.deviceSerialNum" placeholder="请输入设备序列号" />
+          <el-input
+            v-model="form.deviceSerialNum"
+            placeholder="请输入设备序列号"
+          />
         </el-form-item>
-        <el-form-item label="设备类型" >
-          <el-select v-model="form.deviceType"  placeholder="请选择" clearable size="small">
+        <el-form-item label="设备类型">
+          <el-select
+            v-model="form.deviceType"
+            placeholder="请选择"
+            clearable
+            size="small"
+          >
             <el-option
               v-for="dict in deviceTypeOptions"
               :key="dict.dictValue"
@@ -96,21 +138,26 @@
             ></el-option>
           </el-select>
         </el-form-item>
-      
+
         <el-form-item label="绑定油枪号" prop="gunNo">
           <el-checkbox-group v-model="gunNoList">
             <el-checkbox
-              v-for = "item in checkList"
+              v-for="item in checkList"
               :key="item.oilGunId"
               :label="item.oilGunNo"
               :value="item.oilGunNo"
-              >
-              {{item.oilGunNo+"号枪/"+item.oilName}}
+            >
+              {{ item.oilGunNo + "号枪/" + item.oilName }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="设备状态" >
-          <el-select v-model="form.deviceStatus" clearable size="small" placeholder="请选择">
+        <el-form-item label="设备状态">
+          <el-select
+            v-model="form.deviceStatus"
+            clearable
+            size="small"
+            placeholder="请选择"
+          >
             <el-option
               v-for="dict in deviceStatusOptions"
               :key="dict.dictValue"
@@ -132,35 +179,38 @@
 </template>
 
 <script>
-import { listManage, getManage, delManage, addManage, updateManage, exportManage,changeManageStatus } from "@/api/station/manage";
-import{listGun} from "@/api/station/gun";
+import {
+  listManage,
+  getManage,
+  delManage,
+  addManage,
+  updateManage,
+  exportManage,
+  changeManageStatus,
+} from "@/api/station/manage";
+import { listGun } from "@/api/station/gun";
 import { getDept } from "@/api/system/dept";
 export default {
   name: "Manage",
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
       multiple: true,
-      // 显示搜索条件
-      showSearch: true,
+
       // 总条数
       total: 0,
       // 油站设备管理表格数据
       manageList: [],
       //油枪复选
       checkList: [],
-      gunNoList:[],
+      gunNoList: [],
       //设备状态
-      deviceStatusOptions:[],
+      deviceStatusOptions: [],
       //设备类型
-      deviceTypeOptions:[],
-      stationOptions:[],
+      deviceTypeOptions: [],
+      stationOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -170,55 +220,42 @@ export default {
         pageNum: 1,
         pageSize: 10,
         deviceNo: null,
-        deviceName: null,
-        stationId: null,
-        stationName: null,
+        stationId: this.deptId,
         deviceType: null,
         deviceSerialNum: null,
-        gunNo: null,
-        deviceStatus: null,
-        deviceFactory: null
       },
-      deptId:null,
-      queryInfo:{
-        stationId:null
+      deptId: null,
+      queryInfo: {
+        stationId: null,
       },
       // 查询参数
       deptInfo: {},
-      query:{
-        deptId:null
+      query: {
+        deptId: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
     this.getList();
     //字典设备状态
-    this.getDicts("device_status").then(response => {
+    this.getDicts("device_status").then((response) => {
       this.deviceStatusOptions = response.data;
     });
     //字典设备类型
-    this.getDicts("device_type").then(response => {
+    this.getDicts("device_type").then((response) => {
       this.deviceTypeOptions = response.data;
     });
-
   },
   methods: {
     /** 查询油站设备管理列表 */
     getList() {
-      this.loading = true;
-      this.queryParams.stationId = this.$store.selectDeptId;
-      if(this.queryParams.stationId==null || this.queryParams.stationId==""){
-        this.queryParams.stationId =this.$store.state.user.deptId;
-      }
-      listManage(this.queryParams).then(response => {
+      listManage(this.queryParams).then((response) => {
         this.manageList = response.rows;
         this.total = response.total;
-        this.loading = false;
       });
     },
     // 取消按钮
@@ -238,16 +275,16 @@ export default {
         deviceSerialNum: null,
         gunNo: null,
         deviceStatus: null,
-        deviceFactory: null
+        deviceFactory: null,
       };
       this.resetForm("form");
-      this.gunNoList.length=0;
+      this.gunNoList.length = 0;
     },
-    deviceStatusFotmat(row, column){
-      if(row.deviceStatus === '1'){
-        return '在用'
-      }else if(row.deviceStatus === '2'){
-        return '停用'
+    deviceStatusFotmat(row, column) {
+      if (row.deviceStatus === "1") {
+        return "在用";
+      } else if (row.deviceStatus === "2") {
+        return "停用";
       }
     },
     /** 搜索按钮操作 */
@@ -260,47 +297,33 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.deviceId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.deptId=this.$store.selectDeptId;
-      if(this.deptId==null || this.deptId==""){
-        this.deptId =this.$store.state.user.deptId;
+      if (this.jiBie === 2) {
+        this.open = true;
+        this.title = "添加油站设备管理";
+        this.form.stationId = this.deptInfo.deptId;
+        this.form.stationName = this.deptInfo.deptName;
+        this.queryInfo.stationId = this.deptInfo.deptId;
+        listGun(this.queryInfo).then((response) => {
+          console.log(response);
+          this.checkList = response.rows;
+        });
+      } else {
+        this.msgSuccess("请登录对应的账号");
       }
-      getDept(this.deptId).then(response => {
-          this.deptInfo = response.data;
-          if(this.deptInfo.jiBie==2){
-            this.open = true;
-            this.title = "添加油站设备管理";
-            this.form.stationId=this.deptInfo.deptId;
-            this.form.stationName=this.deptInfo.deptName;
-            this.queryInfo.stationId=this.deptInfo.deptId;
-            listGun(this.queryInfo).then(response => {
-              this.checkList = response.rows;
-            });
-          }else{
-              this.msgSuccess("请选择油站");
-          }
-      });
-     
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const deviceId = row.deviceId || this.ids
-      getManage(deviceId).then(response => {
+      const deviceId = row.deviceId;
+      getManage(deviceId).then((response) => {
         this.form = response.data;
-        if(this.form.gunNo!=null &&this.form.gunNo!="" ){
-          this.gunNoList=this.form.gunNo.split(",");
+        if (this.form.gunNo != null && this.form.gunNo != "") {
+          this.gunNoList = this.form.gunNo.split(",");
         }
-        this.queryInfo.stationId=this.form.stationId;
-        listGun(this.queryInfo).then(response => {
+        this.queryInfo.stationId = this.form.stationId;
+        listGun(this.queryInfo).then((response) => {
           this.checkList = response.rows;
         });
         this.open = true;
@@ -308,35 +331,21 @@ export default {
       });
     },
 
-    handleStatusUpdate(row){
-      let text = row.deviceStatus === "1" ? "启用" : "停用";
-      this.$confirm('确认要"' + text + '""' + row.deviceSerialNum + '"设备吗?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-          return changeManageStatus(row.deviceId, row.deviceStatus);
-      }).then(() => {
-        this.msgSuccess(text + "成功");
-        this.handleQuery();
-      });
-
-    },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          if(this.gunNoList !=null && this.gunNoList.length>0){
-            this.form.gunNo=this.gunNoList.toString();
+          if (this.gunNoList != null && this.gunNoList.length > 0) {
+            this.form.gunNo = this.gunNoList.toString();
           }
           if (this.form.deviceId != null) {
-            updateManage(this.form).then(response => {
+            updateManage(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addManage(this.form).then(response => {
+            addManage(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -347,42 +356,47 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const deviceIds = row.deviceId || this.ids;
-      this.$confirm('是否确认删除油站设备管理', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+      const deviceIds = row.deviceId;
+      this.$confirm("是否确认删除油站设备管理", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
           return delManage(deviceIds);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+        });
     },
-    onInstitutionChang(e){
+    onInstitutionChang(e) {
       let obj = {};
-      obj = this.stationOptions.find((item)=>{//这里的userList就是上面遍历的数据源
-        return item.deptId === e;//筛选出匹配数据
-      })
-      this.form.stationName=obj.deptName;
-      this.queryInfo.stationId=obj.deptId;
-      listGun(this.queryInfo).then(response => {
+      obj = this.stationOptions.find((item) => {
+        //这里的userList就是上面遍历的数据源
+        return item.deptId === e; //筛选出匹配数据
+      });
+      this.form.stationName = obj.deptName;
+      this.queryInfo.stationId = obj.deptId;
+      listGun(this.queryInfo).then((response) => {
         this.checkList = response.rows;
       });
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有油站设备管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+      this.$confirm("是否确认导出所有油站设备管理数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
           return exportManage(queryParams);
-        }).then(response => {
-          this.download(response.msg);
         })
-    }
-  }
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
 };
 </script>

src/views/station/oilgun.vue

@@ -0,0 +1,52 @@
+<template>
+<div>
+<el-upload
+  action="https://jsonplaceholder.typicode.com/posts/"
+  list-type="picture-card"
+  :on-preview="handlePictureCardPreview"
+  :on-remove="handleRemove"
+  :before-upload="beforeUpload"
+  :on-error="onError"
+  :on-success="onSuccess"
+>
+
+  <i class="el-icon-plus"></i>
+</el-upload>
+<el-dialog :visible.sync="dialogVisible">
+  <img width="100%" :src="dialogImageUrl" alt="">
+</el-dialog>
+</div>
+</template>
+<script>
+
+  export default {
+    data() {
+      return {
+        dialogImageUrl: '',
+        dialogVisible: false
+      };
+    },
+    
+    methods: {
+      onSuccess(response, file, fileLis){
+        console.log("onSuccess")
+        console.log(response, file, fileLis)
+      },
+      onError(err, file, fileList){
+        console.log("onError")
+        console.log(err, file, fileList)
+      },
+      beforeUpload(file){
+        console.log("beforeUpload")
+        console.log(file)
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      }
+    }
+  }
+</script>

src/views/station/pay/index.vue

@@ -36,13 +36,14 @@
           :headers="headers"
           multiple
           list-type="picture-card"
-          :limit='5'
+          :limit="4"
           :file-list="ruleForm.imgFileList"
           accept="image/gif,image/jpeg,image/png,image/jpg,image/bmp"
           :before-upload="beforeAvatarUpload"
           :on-remove="handleRemove"
           :on-success="handlepaymentSuccess"
-          :auto-upload="true">
+          :auto-upload="true"
+        >
           <i class="el-icon-plus"></i>
           <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，单张图片不超过1M</div>
         </el-upload>
@@ -140,6 +141,7 @@ export default {
   created() {
     this.look();
     this.getDicts("image_photos_flag").then(response => {
+      
       this.imagePhotosFlagOptions = response.data;
     });
     this.query.deptId =this.$store.selectDeptId;
@@ -166,6 +168,12 @@ export default {
     });
 
   },
+  mounted(){
+    setTimeout(() => {
+console.log(this.ruleForm)
+    },1000)
+    
+  },
   methods: {
     handleRemove(file, fileList) {
       if(fileList!=null && fileList.length>0){

vue.config.js

@@ -36,6 +36,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://localhost:8080`,
+        // target:"http://www.huijy.net:9001/",
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''