bug

.env

@@ -2,10 +2,14 @@
 
 # 页面 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
 
 # 仓库地址
 VUE_APP_REPO=https://github.com/d2-projects/d2-admin-start-kit

src/views/demo/equipmentManage/compontents/addDialog.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
 
-      <el-dialog :title="dialogTitle" @close="addForm={orgCode:orgCode}" :visible.sync="dialogFormVisible" id="dialogStyle">
+      <el-dialog :title="dialogTitle" @close="addForm={orgCode:orgCode}" :visible.sync="dialogFormVisible" id="dialogStyle" >
         <el-form
+
           :model="addForm"
           :rules="rules"
           ref="addForm"
@@ -12,7 +13,7 @@
 
           <el-form-item label="设备ID：" prop="eqCode">
             <el-input
-              style="width: 220px"
+            style="width:30%"
               v-model.trim="addForm.eqCode"
               placeholder="请输入"
             ></el-input>
@@ -22,16 +23,16 @@
               <el-option label="区域一" value="shanghai"></el-option>
               <el-option label="区域二" value="beijing"></el-option>
             </el-select> -->
-            <el-input v-model="addForm.eqName" placeholder="请输入" style="width:220px"></el-input>
+            <el-input v-model="addForm.eqName" placeholder="请输入" style="width:30%"></el-input>
           </el-form-item>
           <el-form-item label="设备标签：">
-            <el-select v-model="addForm.labelCode" @change="getTag" placeholder="请选择" >
+            <el-select v-model="addForm.labelCode" @change="getTag" placeholder="请选择"  style="width:30%">
               <el-option v-for="item in tagLists" :key="item.id" :label="item.labelName" :value="item.labelCode">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="所属仓房编码：" >
-            <el-input v-model="addForm.houseCode" placeholder="请输入" style="width:220px"></el-input>
+            <el-input v-model="addForm.houseCode" placeholder="请输入" style="width:30%"></el-input>
           </el-form-item>
           <el-form-item label="所属产品：" prop="proName">
           <!-- <el-select v-model="addForm.proName" placeholder="请选择" ref="selectTree">
@@ -50,16 +51,16 @@
               @node-click="handleNodeClick"
             />
           </el-select> -->
-                    <el-select  @change="getPro" v-model="addForm.proCode" placeholder="请选择" >
+                    <el-select  @change="getPro" v-model="addForm.proCode" placeholder="请选择"  style="width:30%">
                       <el-option v-for="item in proLists" :key="item.id" :label="item.proName" :value="item.proCode">
                       </el-option>
                     </el-select>
           </el-form-item>
-          <el-form-item label="所属组织机构：">
-          <el-select disabled v-model="addForm.orgCode" placeholder="请选择">
+          <el-form-item label="所属组织机构：" prop="orgCode">
+          <el-select  v-model="addForm.orgCode" placeholder="请选择"  style="width:30%">
             <el-option
               v-for="item in ckLists"
-              :key="item.id"
+              :key="item.orgCode"
               :label="item.orgName"
               :value="item.orgCode"
             >
@@ -68,7 +69,7 @@
           </el-form-item>
           <el-form-item label="描述：">
             <el-input
-              style="width: 80%"
+            style="width:30%"
               type="textarea"
               v-model.trim="addForm.eqRemark"
               placeholder="请输入"
