fixed: 修复BUG：查看设备字符过长；上传jpg格式失败；

src/pages/authentication/index.vue

@@ -1,193 +1,296 @@
 <!--  -->
 <template>
-<div class='con' v-loading.fullscreen.lock="loading">
-  <el-dialog title="企业信息" width="45%" :visible.sync="dialogFormVisible"><!--企业的详细信息窗口-->
-    <el-form :model="form" :label-position="'left'" :label-width="formLabelWidth">
-      <div class="con-main">
-        <div class="d-l">
-          <el-form-item label="信息标题：">
-            <span>{{c_title}}</span>
-          </el-form-item>
-          <el-form-item label="联系人：">
-            <span>{{c_user}}</span>
-          </el-form-item>
-          <el-form-item label="手机号：">
-            <span>{{c_phone}}</span>
-          </el-form-item>
-          <el-form-item label="所属区域：">
-            <span>{{c_area}}</span>
-          </el-form-item>
-          <el-form-item label="详细地址：">
-            <span>{{c_address}}</span>
-          </el-form-item>
-          <el-form-item label="企业官网：">
-            <span style="color:#0055f2;cursor:pointer" @click="fix_website(c_website)">{{c_website}}</span>
-          </el-form-item>
-        </div>
-        <div class="d-r">
-          <el-form-item label="企业LOGO：">
-            <div class="c-logo"><img :src="c_logo" alt=""></div>
-          </el-form-item>
-          <el-form-item label="企业资质：">
-            <div class="c-zizhi">
-              <img :src="c_zizhi" alt="">
-              <a v-if="$base.isImg(c_zizhi)" :href="c_zizhi" download="download" class="c-mask">
-                <i class="iconfont icon-download"></i>
-              </a>
-              <div v-else class="c-mask">
-                <i class="iconfont icon-download"></i>
+  <div class="con" v-loading.fullscreen.lock="loading">
+    <el-dialog title="企业信息" width="45%" :visible.sync="dialogFormVisible"
+      ><!--企业的详细信息窗口-->
+      <el-form
+        :model="form"
+        :label-position="'left'"
+        :label-width="formLabelWidth"
+      >
+        <div class="con-main">
+          <div class="d-l">
+            <el-form-item label="信息标题：">
+              <span>{{ c_title }}</span>
+            </el-form-item>
+            <el-form-item label="联系人：">
+              <span>{{ c_user }}</span>
+            </el-form-item>
+            <el-form-item label="手机号：">
+              <span>{{ c_phone }}</span>
+            </el-form-item>
+            <el-form-item label="所属区域：">
+              <span>{{ c_area }}</span>
+            </el-form-item>
+            <el-form-item label="详细地址：">
+              <span>{{ c_address }}</span>
+            </el-form-item>
+            <el-form-item label="企业官网：">
+              <span
+                style="color: #0055f2; cursor: pointer"
+                @click="fix_website(c_website)"
+                >{{ c_website }}</span
+              >
+            </el-form-item>
+          </div>
+          <div class="d-r">
+            <el-form-item label="企业LOGO：">
+              <div class="c-logo"><img :src="c_logo" alt="" /></div>
+            </el-form-item>
+            <el-form-item label="企业资质：">
+              <div class="c-zizhi">
+                <img :src="c_zizhi" alt="" />
+                <a
+                  v-if="$base.isImg(c_zizhi)"
+                  :href="c_zizhi"
+                  download="download"
+                  class="c-mask"
+                >
+                  <i class="iconfont icon-download"></i>
+                </a>
+                <div v-else class="c-mask">
+                  <i class="iconfont icon-download"></i>
+                </div>
               </div>
-            </div>
+            </el-form-item>
+          </div>
+          <el-form-item label="企业简介：">
+            <div style="word-break: break-all">{{ c_introduce }}</div>
           </el-form-item>
         </div>
