协议管理bug

.env

@@ -2,12 +2,12 @@
 
 # 页面 title 前缀
 VUE_APP_TITLE=物联网平台
-# let pubUrl=window.location.href
+
 # 网络请求公用地址
 VUE_APP_API=/api/
 # 测试
 #  VUE_APP_API=http://101.36.160.140:31005/smart-grp-basic
-# VUE_APP_API=pubUrl+"smart-grp-basic"
+
 # //正式
 # VUE_APP_API=http://23.99.21.201:59887/smart-grp-basic
 

src/api/modules/paramManage/agreement.api.js

@@ -22,7 +22,8 @@ export default ({
   //协议列表-详情
   agreementDetail(id) {
     return request({
-      url: `/remote-params/getByIdList/${id}`,
+      // url: `/remote-params/getByIdList/${id}`,
+      url: `/remote-params/getById/${id}`,
       method: 'get',
     })
   },

src/views/demo/equipmentManage/equipmentInfo/index.vue

@@ -663,11 +663,11 @@ export default {
     connect() {
       let options = {
         //本地
-        // username: "admin",
-        // password: "public",
+        username: "admin",
+        password: "public",
         //测试
-           username: "admin",
-        password: "admin@123",
+        //    username: "admin",
+        // password: "admin@123",
         //生产
         // username: "admin",
         // password: "admin@2Ld&DDrsk",
@@ -677,9 +677,9 @@ export default {
         connectTimeout: 4000,
       };
       //本地开发环境
-      // this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
+      this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
       //测试环境
-       this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
+      //  this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
       //正式环境
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
       this.client.on("connect", (e) => {

src/views/demo/parameManagement/agreement/addDialog.vue

@@ -14,7 +14,7 @@
       >
         <el-form-item label="协议类型：" prop="protocolType">
           <el-select v-model="addForm.protocolType" placeholder="请选择">
-            <el-option v-for="(item,index) in xyArr" :key="index" :label="item.enumName" :value="item.enumName"></el-option>
+            <el-option v-for="(item,index) in xyArr" :key="item.enumCode" :label="item.enumName" :value="item.enumCode"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="协议链接：" prop="protocolTopic">
@@ -56,6 +56,10 @@ import log from "@/libs/util.log";
 export default {
   props: {
     dialogTitle: "",
+     row:{
+      type:Object,
+      require:true
+     }
   },
   data() {
     return {
@@ -78,6 +82,7 @@ export default {
   },
   created() {
     this.getXyArr()
+
   },
   methods: {
     getXyArr() {
@@ -93,6 +98,7 @@ export default {
         .dataDic(data)
         .then((res) => {
           if (res.code == 200) {
+         
             this.xyArr = res.data[0].children;
           }
         })
@@ -107,6 +113,7 @@ export default {
     },
     //获取编辑数据
     getEditRow(row) {
+     
       this.addForm = JSON.parse(JSON.stringify(row));
     },
     //新建产品提交
@@ -114,10 +121,12 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           let params = JSON.parse(JSON.stringify(this.addForm));
-          let arr=this.xyArr.filter(item=>{
-            return item.enumName==params.protocolType
-          })
-          params.protocolType=arr[0].enumCode
+           params.buildUser=localStorage.getItem("userName")
+          //  console.log(this.xyArr,"this.xyArr")
+          // let arr=this.xyArr.filter(item=>{
+          //   return item.enumName==params.protocolType
+          // })
+          // params.protocolType=arr[0].enumCode
           if (this.dialogTitle == "新建协议") {
             params.id = "";
             // params.orgCode=localStorage.getItem("orgCode")
@@ -132,6 +141,8 @@ export default {
               }
             });
           } else {
+            
+            
             api.agreementSave(params).then((res) => {
               if (res.code == 200) {
                 this.$message.success("编辑成功");
@@ -149,6 +160,7 @@ export default {
       });
     },
   },
+
 };
 </script>
 <style lang="scss" scoped>

src/views/demo/parameManagement/agreement/index.vue

@@ -129,6 +129,7 @@ export default {
     components: { addDialog },
   data() {
     return {
+   
       editRow: {},
       addForm: {},
       dialogFormVisible: false,
@@ -161,12 +162,27 @@ export default {
     };
   },
   methods: {
+ 
+ 
     //编辑
     edit(row) {
       this.$refs.addDialog.dialogFormVisible = true;
       this.dialogTitle = "编辑协议";
-      this.editRow = row;
-      this.$refs.addDialog.getEditRow(row);
+         //编辑数据回显
+      api.agreementDetail(row.id)
+      .then(res=>{
+        if(res.code==200){
+       
+        this.editRow = res.data;
+        this.$refs.addDialog.getEditRow(this.editRow);
+        }
+        
+      })
+      .catch(err=>{
+        console.log(err)
+      })
+     
+ 
     },
     //删除
     del(row) {

src/views/demo/productManage/productInfo/realTime/index.vue

@@ -164,11 +164,11 @@ export default {
     connect() {
       let options = {
         //本地
-        // username: "admin",
-        // password: "public",
-        //测试
         username: "admin",
-        password: "admin@123",
+        password: "public",
+        //测试
+        // username: "admin",
+        // password: "admin@123",
         //生产
         // username: "admin",
         // password: "admin@2Ld&DDrsk",
@@ -178,9 +178,9 @@ export default {
         connectTimeout: 4000,
       };
       //本地开发环境
-      // this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
+      this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
       //测试环境
-      this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
+      // this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
       //正式环境
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
       this.client.on("connect", (e) => {

src/views/system/visualized/index.vue

@@ -442,11 +442,11 @@ export default {
     connect() {
       let options = {
         //本地
-        // username: "admin",
-        // password: "public",
-        //测试
         username: "admin",
-        password: "admin@123",
+        password: "public",
+        //测试
+        // username: "admin",
+        // password: "admin@123",
         //生产
         // username: "admin",
         // password: "admin@2Ld&DDrsk",
@@ -456,9 +456,9 @@ export default {
         connectTimeout: 4000,
       };
       //本地开发环境
-      // this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
+      this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
       //测试环境
-      this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
+      // this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
       //正式环境
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
       this.client.on("connect", (e) => {

vue.config.js

@@ -32,7 +32,7 @@ const pages = undefined
 //   index: './src/main.js',
 //   subpage: './src/subpage.js'
 // }
-// console.log(VUE_APP_API,"url...")
+
 
 module.exports = {
   // 根据你的实际情况更改这里