@@ -109,6 +110,7 @@ export default {
         eqCode: [{ required: true, message: "请输入设备ID", trigger: "blur" }],
         eqName: [{ required: true, message: "请选择设备名称", trigger: "blur" }],
         name1: [{ required: true, message: "请选择设备标签", trigger: "blur" }],
+        orgCode:[{ required: true, message: "请选择组织机构", trigger: "blur" }],
         proName: [
           { required: true, message: "请选择所属产品", trigger: "blur" },
         ],
@@ -117,7 +119,7 @@ export default {
   },
   created(){
     // this.ckList()
-    this.orgCode=localStorage.getItem("orgCode");
+    //this.orgCode=localStorage.getItem("orgCode");
   },
   methods: {
     getPro(val){
@@ -163,7 +165,9 @@ export default {
         .then((res) => {
           if (res.code == 200) {
             this.ckLists = res.data;
-            this.addForm.orgCode=localStorage.getItem("orgCode")
+            console.log(this.ckLists,"ckLists")
+            // this.addForm.orgCode=localStorage.getItem("orgCode")
+          
           }
         })
         .catch((err) => {

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) => {
@@ -690,6 +690,8 @@ export default {
             // "/PUSH/c89512024085/DPUT/upload",
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
             "/PUSH/8951DQ2207200018/DPUT/upload",
+            "/PUSH/8951DQ2207200019/DPUT/upload",
+            "/PUSH/8951DQ220700011/DUPT/upload"
           ],
           { qos: 1 },
           (err) => {
@@ -726,11 +728,15 @@ export default {
     getMessage() {
       this.client.on("message", (topic, message) => {
         if (message) {
-          console.log("收到来着", topic, "的信息", message.toString());
+          let str = "8951DQ220700011";
+          if (topic.indexOf(str) != -1) {
+            console.log("收到来着", topic, "的信息", message.toString());
           const res = JSON.parse(message.toString());
           this.runData = res.data;
           console.log(res, "res", this.runData, "runData");
           this.calcAve(this.runData);
+          }
+          
           // switch(topic) {
           //    case 'top/lll' :
           //      this.msg = res.msg

src/views/demo/productManage/compontents/addDialog.vue

@@ -64,11 +64,11 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="所属组织机构：">
-          <el-select disabled v-model="addForm.orgCode" placeholder="请选择">
+        <el-form-item label="所属组织机构：" prop="orgCode">
+          <el-select  v-model="addForm.orgCode" placeholder="请选择">
             <el-option
               v-for="item in ckLists"
-              :key="item.id"
+              :key="item.orgCode"
               :label="item.orgName"
               :value="item.orgCode"
             >
@@ -119,6 +119,7 @@ export default {
       dialogFormVisible: false,
       rules: {
         proCode: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
+        orgCode: [{ required: true, message: "请选择组织机构", trigger: "blur" }],
         proName: [
           { required: true, message: "请输入产品名称", trigger: "blur" },
         ],
@@ -133,7 +134,7 @@ export default {
   },
   created() {
     this.ckList();
-    this.orgCode=localStorage.getItem("orgCode");
+    //this.orgCode=localStorage.getItem("orgCode");
   },
   methods: {
     handleAvatarSuccess(res, file) {
@@ -168,7 +169,7 @@ export default {
         .then((res) => {
           if (res.code == 200) {
             this.ckLists = res.data;
-            this.addForm.orgCode=localStorage.getItem("orgCode")
+            //this.addForm.orgCode=localStorage.getItem("orgCode")
           }
         })
         .catch((err) => {

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

@@ -401,7 +401,7 @@
        </table>
 
        <div class="sbData"  v-for="(item,index) in sbDetailData" :key="index">
-        <div class="sbTitle">{{item.sign}}</div>
+    <div class="sbTitle">{{item.eqName}} / {{item.device}} / {{item.labelName}}</div>
         <div class="sbDetail">
           <div class="sbDetailDiv">温度(℃)</div>
           <div class="sbDetailDiv">{{item.tempValue}}</div>

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

@@ -112,7 +112,7 @@
       <div class="top">
         <div class="deviceName">
           <span class="shu"></span>
-          {{item.sbName}}/{{item.device}}
+          {{item.sbName}} / {{item.device}}
         </div>
         <div class="deviceDetail">
           <div class="bottom">
@@ -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) => {
@@ -192,6 +192,7 @@ export default {
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
             "/PUSH/8951DQ2207200018/DPUT/upload",
             "/PUSH/8951DQ2207200019/DPUT/upload",
+            "/PUSH/8951DQ220700011/DUPT/upload"
           ],
           { qos: 1 },
           (err) => {
@@ -227,8 +228,9 @@ export default {
     //监听接收消息
     getMessage() {
       this.client.on("message", (topic, message) => {
+        console.log(topic,message)
         if (message) {
-          let str = "8951DQ2207200019";
+          let str = "8951DQ220700011";
           if (topic.indexOf(str) != -1) {
             console.log("收到来着", topic, "的信息", message.toString());
             var res = JSON.parse(message.toString());

src/views/demo/system/userManagement/index.vue

@@ -39,7 +39,7 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="姓名">
+                  <el-form-item label="用户名">
                     <el-input size="mini" placeholder="请输入" v-model="formInline.userName"></el-input>
                   </el-form-item>
                   <el-form-item>
@@ -62,6 +62,8 @@
                 <el-table-column align="center" label="序号" type="index" width="100px" :index="indexMethod"></el-table-column>
                 <!-- <el-table-column prop="id" label="用户ID" align="center">
                 </el-table-column> -->
+                <el-table-column prop="userName" label="用户名" align="center">
+                </el-table-column>
                 <el-table-column prop="userRealName" label="姓名" align="center">
                 </el-table-column>
 
@@ -118,9 +120,12 @@
           <!-- <el-form-item label="用户ID" :label-width="formLabelWidth" prop="userId">
             <el-input v-model="form.userId" autocomplete="off"></el-input>
           </el-form-item> -->
-          <el-form-item label="姓名" :label-width="formLabelWidth" prop="userName">
+          <el-form-item label="用户名" :label-width="formLabelWidth" prop="userName">
             <el-input v-model="form.userName" autocomplete="off"></el-input>
           </el-form-item>
+          <el-form-item label="姓名" :label-width="formLabelWidth" prop="userRealName">
+            <el-input v-model="form.userRealName" autocomplete="off"></el-input>
+          </el-form-item>
           <el-form-item label="角色" :label-width="formLabelWidth" prop="userRole">
             <el-select v-model="form.userRole" placeholder="请选择角色">
               <el-option v-for="item in roleLists" :key="item.enumCode" :label="item.enumName" :value="item.enumCode">
@@ -129,7 +134,7 @@
           </el-form-item>
           <el-form-item label="所属组织" :label-width="formLabelWidth" prop="orgCode">
             <el-select v-model="form.orgCode" placeholder="请选择" @change="ckChange">
-              <el-option v-for="item in ckLists" :key="item.id" :label="item.orgName" :value="item.id">
+              <el-option v-for="item in ckLists" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
               </el-option>
             </el-select>
           </el-form-item>
@@ -187,6 +192,9 @@ export default {
       //验证规则
       rules: {
         userId: [{ required: true, message: "请输入用户ID", trigger: "blur" }],
+        userRealName: [
+          { required: true, message: "请输入用户姓名", trigger: "blur" },
+        ],
         userName: [
           { required: true, message: "请输入用户姓名", trigger: "blur" },
         ],
@@ -218,6 +226,7 @@ export default {
       form: {
         userId: "",
         userName: "",
+        userRealName:'',
         userRole: "",
         orgCode: "",
         manageStore: "",
@@ -402,6 +411,7 @@ export default {
         // userRoleName: this.userRoleName,
         // manageStoreName: this.manageStoreName,
         userId: this.form.userId,
+        userRealName:this.form.userRealName,
         userName: this.form.userName,
         userPassword: this.form.userPassword,
         userRole: this.form.userRole,
@@ -451,6 +461,7 @@ export default {
 
         id: this.rowId,
         userId: this.form.userId,
+        userRealName:this.form.userRealName,
         userName: this.form.userName,
         userPassword: this.form.userPassword,
         userRole: this.form.userRole,

src/views/system/visualized/index.vue

@@ -404,7 +404,7 @@ export default {
   computed: {
     classOption() {
       return {
-        step: 0.5, // 数值越大速度滚动越快
+        step: 0.2, // 数值越大速度滚动越快
         limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
@@ -416,7 +416,7 @@ export default {
     },
     seamlessScrollOption(){
       return {
-        step: 1.2, // 数值越大速度滚动越快
+        step: 0.2, // 数值越大速度滚动越快
         limitMoveNum:6, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
@@ -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) => {
@@ -470,6 +470,7 @@ export default {
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
             "/PUSH/8951DQ2207200018/DPUT/upload",
             "/PUSH/8951DQ2207200019/DPUT/upload",
+            "/PUSH/8951DQ220700011/DUPT/upload"
           ],
           { qos: 1 },
           (err) => {
@@ -506,7 +507,7 @@ export default {
     getMessage() {
       this.client.on("message", (topic, message) => {
         if (message) {
-          let str = "8951DQ2207200019";
+          let str = "8951DQ220700011";
           if (topic.indexOf(str) != -1) {
             console.log("收到来着", topic, "的信息", message.toString());
             var res = JSON.parse(message.toString());

vue.config.js

@@ -32,6 +32,7 @@ const pages = undefined
 //   index: './src/main.js',
 //   subpage: './src/subpage.js'
 // }
+// console.log(VUE_APP_API,"url...")
 
 module.exports = {
   // 根据你的实际情况更改这里
@@ -42,7 +43,10 @@ module.exports = {
     disableHostCheck: process.env.NODE_ENV === 'development', // 关闭 host check，方便使用 ngrok 之类的内网转发工具
     proxy: {
       '/api': {
+        //测试
         target: 'http://101.36.160.140:31005/smart-grp-basic',
+        //生产
+        // target:"http://23.99.21.201:59887/smart-grp-basic",
         // target: 'http://112.51.248.191:7070',
           // target: '192.168.2.6:7070',
        
@@ -50,7 +54,7 @@ module.exports = {
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''
-        }
+        } 
       }
     }
   },