-        <el-form-item label="企业简介：">
-            <div style="word-break: break-all">{{c_introduce}}</div>
-        </el-form-item>
+      </el-form>
+      <div style="text-align: center" class="dialog-footer">
+        <div v-if="c_state === 0">
+          <el-button type="danger" @click="save(c_id, 2)">拒 绝</el-button>
+          <el-button type="primary" @click="save(c_id, 1)">通 过</el-button>
+        </div>
+        <el-button type="info" v-else>{{
+          c_state === 1 ? "已通过" : "已拒绝"
+        }}</el-button>
       </div>
-    </el-form>
-    <div style="text-align:center" class="dialog-footer">
-      <div v-if="c_state === 0">
-        <el-button type="danger" @click="save(c_id,2)">拒 绝</el-button>
-        <el-button type="primary" @click="save(c_id,1)">通 过</el-button>
+    </el-dialog>
+
+    <el-dialog
+      title="新增企业"
+      width="45%"
+      :visible.sync="dialogAddCpnyVisible"
+    >
+      <el-form
+        :model="form"
+        :label-position="'left'"
+        :label-width="formLabelWidth"
+        :rules="rules"
+      >
+        <div style="padding: 0 30px">
+          <div class="add-l">
+            <el-form-item label="企业名称" prop="ac_name">
+              <el-input
+                show-word-limit
+                maxlength="20"
+                v-model="form.ac_name"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="所属区域">
+              <!--<el-input v-model="form.ac_belongArea"  placeholder="请以一个空格为间隔，如“XX省 XX市 XX区”" rows="2" type="textarea" resize="none"></el-input>-->
+              <el-input v-model="form.ac_add_province" style="width: 25%"></el-input
+              ><span>省</span>
+              <el-input v-model="form.ac_add_city" style="width: 25%"></el-input
+              ><span>市</span>
+              <el-input v-model="form.ac_add_area" style="width: 25%"></el-input
+              ><span>区</span>
+            </el-form-item>
+            <el-form-item label="详细地址" prop="ac_address">
+              <el-input
+                show-word-limit
+                maxlength="50"
+                v-model="form.ac_address"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="企业LOGO" prop="ac_logo">
+              <el-upload
+                :headers="{ token }"
+                :action="serverName + '/house/upload'"
+                :show-file-list="true"
+                :before-upload="beforeAvatarUpload"
+                :on-change="handleChange"
+                :file-list="fileList"
+                :on-success="upload_success"
+                :on-error="upload_fail"
+              >
+                <div class="zfb-load">
+                  <el-button style="float: left" size="small" type="primary"
+                    >点击上传</el-button
+                  >
+                  <div style="font-size: 10px; float: left" slot="tip">
+                    1.支持png、jpg和gif图片格式;
+                  </div>
+                  <div style="font-size: 10px; float: left" slot="tip">
+                    2.最多可上传1张图;
+                  </div>
+                  <div style="font-size: 10px; float: left" slot="tip">
+                    3.最大可上传10M的图片。
+                  </div>
+                </div>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="企业简介">
+              <el-input
+                type="textarea"
+                resize="none"
+                rows="9"
+                show-word-limit
+                maxlength="100"
+                v-model="form.ac_introduce"
+              ></el-input>
+            </el-form-item>
+          </div>
+
+          <div class="add-r">
+            <el-form-item label="联系人" prop="ac_user">
+              <el-input
+                show-word-limit
+                maxlength="20"
+                v-model="form.ac_user"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="手机号" prop="ac_phone">
+              <el-input v-model="form.ac_phone"></el-input>
+            </el-form-item>
+            <el-form-item label="企业官网">
+              <el-input
+                v-model="form.ac_website"
+                rows="2"
+                type="textarea"
+                resize="none"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="企业资质" prop="ac_zizhi">
+              <el-upload
+                :action="serverName + '/house/upload'"
+                :show-file-list="true"
+                :before-upload="beforeAvatarUpload"
+                :on-change="handleChange"
+                :file-list="fileList2"
+                :on-success="upload_success2"
+                :on-error="upload_fail"
+              >
+                <div class="zfb-load">
+                  <el-button style="float: left" size="small" type="primary"
+                    >点击上传</el-button
+                  >
+                  <div style="font-size: 10px; float: left" slot="tip">
+                    1.支持png、jpg和gif图片格式;
+                  </div>
+                  <div style="font-size: 10px; float: left" slot="tip">
+                    2.最多可上传1张图;
+                  </div>
+                  <div style="font-size: 10px; float: left" slot="tip">
+                    3.最大可上传10M的图片。
+                  </div>
+                </div>
+              </el-upload>
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+      <div style="text-align: center" class="dialog-footer">
+        <div>
+          <el-button @click="dialogAddCpnyVisible = false">取 消</el-button>
+          <el-button type="primary" @click="addCompany()">提 交</el-button>
+        </div>
       </div>
