init

src/views/Customer/AgentManagement.vue

@@ -30,6 +30,25 @@
             </el-option>
           </el-select>
         </div>
+
+          <div class="div-lab">
+          <div class="label" style=" line-height: 30px;">地区：</div>
+          <el-select
+            v-model="provinceId"
+            placeholder="请选择"
+            class="div-inp"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in areaList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </div>
       <div class="app-titel" style="margin-top: 15px">
         <div class="label">代理商名称：</div>
@@ -503,6 +522,8 @@ export default {
       resetFlag:false,
       dialogVisible3:false,
       operaVisible:false,
+      provinceId:'',
+      areaList:[],
       timelist:'',
       tableData: [],
        addressOptions: [],
@@ -654,10 +675,18 @@ export default {
         this.contractEndDate=this.timelist[1];
         this.serviceStatus=this.$route.query.serviceStatus;
       }
-
+       // 获取地区列表
+    this.getCityList()
     this.getAgentList()
   },
   methods: {
+    getCityList(){
+      this.$api.api.getAreaList({parentId:0})
+      .then(res=>{
+        // console.log(res,'地区列表');
+        this.areaList=res.data
+      })
+    },
     saveOpera(){
       this.$refs.operaForm.validate(valid=>{
         if(valid){
@@ -962,6 +991,7 @@ export default {
         this.serviceStatus='';
         this.agentName='';
         this.operationalName='';
+        this.provinceId=''
         this.pageNum=1
         this.getAgentList()
     },
@@ -979,6 +1009,7 @@ export default {
           contractEndDate:this.contractEndDate,
           serviceStatus:this.serviceStatus,
           agentName:this.agentName,
+          provinceId:this.provinceId,
           operationalName:this.operationalName,
 
         }).then((res) => {

src/views/Equipment/state.vue

@@ -113,7 +113,7 @@
             clearable
             filterable
             collapse-tags
-            v-model="searchForm.simAudioStatus"
+            v-model="searchForm.recCmd"
             placeholder="请选择"
           >
             <el-option
@@ -373,7 +373,7 @@
                   }}指示灯</el-dropdown-item
                 >
                 <el-dropdown-item v-if="equ_state_WiFi" command="wifiShow">WiFi管理</el-dropdown-item>
-                <el-dropdown-item v-if="equ_state_Voice" command="voiceOpen">录音{{row.simAudioStatus=='true'?'关闭':'开启'}}</el-dropdown-item>
+                <el-dropdown-item v-if="equ_state_Voice" command="voiceOpen">录音{{row.recCmd=='start'?'关闭':'开启'}}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -553,11 +553,11 @@ export default {
       ],
       audioStatusList: [
         {
-          value: true,
+          value: 'start',
           label: "开启",
         },
         {
-          value: false,
+          value: 'stop',
           label: "关闭",
         },
       ],
@@ -636,7 +636,7 @@ export default {
         orgName: "", //公司名称
         houseName: "", //楼盘名称
         acceptanceStatus: "", //设备状态
-        simAudioStatus: "", //录音状态
+        recCmd: "", //录音状态
         simAudioUploadStatus: "", //上传状态
         offStatus: "", //关机状态
         onLine: "",
@@ -967,7 +967,7 @@ export default {
         orgName: "", //公司名称
         houseName: "", //楼盘名称
         acceptanceStatus: "", //设备状态
-        simAudioStatus: "", //录音状态
+        recCmd: "", //录音状态
         simAudioUploadStatus: "", //上传状态
         offStatus: "", //关机状态
         onLine: "",

src/views/building/index.vue

@@ -94,6 +94,24 @@
             >
             </el-option>
           </el-select>
+        </div>
+          <div class="div-lab">
+          <div class="label">地区：</div>
+          <el-select
+            v-model="searchForm.provinceId"
+            placeholder="请选择"
+            class="div-inp"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in areaList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </div>
         <!-- <div v-if="orgType == 0" class="div-lab">
           <div class="label">运营人员：</div>
@@ -610,6 +628,7 @@ export default {
       searchForm: {
         corporateName: "",
         propertyName: "",
+        provinceId:'',
         serviceStatus: "",
         houseType: "",
         // residueTime: 7,
@@ -618,6 +637,7 @@ export default {
         agentName: "",
         operationalPeople: "",
       },
+      areaList:[],
       options1: [
         {
           value: "0",
@@ -758,10 +778,20 @@ export default {
     this.getOrgList();
     // 获取运营人员
     // this.getAllOperationsStaff();
+    // 获取地区列表
+    this.getCityList()
     // 获取列表数据
     this.zkhousePage();
+
   },
   methods: {
+    getCityList(){
+      this.$api.api.getAreaList({parentId:0})
+      .then(res=>{
+        // console.log(res,'地区列表');
+        this.areaList=res.data
+      })
+    },
     bindAgent(row) {
       // console.log(row);
       this.findMyAgent(row);
@@ -1133,6 +1163,7 @@ export default {
         corporateName: "",
         propertyName: "",
         serviceStatus: "",
+        provinceId:'',
         houseType: "",
         // residueTime: 7,
         startWorking: "",

vue.config.js

@@ -3,9 +3,9 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-// const url = 'http://39.97.167.65:9999' //测试
+const url = 'http://39.97.167.65:9999' //测试
 // const url = 'http://192.168.31.169:9999' //长龙
-const url = 'http://192.168.31.134:9999' //嘉豪
+// const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