Merge branch 'master' of http://114.244.114.158:8802/siwei/spotcheck-management

src/views/login.vue

@@ -72,8 +72,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "123456",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

src/views/remote/farmland/index.vue

@@ -128,7 +128,7 @@
 import MapView from "../MapView.vue";
 import CustomDetails from "@/components/custom-detailsInfo.vue";
 import parse from "wellknown";
-import { pinyin } from "pinyin-pro";
+// import { pinyin } from "pinyin-pro";
 import {
   getPcsj,
   listPcsjXQList,

src/views/remote/satellite/index.vue

@@ -56,10 +56,10 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
+          v-hasPermi="['supervise:pcsj:list']"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"  v-hasPermi="['supervise:pcsj:list']" >重置</el-button
         >
       </el-form-item>
     </el-form>
@@ -72,6 +72,7 @@
           icon="el-icon-upload"
           @click="fileUploadHandle"
           size="mini"
+          v-hasPermi="['supervise:pcsj:upload']"
           >上传</el-button
         >
       </el-col>
@@ -170,6 +171,7 @@
             icon="el-icon-edit"
             @click="handleBrowse(scope.row)"
             :disabled="scope.row.readstatus != 0"
+            v-hasPermi="['supervise:pcsj:list']"
             >浏览</el-button
           >
           <el-button
@@ -177,6 +179,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleDownload(scope.row)"
+            v-hasPermi="['supervise:pcsj:list']"
             >下载</el-button
           >
         </template>
@@ -247,8 +250,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" v-hasPermi="['supervise:pcsj:upload']" @click="submitForm">确 定</el-button>
+        <el-button  v-hasPermi="['supervise:pcsj:upload']"  @click="cancel">取 消</el-button>
       </div>
     </el-dialog>