-      <el-button type="info" v-else>{{c_state===1?'已通过':'已拒绝'}}</el-button>
-    </div>
-  </el-dialog>
-
-  <el-dialog title="新增企业" width="45%" :visible.sync="dialogAddCpnyVisible">
-    <el-form :model="form" :label-position="'left'" :label-width="formLabelWidth">
-      <div style="padding:0 30px">
-        <div class="add-l">
-          <el-form-item label="*企业名称">
-            <el-input show-word-limit maxlength="20" v-model="ac_name"></el-input>
-          </el-form-item>
-          <el-form-item label="*所属区域">
-            <!--<el-input v-model="ac_belongArea"  placeholder="请以一个空格为间隔，如“XX省 XX市 XX区”" rows="2" type="textarea" resize="none"></el-input>-->
-            <el-input v-model="ac_add_province" style="width:25%"></el-input><span>省</span>
-            <el-input v-model="ac_add_city" style="width:25%"></el-input><span>市</span>
-            <el-input v-model="ac_add_area" style="width:25%"></el-input><span>区</span>
-          </el-form-item>
-          <el-form-item label="*详细地址">
-            <el-input show-word-limit maxlength="50" v-model="ac_address"></el-input>
-          </el-form-item>
-          <el-form-item label="*企业LOGO">
-            <el-upload
-              :headers="{token}"
-              :action="serverName+'/house/upload'"
-              :show-file-list="true"
-              :before-upload="beforeAvatarUpload"
-              :on-change="handleChange"
-              :file-list="fileList"
-              :on-success="upload_success"
-              :on-error="upload_fail">
-              <div class="zfb-load">
-                <el-button style="float:left;" size="small" type="primary">点击上传</el-button>
-                <div style="font-size:10px;float:left;" slot="tip">1.支持png、jpg和gif图片格式;</div>
-                <div style="font-size:10px;float:left;" slot="tip">2.最多可上传1张图;</div>
-                <div style="font-size:10px;float:left;" slot="tip">3.最大可上传10M的图片。</div>
-              </div>
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="企业简介">
-            <el-input type="textarea" resize="none" rows="9" show-word-limit maxlength="100" v-model="ac_introduce"></el-input>
-          </el-form-item>
+    </el-dialog>
+
+    <div class="h-header">
+      <!--企业认证的头部内容-->
+      <vcenter>
+        <div>
+          <el-dropdown>
+            <el-button type="primary">
+              {{ dropdown_active.text }}
+              <i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item
+                style="padding: 0"
+                v-for="(item, i) in dropdown_actives"
+                :key="i"
+              >
+                <div style="padding: 0 20px" @click="dropdown_active = item">
+                  {{ item.text }}
+                </div>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+        <div class="h-input">
+          <span>时间段：</span>
+        </div>
+        <div class="fix-date">
+          <el-date-picker
+            v-model="value5"
+            type="datetimerange"
+            :picker-options="pickerOptions2"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd hh:mm:ss"
+            align="right"
+          >
+          </el-date-picker>
+        </div>
+        <div class="h-input"><span>手机号：</span></div>
+        <div>
+          <el-input v-model="userName" placeholder="输入手机号查询"></el-input>
+        </div>
+        <div>
+          <el-button @click="refresh" type="primary">搜索</el-button>
         </div>
 
