瀏覽代碼

BUG修改

JX.Li 1 年之前
父節點
當前提交
aea2945ba6
共有 3 個文件被更改,包括 32 次插入35 次删除
  1. 0 35
      build/index.js
  2. 16 0
      src/views/gas/courtyardNetworkManagement/index.vue
  3. 16 0
      src/views/gas/regulatorBox/index.vue

+ 0 - 35
build/index.js

@@ -1,35 +0,0 @@
-const { run } = require('runjs')
-const chalk = require('chalk')
-const config = require('../vue.config.js')
-const rawArgv = process.argv.slice(2)
-const args = rawArgv.join(' ')
-
-if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
-  const report = rawArgv.includes('--report')
-
-  run(`vue-cli-service build ${args}`)
-
-  const port = 9526
-  const publicPath = config.publicPath
-
-  var connect = require('connect')
-  var serveStatic = require('serve-static')
-  const app = connect()
-
-  app.use(
-    publicPath,
-    serveStatic('./dist', {
-      index: ['index.html', '/']
-    })
-  )
-
-  app.listen(port, function () {
-    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
-    if (report) {
-      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
-    }
-
-  })
-} else {
-  run(`vue-cli-service build ${args}`)
-}

+ 16 - 0
src/views/gas/courtyardNetworkManagement/index.vue

@@ -11,6 +11,14 @@
           />
           />
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+      <el-select v-model="queryParams.createBy" filterable placeholder="请选择创建人" clearable size="small">
+        <el-option v-for="item in workerList"
+                   :key="item.id"
+                   :label="item.name"
+                   :value="item.id"/>
+      </el-select>
+    </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -211,6 +219,7 @@ import {getAreaList} from "@/api/gas/area";
 import {getBuildingList} from "@/api/gas/building";
 import {getBuildingList} from "@/api/gas/building";
 import {getUnitList} from "@/api/gas/unit";
 import {getUnitList} from "@/api/gas/unit";
 import {updateEmergencyRepair} from "@/api/gas/emergencyRepair";
 import {updateEmergencyRepair} from "@/api/gas/emergencyRepair";
+import {getWorker} from "@/api/gas/user";
 
 
 export default {
 export default {
   name: "CourtyardNetworkManagement",
   name: "CourtyardNetworkManagement",
@@ -240,6 +249,7 @@ export default {
       total: 0,
       total: 0,
       // 庭院网管表格数据
       // 庭院网管表格数据
       courtyardNetworkManagementList: [],
       courtyardNetworkManagementList: [],
+      workerList: [],
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",
       // 是否显示弹出层
       // 是否显示弹出层
@@ -281,9 +291,15 @@ export default {
   },
   },
   created() {
   created() {
     this.getAreaList();
     this.getAreaList();
+    this.getWorkerList();
     this.getList();
     this.getList();
   },
   },
   methods: {
   methods: {
+    getWorkerList() {
+      getWorker().then(req => {
+        this.workerList = req.data
+      })
+    },
     submitFormSH() {
     submitFormSH() {
       this.$refs["formSH"].validate(valid => {
       this.$refs["formSH"].validate(valid => {
         if (valid) {
         if (valid) {

+ 16 - 0
src/views/gas/regulatorBox/index.vue

@@ -19,6 +19,14 @@
           @keyup.enter.native="handleQuery"
           @keyup.enter.native="handleQuery"
         />
         />
       </el-form-item>
       </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择创建人" clearable size="small">
+          <el-option v-for="item in workerList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -499,6 +507,7 @@ import {getAreaList} from "@/api/gas/area";
 import {getBuildingList} from "@/api/gas/building";
 import {getBuildingList} from "@/api/gas/building";
 import {getUnitList} from "@/api/gas/unit";
 import {getUnitList} from "@/api/gas/unit";
 import el from "element-ui/src/locale/lang/el";
 import el from "element-ui/src/locale/lang/el";
+import {getWorker} from "@/api/gas/user";
 
 
 export default {
 export default {
   name: "RegulatorBox",
   name: "RegulatorBox",
@@ -527,6 +536,7 @@ export default {
       total: 0,
       total: 0,
       // 调压箱管理表格数据
       // 调压箱管理表格数据
       regulatorBoxList: [],
       regulatorBoxList: [],
+      workerList: [],
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",
       // 是否显示弹出层
       // 是否显示弹出层
@@ -655,9 +665,15 @@ export default {
   },
   },
   created() {
   created() {
     this.getAreaList();
     this.getAreaList();
+    this.getWorkerList();
     this.getList();
     this.getList();
   },
   },
   methods: {
   methods: {
+    getWorkerList() {
+      getWorker().then(req => {
+        this.workerList = req.data
+      })
+    },
     upcqyy() {
     upcqyy() {
       if (this.form.reasonForOverdueInspection != undefined && this.form.reasonForOverdueInspection != "") {
       if (this.form.reasonForOverdueInspection != undefined && this.form.reasonForOverdueInspection != "") {
         this.rules.otherReasonsForOverdueInspection[0].required = false
         this.rules.otherReasonsForOverdueInspection[0].required = false