bug,验证码

.env

@@ -5,8 +5,11 @@ VUE_APP_TITLE=物联网平台
 
 # 网络请求公用地址
 VUE_APP_API=/api/
+
 # 测试
 #  VUE_APP_API=http://101.36.160.140:31005/smart-grp-basic
+#  VUE_APP_API=http://172.16.0.6:7070/smart-grp-basic
+#  VUE_APP_API=window.location.origin
 
 # //正式
 # VUE_APP_API=http://23.99.21.201:59887/smart-grp-basic

src/api/modules/login.api.js

@@ -14,7 +14,14 @@ export default ({
     })
   },
 
-
+//验证码
+seccode(){
+  return request({
+    url: '/userInfo/identifyImage',
+    method: 'get',
+ 
+  })
+}
 
 
 })

src/main.js

@@ -27,7 +27,8 @@ import "./views/system/js/index"
 import "./views/system/js/jquery-1.8.3.min.js"
 import "./views/system/css/globle.css"
 
-
+// const publicUrl=window.location.origin
+// console.log(publicUrl,'publicUrl')
 
 // 核心插件
 Vue.use(d2Admin)

src/views/demo/alarmRecord/index.vue

@@ -214,6 +214,8 @@
                 >
                     <template slot-scope="scope">
                       {{scope.row.handleState==0?'待处理':scope.row.handleState==1?'已处理':scope.row.handleState}}
+                      <!-- <span v-if="scope.row.handleState==0">待处理</span>
+                      <span v-if="scope.row.handleState==1">已处理</span> -->
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="操作" width="100">

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/productManage/compontents/addDialog.vue

@@ -12,10 +12,10 @@
         ref="addForm"
         label-width="120px"
       >
-        <el-form-item label="产品图标：" prop="proIcons">
+        <!-- <el-form-item label="产品图标：" prop="proIcons">
           <el-upload
             class="avatar-uploader"
-            action="smart-grp-basic/minio/testupload"
+            :action="imgAction"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
           >
@@ -26,7 +26,7 @@
             />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="产品ID：" prop="proCode">
           <el-input
             style="width: 220px"
@@ -107,6 +107,8 @@ export default {
   },
   data() {
     return {
+      //  imgAction:window.location.origin+'/smart-grp-basic/minio/testupload',
+      imgAction:'http://101.36.160.140:31005/smart-grp-basic/minio/testupload',
       defaultProps: {
         children: "children",
         label: "productCategoryName",
@@ -241,6 +243,9 @@ export default {
       });
     },
   },
+  mounted(){
+    console.log(window.location.host,"kkk")
+  }
 };
 </script>
 <style lang="scss" scoped>

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/login/page.vue

@@ -44,6 +44,17 @@
                     <i slot="prepend" class="fa fa-lock"></i>
                   </el-input>
                 </el-form-item>
+                <el-form-item prop="seccode">
+                  <el-input
+              
+                    style="width:60%"
+                    v-model="formLogin.seccode"
+                    placeholder="验证码">
+                    <i slot="prepend" class="el-icon-s-ticket"></i>
+                  </el-input>
+                  <span @click="seccodeImgClick" style="display:inline-block;margin-left:15px;margin-top:12px"><img :src="seccodeImg" alt=""></span>
+
+                </el-form-item>
                
                 <el-button
                   size="default"
@@ -81,7 +92,8 @@ export default {
   data () {
     return {
   
-     
+      // seccodeImg:window.location.origin+'/smart-grp-basic/userInfo/identifyImage',
+      seccodeImg:'http://101.36.160.140:31005/smart-grp-basic/userInfo/identifyImage',
     
       // 快速选择用户
       dialogVisible: false,
@@ -124,7 +136,8 @@ export default {
             trigger: 'blur'
           }
         ],
-        code: [
+
+        seccode: [
           {
             required: true,
             message: '请输入验证码',
@@ -136,11 +149,13 @@ export default {
     }
   },
   mounted () {
-   
+
   },
   created(){
     //开启监听键盘按下事件
     window.addEventListener("keydown",this.handleKeyDown,true);
+    console.log(this.formLogin.seccode,"首次this.formLogin.seccode")
+   
   },
   beforeDestroy () {
  
@@ -165,7 +180,8 @@ export default {
    loginBtn(){
      let data={
        userName:this.formLogin.username,
-       userPassword:this.formLogin.password
+       userPassword:this.formLogin.password,
+       identifyCode:this.formLogin.seccode
      }
      api.login(data)
      .then(res=>{
@@ -188,10 +204,15 @@ export default {
               
               
        }else if(res.code==600){
-          this.$message.error('账号或密码错误');
+          this.$message.error(res.msg);
        }
      })
    },
+   seccodeImgClick(){
+ 
+    this.seccodeImg=this.seccodeImg+'?'+Math.random()
+  
+   },
   
     // 提交登录信息
     submit () {
@@ -280,7 +301,7 @@ export default {
   // 登录表单
   .page-login--form {
     width: 26.06vw;
-    height: 20.21vw;
+    height: 25.21vw;
     background-image: url("./image/dengluk.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;

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

@@ -15,7 +15,7 @@ process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYY-M-D HH:mm:ss')
 
 // 基础路径 注意发布之前要先修改这里
 const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/'
-
+console.log(publicPath,"publicPath")
 // 设置不参与构建的库
 const externals = {}
 cdnDependencies.forEach(pkg => { externals[pkg.name] = pkg.library })
@@ -45,6 +45,8 @@ module.exports = {
       '/api': {
         //测试
         target: 'http://101.36.160.140:31005/smart-grp-basic',
+        // target: 'http://172.16.0.6:7070/smart-grp-basic',
+       
         //生产
         // target:"http://23.99.21.201:59887/smart-grp-basic",
         // target: 'http://112.51.248.191:7070',
@@ -124,6 +126,7 @@ module.exports = {
 
 
       config.plugin('provide').use(webpack.ProvidePlugin,[{
+         
         $:"jquery",
         jquery:"jquery",
         jQuery:"jquery",