-        <div class="add-r">
-          <el-form-item label="*联系人">
-            <el-input show-word-limit maxlength="20" v-model="ac_user"></el-input>
-          </el-form-item>
-          <el-form-item label="*手机号">
-            <el-input v-model="ac_phone"></el-input>
-          </el-form-item>
-          <el-form-item label="企业官网">
-            <el-input v-model="ac_website" rows="2" type="textarea" resize="none"></el-input>
-          </el-form-item>
-          <el-form-item label="*企业资质">
-            <el-upload
-              :action="serverName+'/house/upload'"
-              :show-file-list="true"
-              :before-upload="beforeAvatarUpload"
-              :on-change="handleChange"
-              :file-list="fileList2"
-              :on-success="upload_success2"
-              :on-error="upload_fail">
-              <div class="zfb-load">
-                <el-button style="float:left" size="small" type="primary">点击上传</el-button>
-                <div style="font-size:10px;float:left;" slot="tip">1.支持png、jpg和gif图片格式;</div>
-                <div style="font-size:10px;float:left;" slot="tip">2.最多可上传1张图;</div>
-                <div style="font-size:10px;float:left;" slot="tip">3.最大可上传10M的图片。</div>
-              </div>
-            </el-upload>
-          </el-form-item>
+        <div style="float: right; padding-right: 20px">
+          <el-button @click="showAdd" type="primary">新增企业</el-button>
         </div>
-      </div>
-    </el-form>
-    <div style="text-align:center" class="dialog-footer">
-      <div>
-        <el-button @click="dialogAddCpnyVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addCompany()">提 交</el-button>
-      </div>
+      </vcenter>
     </div>
