样式修改。

src/views/base/companyInfo-list.vue

@@ -59,7 +59,7 @@
         <template slot-scope="{row}">
           <a :href="row.logo" target="_blank">
             <el-avatar
-              :size="60"
+              :size="48"
               :src="row.logo+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
               :key="row.id"
             ></el-avatar>
@@ -72,7 +72,7 @@
       <el-table-column prop="position3Name" label="三级位置" width="180"></el-table-column>
       <el-table-column prop="position4Name" label="四级位置" width="180"></el-table-column>
       <el-table-column prop="position5Name" label="五级位置" width="180"></el-table-column> -->
-      <el-table-column prop="remark" sort-by="remark_" label="备注" width="350"></el-table-column>
+      <el-table-column prop="remark" sort-by="remark_" label="备注"></el-table-column>
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>

src/views/base/deviceInfo-detail.vue

@@ -11,9 +11,32 @@
     :modal-append-to-body="false"
     style="text-align:left;"
     @close="closeDialog"
+    :close-on-click-modal="false"
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="ip地址" prop="ipAddress">
+              <el-input
+                v-model="formModel.ipAddress"
+                @blur="queryDeviceNo"
+                placeholder="请输入ip地址"
+                style="width:200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="端口" prop="port">
+              <el-input
+                v-model="formModel.port"
+                @blur="queryDeviceNo"
+                placeholder="请输入端口"
+                style="width:200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="设备编号" prop="deviceNo">
@@ -25,6 +48,8 @@
               <el-input v-model="formModel.aliasName" placeholder="请输入设备别名" style="width:200px"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="运行状态" prop="isOnline">
               <el-select v-model="formModel.isOnline" filterable style="width:200px">
@@ -42,26 +67,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="ip地址" prop="ipAddress">
-              <el-input
-                v-model="formModel.ipAddress"
-                @blur="queryDeviceNo"
-                placeholder="请输入ip地址"
-                style="width:200px"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="端口" prop="port">
-              <el-input
-                v-model="formModel.port"
-                @blur="queryDeviceNo"
-                placeholder="请输入端口"
-                style="width:200px"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="类型" prop="type">
               <el-select v-model="formModel.type" filterable placeholder="请选择" style="width:200px">

src/views/base/personDeviceRelation-BoundList.vue

@@ -3,7 +3,7 @@
     :visible.sync="showDialog"
     title="查看绑定设备"
     :modal-append-to-body="false"
-    :modal="false"
+    :modal="true"
     style="text-align:left;"
     @close="closeDialog"
     width="60%"
@@ -148,33 +148,36 @@ export default {
     },
     handleDelete(record) {
       var self = this;
-      self.loading = true;
-      this.$confirm("是否绑定？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          personDeviceRelationApi.remove(record.id).then(function(response) {
-            var jsonData = response.data;
-            self.loading = false;
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "解绑成功!"
-              });
-            }
-          });
-        })
-        .catch(error => {
+      // this.$confirm("是否绑定？", "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      //   distinguishCancelAndClose: true
+      // })
+      //   .then(() => {
+      if(confirm("是否绑定？")){
+        self.loading = true;
+
+        personDeviceRelationApi.remove(record.id).then(function(response) {
+          var jsonData = response.data;
           self.loading = false;
-          // self.$message.error(error + "");
+          if (jsonData.result) {
+            // var index = self.tableData.indexOf(record);
+            // self.tableData.splice(index, 1);
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "解绑成功!"
+            });
+          }
         });
+      }
+        // })
+        // .catch(error => {
+        //   self.loading = false;
+        //   // self.$message.error(error + "");
+        // });
     },
     handleRemoveAll() {
       var self = this;

src/views/base/personDeviceRelation-list.vue

@@ -3,7 +3,7 @@
     :visible.sync="showDialog"
     title="查看设备"
     :modal-append-to-body="false"
-    :modal="false"
+    :modal="true"
     style="text-align:left;"
     @close="closeDialog"
     width="60%"
@@ -133,6 +133,7 @@ export default {
         .isUnbindDeviceList(formData)
         .then(function(response) {
           self.loading = false;
+          
           var jsonData = response.data.data;
 
           self.tableData = jsonData.data;
@@ -161,39 +162,44 @@ export default {
     },
     handleBound(record) {
       var self = this;
-      self.loading = true;
-      this.$confirm("是否绑定？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          self.formModel.personId = self.personId;
-          self.formModel.deviceId = record.id;
+      // this.$confirm("是否绑定？", "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      //   distinguishCancelAndClose: true
+      // })
+      //   .then(() => {
+      if(confirm("是否绑定？")){
+        self.formModel.personId = self.personId;
+        self.formModel.deviceId = record.id;
 
-          return personDeviceRelationApi
-            .add(self.formModel)
-            .then(function(response) {
-              var jsonData = response.data;
-              self.changePage(self.pageIndex);
-              if (jsonData.result) {
-                self.$message({
-                  message: "绑定成功!",
-                  type: "success"
-                });
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning"
-                });
-              }
-            });
-        })
-        .catch(error => {
-          self.loading = false;
-          // self.$message.error(error + "");
-        });
+        self.loading = true;
+
+        return personDeviceRelationApi
+          .add(self.formModel)
+          .then(function(response) {
+            self.loading = false;
+
+            var jsonData = response.data;
+            self.changePage(self.pageIndex);
+            if (jsonData.result) {
+              self.$message({
+                message: "绑定成功!",
+                type: "success"
+              });
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+            }
+          });
+        }
+        // })
+        // .catch(error => {
+        //   self.loading = false;
+        //   // self.$message.error(error + "");
+        // });
     },
     handleBatchBound() {
       var self = this;

src/views/base/personInfo-detail.vue

@@ -11,6 +11,7 @@
     :modal-append-to-body="false"
     style="text-align:left;"
     @close="closeDialog"
+    :close-on-click-modal="false"
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">