luowei 2 жил өмнө
parent
commit
19ae9435b5

+ 2 - 1
.env.staging

@@ -7,4 +7,5 @@ NODE_ENV = production
 ENV = 'staging'
 
 # 测试环境
-VUE_APP_BASE_API = 'http://10.87.10.55:8080/'
+# VUE_APP_BASE_API = 'http://10.87.10.55:8080/'
+VUE_APP_BASE_API = 'http://127.0.0.1:8080/

+ 3 - 3
src/views/system/area/index.vue

@@ -237,7 +237,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加【请填写功能名称】";
+      this.title = "添加";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -246,7 +246,7 @@ export default {
       getArea(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改【请填写功能名称】";
+        this.title = "修改";
       });
     },
     /** 提交按钮 */
@@ -272,7 +272,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项?').then(function() {
         return delArea(ids);
       }).then(() => {
         this.getList();

+ 6 - 6
src/views/system/bind/index.vue

@@ -107,9 +107,9 @@
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="30">
             <el-form-item label="归属部门" prop="orgId">
               <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
                 :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
@@ -118,7 +118,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="12">
+          <el-col :span="20">
             <el-form-item label="区域名称">
               <el-select v-model="form.areaId" placeholder="请选择区域名称" @change="changeSelect">
                 <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -128,7 +128,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="12">
+          <el-col :span="20">
             <el-form-item label="采集点名称">
               <el-select v-model="form.checkId" placeholder="请选择采集点名称">
                 <el-option v-for="item in checkList" :key="item.id" :label="item.checkName" :value="item.id"></el-option>
@@ -165,7 +165,7 @@ import tableList from '@/mixins/tableList'
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listBind, getBind, delBind, addBind, updateBind } from "@/api/system/bind";
-import { deptTreeSelect } from "@/api/system/user";
+import { deptTreeSelect } from "@/api/system/public";
 import { getCheckByAreaId } from "@/api/system/check";
 export default {
   /** 引入基础minxins*/
@@ -250,8 +250,8 @@ export default {
     },
     changeSelect(val) {
       getCheckByAreaId(val).then(response => {
+        this.form.checkId = null;
         this.checkList = response.data;
-
       })
     },
     /** 查询【请填写功能名称】列表 */

+ 4 - 3
src/views/system/check/index.vue

@@ -59,7 +59,7 @@
 
     <!-- 添加或修改区域采集点对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="采集点名称" prop="checkName">
           <el-input v-model="form.checkName" placeholder="请输入采集点名称" />
         </el-form-item>
@@ -98,7 +98,7 @@
 import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/system/check";
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { deptTreeSelect } from "@/api/system/user";
+import { deptTreeSelect } from "@/api/system/public";
 export default {
   name: "Check",
 
@@ -143,7 +143,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      defaultKeys:[]
     };
   },
   created() {