-  </el-dialog>
-
-  <div class="h-header"><!--企业认证的头部内容-->
-    <vcenter>
-      <div>
-        <el-dropdown>
-          <el-button type="primary">
-            {{dropdown_active.text}}
-            <i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item style="padding:0" v-for="(item,i) in dropdown_actives" :key="i">
-              <div style="padding:0 20px;" @click="dropdown_active=item">{{item.text}}</div>
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div>
-      <div class="h-input">
-        <span>时间段：</span>
-      </div>
-      <div class="fix-date">
-        <el-date-picker v-model="value5" type="datetimerange" :picker-options="pickerOptions2" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd hh:mm:ss" align="right">
-        </el-date-picker>
-      </div>
-      <div class="h-input"><span>手机号：</span></div>
-      <div>
-        <el-input v-model="userName" placeholder="输入手机号查询"></el-input>
-      </div>
-      <div>
-        <el-button @click="refresh" type="primary">搜索</el-button>
-      </div>
-
-      <div style="float:right;padding-right:20px">
-        <el-button @click="showAdd" type="primary">新增企业</el-button>
+    <div class="h-body">
+      <el-table
+        height="520"
+        :data="tableData"
+        style="width: 100%; padding: 0 20px"
+      >
+        <el-table-column
+          v-for="(item, i) in tableHeader"
+          :key="i"
+          :prop="item.name"
+          :label="item.label"
+          ><!--企业认证表格前三个标题：提交日期、企业名称、手机号-->
+        </el-table-column>
+        <el-table-column label="状态">
+          <template slot-scope="scope">
+            <span :class="scope.row.state.class">{{
+              scope.row.state.text
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <span class="o-span" @click="show(scope.row)">详细信息</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="p-con">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="currentPage"
+          :page-size="size"
+          layout="prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
       </div>
-
-    </vcenter>
-  </div>
-  <div class="h-body">
-    <el-table height="520" :data="tableData" style="width: 100%;padding:0 20px;">
-      <el-table-column v-for="(item,i) in tableHeader" :key="i" :prop="item.name" :label="item.label"><!--企业认证表格前三个标题：提交日期、企业名称、手机号-->
-      </el-table-column>
-      <el-table-column label="状态">
-        <template slot-scope="scope">
-          <span :class="scope.row.state.class">{{scope.row.state.text}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作">
-        <template slot-scope="scope">
-          <span class="o-span" @click="show(scope.row)">详细信息</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="p-con">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-size="size" layout="prev, pager, next, jumper" :total="total">
-      </el-pagination>
     </div>
   </div>
-</div>
 </template>
 
 <script>
@@ -248,10 +351,6 @@ export default {
       loading: false,
       formLabelWidth: '100px',
       userName: '',
-      form: {
-        ac_logo:'',
-        ac_zizhi:''
-      },
       pagesize: 10,
       size: 10,
       total: 0,
@@ -267,18 +366,43 @@ export default {
       c_zizhi: '',
       c_state: '',
       inpuKey: '',
-      ac_name:'',
-      ac_belongArea:'',
-      ac_add_province:'',
-      ac_add_city:'',
-      ac_add_area:'',
-      ac_address:'',
-      ac_logo:'',
-      ac_introduce:'',
-      ac_user:'',
-      ac_phone:'',
-      ac_website:'',
-      ac_zizhi:'',
+      form: {
+        ac_name:'',
+        ac_belongArea: '',
+        ac_add_province:'',
+        ac_add_city:'',
+        ac_add_area:'',
+        ac_address:'',
+        ac_logo:'',
+        ac_introduce:'',
+        ac_user:'',
+        ac_phone:'',
+        ac_website:'',
+        ac_zizhi:'',
+      },
+      rules: {
+        ac_name: [{ required: true, message: '企业名称不能为空', trigger:'blur' }],
+        ac_add_province: [{ required: true, message: '所属区域不能为空', trigger:'blur' }],
+        ac_add_city: [{ required: true, message: '所属区域不能为空', trigger:'blur' }],
+        ac_add_area: [{ required: true, message: '所属区域不能为空', trigger:'blur' }],
+        ac_address: [{ required: true, message: '详细地址不能为空', trigger:'blur' }],
+        ac_logo: [{ required: true, message: '企业LOGO不能为空', trigger:'blur' }],
+        ac_user: [{ required: true, message: '联系人不能为空', trigger:'blur' }],
+        ac_phone: [{ required: true, message: '手机号不能为空', trigger:'blur' }],
+        ac_zizhi: [{ required: true, message: '企业资质不能为空', trigger:'blur' }],
+      },
+      // ac_name:'',
+      // ac_belongArea:'',
+      // ac_add_province:'',
+      // ac_add_city:'',
+      // ac_add_area:'',
+      // ac_address:'',
+      // ac_logo:'',
+      // ac_introduce:'',
+      // ac_user:'',
+      // ac_phone:'',
+      // ac_website:'',
+      // ac_zizhi:'',
       pickerOptions2: {                             //:picker-options="pickerOptions2"
         shortcuts: [{
           text: '最近一周',
@@ -467,7 +591,7 @@ export default {
         this.$message.error('上传图片大小不能超过 10MB!')
         return false
       }
-      const isFormat = file.type === 'image/jpg' || file.type === 'image/png' || file.type === 'image/gif'
+      const isFormat = file.type == 'image/jpg' || file.type == 'image/png' || file.type == 'image/gif' || file.type == 'image/jpeg'
       if (!isFormat) {
         this.$message.error('上传图片格式错误!')
         return false
@@ -488,12 +612,12 @@ export default {
     upload_success (data) {
       console.log('上传成功')
       console.log(data)
-      this.ac_logo = data.message
+      this.form.ac_logo = data.message
     },
     upload_success2 (data) {
       console.log('上传成功')
       console.log(data)
-      this.ac_zizhi = data.message
+      this.form.ac_zizhi = data.message
     },
     upload_fail (data) {
       this.$notify.error({
@@ -504,15 +628,15 @@ export default {
     //新增企业
     addCompany(){
       let params = {
-        name: this.ac_name,
-        area: this.ac_add_province + '省 ' + this.ac_add_city + '市 ' + this.ac_add_area + '区',
-        address: this.ac_address,
-        logo: this.ac_logo,
-        introduce: this.ac_introduce,
-        contacts: this.ac_user,
-        phone: this.ac_phone,
-        website: this.ac_website,
-        qualification: this.ac_zizhi
+        name: this.form.ac_name,
+        area: this.form.ac_add_province + '省 ' + this.form.ac_add_city + '市 ' + this.form.ac_add_area + '区',
+        address: this.form.ac_address,
+        logo: this.form.ac_logo,
+        introduce: this.form.ac_introduce,
+        contacts: this.form.ac_user,
+        phone: this.form.ac_phone,
+        website: this.form.ac_website,
+        qualification: this.form.ac_zizhi
       }
       this.$http({
         method: 'post',
@@ -563,7 +687,7 @@ export default {
   .con-main {
     padding: 0 30px;
     .d-l {
-      display: inline-block
+      display: inline-block;
     }
 
     .d-r {
@@ -617,12 +741,12 @@ export default {
     }
   }
 
-  .add-l{
+  .add-l {
     display: inline-block;
-    width:45%;
+    width: 45%;
   }
-  .add-r{
-    width:45%;
+  .add-r {
+    width: 45%;
     float: right;
   }
 
@@ -665,7 +789,6 @@ export default {
         left: 0;
       }
     }
-
   }
 
   .h-header {

src/pages/equipment/index.vue

@@ -1,8 +1,8 @@
 <template slot-scope="scope">
   <div class="con" v-loading.fullscreen.lock="loading">
     <el-dialog width="470px" title="添加相机" :visible.sync="cameraVisible">
-      <el-form label-width="80px">
-        <el-form-item label="出库类型">
+      <el-form label-width="80px" :rules="rules" :model="ruleForm">
+        <el-form-item label="出库类型" prop="own">
           <el-select v-model="ruleForm.own" placeholder="请选择出库类型">
             <el-option label="正常销售" value="0"></el-option>
             <el-option label="礼品赠送" value="2"></el-option>
@@ -10,7 +10,7 @@
             <el-option label="其他" value="3"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="相机类型">
+        <el-form-item label="相机类型" prop="type">
           <el-select v-model="ruleForm.type" placeholder="请选择相机类型">
             <el-option label="四维看看Pro八目相机" value="1"></el-option>
             <el-option label="四维看看Lite双目相机" value="0"></el-option>
@@ -19,24 +19,36 @@
             <el-option label="第三方相机" value="6"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="wifi名称">
+        <el-form-item label="设备ID" prop="childName">
+          <el-input v-model="ruleForm.childName"></el-input>
+        </el-form-item>
+        <el-form-item label="wifi名称" prop="wifi">
           <el-input v-model="ruleForm.wifi"></el-input>
         </el-form-item>
-        <el-form-item label="物理地址">
+        <el-form-item label="物理地址" prop="address">
           <el-input v-model="ruleForm.address"></el-input>
         </el-form-item>
-        <el-form-item v-if="ruleForm.type != 6" label="*sn码">
-          <el-input v-model="ruleForm.snCode" required></el-input>
+        <el-form-item
+          v-if="ruleForm.type != '' && ruleForm.type != 6"
+          label="* sn码"
+        >
+          <el-input v-model="ruleForm.snCode"></el-input>
         </el-form-item>
-        <el-form-item label="初始点数">
-          <el-input v-model="ruleForm.initPoint"></el-input>
+        <el-form-item label="初始点数" prop="balance">
+          <el-input v-model="ruleForm.balance"></el-input>
         </el-form-item>
-        <el-form-item label="订单号">
-          <el-input v-model="ruleForm.orderNum"></el-input>
+        <el-form-item label="订单号" prop="orderSn">
+          <el-input v-model="ruleForm.orderSn"></el-input>
         </el-form-item>
-        <el-form-item label="客户名称">
+        <el-form-item label="客户名称" prop="compantId">
           <el-select v-model="ruleForm.companyId" placeholder="请选择">
-            <el-option v-for="(item,i) in companyList" :key="i" :label="item.name" :value="item.id">{{item.name}}</el-option>
+            <el-option
+              v-for="(item, i) in companyList"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              >{{ item.name }}</el-option
+            >
           </el-select>
         </el-form-item>
       </el-form>
@@ -112,7 +124,7 @@ export default {
       size: 10,
       total: 0,
       userName: "",
-      companyList:[],
+      companyList: [],
       childName: "",
       tableData: [],
       tableHeader: [
@@ -120,6 +132,7 @@ export default {
         { name: "userName", label: "手机号(用户名)" },
         { name: "goodsName", label: "设备类型" },
         { name: "snCode", label: "sn码" },
+        { name: "wifi", label: "wifi"},
         { name: "activatedTime", label: "激活时间" },
         { name: "own", label: "出货类型" },
         { name: "companyName", label: "客户名称" },
@@ -130,19 +143,31 @@ export default {
       ruleForm: {
         wifi: "",
         address: "",
-        initPoint: "",
+        // initPoint: "",
+        balance:"",
         type: [],
         own: [],
         snCode: "",
-        orderNum: "",
+        orderSn: "",
         companyId: "",
+        childName:""
       },
-      addEq: {
-        userName: "",
-        companyId: "",
-        shebeiNum: "",
-        shebeiId: "",
+      rules:{
+        own: [{required: true, message:'出库类型不能为空'}],
+        type: [{required: true, message:'相机类型不能为空'}],
+        childName: [{required: true, message:'设备ID不能为空', trigger: 'blur'}],
+        wifi: [{required: true, message:'wifi名称不能为空', trigger: 'blur'}],
+        address: [{required: true, message:'物理地址不能为空', trigger: 'blur'}],
+        balance: [{required: true, message:'初始点数不能为空', trigger: 'blur'}],
+        orderSn: [{required: true, message:'订单号不能为空', trigger: 'blur'}],
+        companyId: [{required: true, message:'客户名称不能为空', trigger: 'blur'}]
       },
+      // addEq: {
+      //   userName: "",
+      //   companyId: "",
+      //   shebeiNum: "",
+      //   shebeiId: "",
+      // },
       addDevies: [
         {
           value: "",
@@ -162,7 +187,7 @@ export default {
     //   console.log(`当前页: ${val}`);
     // },
     getData() {
-      if (!Number(this.currentPage)) this.currentPage = 1
+      if (!Number(this.currentPage)) this.currentPage = 1;
       let params = {
         userName: this.userName || "",
       };
@@ -175,28 +200,30 @@ export default {
           pageNum: this.currentPage,
           pageSize: this.size,
         },
-      }).then( res => {
+      }).then((res) => {
         this.tableData = res.message.list;
-        this.total = res.message.total
+        this.total = res.message.total;
         // this.currentPage = res.message.pageNum
       });
     },
     addCamera() {
-      if(this.ruleForm.type != 6 && this.ruleForm.snCode == ''){
-        this.$alert('sn码不能为空!','提示',{
-          confirmButtonText: '确定',
-        })
-        return
+      if (this.ruleForm.type != 6 && this.ruleForm.snCode == "") {
+        this.$alert("sn码不能为空!", "提示", {
+          confirmButtonText: "确定",
+        });
+        return;
       }
       let params = {
         wifi: this.ruleForm.wifi,
         address: this.ruleForm.address,
-        initPoint: this.ruleForm.initPoint,
+        // initPoint: this.ruleForm.initPoint,
+        balance: this.ruleForm.balance,
         type: this.ruleForm.type,
         own: this.ruleForm.own,
         snCode: this.ruleForm.snCode,
-        orderNum: this.ruleForm.orderNum,
+        orderSn: this.ruleForm.orderSn,
         companyId: this.ruleForm.companyId,
+        childName: this.ruleForm.childName
       };
       this.$http({
         method: "post",
@@ -206,32 +233,43 @@ export default {
           token: window.localStorage.getItem("zfb_token"),
           pageNum: this.currentPage,
           pageSize: this.size,
+        },
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$alert("相机添加成功", "提示", {
+            confirmButtonText: "确定",
+            callback: (action) => {
+              this.getCompanyList();
+              this.ruleForm = {
+                wifi: "",
+                address: "",
+                // initPoint: "",
+                balance:"",
+                type: [],
+                own: [],
+                snCode: "",
+                orderSn: "",
+                companyId: "",
+                childName:""
+              }
+              this.cameraVisible = false;
+              this.refresh()
+            },
+          });
+        } else {
+          this.$alert("相机添加失败", "提示", {
+            confirmButtonText: "确定",
+            callback: (action) => {},
+          });
         }
-      }).then(res => {
-        if(res.code === 200){
-          this.$alert('相机添加成功','提示',{
-            confirmButtonText: '确定',
-            callback: action => {
-              this.getCompanyList()
-              this.cameraVisible = false
-            }
-          })
-        }else{
-          this.$alert('相机添加失败','提示',{
-            confirmButtonText: '确定',
-            callback: action => {
-
-            }
-          })
-        }
-      })
+      });
     },
-    async getCompanyList(){
-      let result = await this.$http.post('/company/listAll')
-      this.companyList = result.message
+    async getCompanyList() {
+      let result = await this.$http.post("/company/listAll");
+      this.companyList = result.message;
     },
-    handleCurrentChange (val) {
-      this.currentPage = val
+    handleCurrentChange(val) {
+      this.currentPage = val;
     },
     refresh() {
       this.loading = true;
@@ -271,13 +309,13 @@ export default {
     },
   },
   mounted() {
-    this.getCompanyList()
+    this.getCompanyList();
     console.log("mounted");
     this.refresh();
   },
   watch: {
     currentPage() {
-      this.getData()
+      this.getData();
     },
     // size() {
     //   this.refresh();

src/pages/home/index.vue

@@ -76,7 +76,7 @@
         </el-form-item>
         <el-form-item label="已添加子账号数：">
           <span>{{ShowChildUser.length}}个</span>
-          <div style="float:right;color:blue;cursor:pointer;padding-right:30px" @click="addZiVisible = true">
+          <div style="float:right;color:#0175dc;cursor:pointer;padding-right:30px" @click="addZiVisible = true">
             <span><i class="el-icon-circle-plus-outline"></i> 新增子账号</span>
           </div>
         </el-form-item>
@@ -142,7 +142,7 @@
           <el-table-column label="手机号" width="200px" prop="phone"></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <span @click="ChangeZi(scope.row)" style="cursor:pointer;color:blue;">修改</span>
+              <span @click="ChangeZi(scope.row)" style="cursor:pointer;color:#0175dc;">修改</span>
               <span @click="JiebangZi(scope.row)" style="cursor:pointer;color:red;">解绑</span>
             </template>
           </el-table-column>
@@ -155,7 +155,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog width="490px" title="新增设备" :visible.sync="ShebeiVisible">
+    <el-dialog width="700px" title="新增设备" :visible.sync="ShebeiVisible">
           <el-form label-width="80px">
             <el-form-item label="企业名称:">
               <span>{{c_userName}}</span>
@@ -1083,7 +1083,7 @@ export default {
                   message: '该账号已被其他企业绑定'
                 })
               }
-              else if(res.code == false){
+              else if(res.message == false){
                 this.ShowChildUser.unshift({...this.addZi})
                 this.addZi = {nickName:'',phone:'',id:''}
                 this.addZiVisible = false

src/pages/scene/index.vue

@@ -36,7 +36,7 @@
                 </el-table-column>
                 <el-table-column label="操作">
                   <template slot-scope="scope">
-                  <span @click="S_download(scope.row)" style="cursor:pointer;color:blue;">下载场景</span>
+                  <span @click="S_download(scope.row)" style="cursor:pointer;color:#0175dc;">下载场景</span>
                   </template>
                 </el-table-column>
             </el-table>
@@ -89,7 +89,7 @@ export default {
           method: 'get',
           url:`/scene/downloadSceneData?sceneNum=${webSite}`,
           headers:{
-            token: this.token
+            token: window.localStorage.getItem('zfb_token')
           }
         }).then(res =>{
           this.loading = false
@@ -160,9 +160,9 @@ export default {
       currentPage(){
         this.refresh()
       },
-      size(){
-        this.refresh()
-      },
+      // size(){
+      //   this.refresh()
+      // },
       num (newVal, oldVal) {
       if (newVal > oldVal) {
         this.addDevies.push({