浏览代码

验证增加+合并

rui.jiang 1 年之前
父节点
当前提交
ee29d8918d

二进制
dist.zip


+ 2 - 2
src/components/map/index.vue

@@ -121,8 +121,8 @@ export default {
       layers: [
         new TileLayer({
           source: new XYZ({
-            url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内外
+            // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
+            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内外
           }),
         }),
         new VectorLayer({

+ 1 - 1
src/views/dataAdministration/index.vue

@@ -499,7 +499,7 @@ export default {
           })
             .then((res) => {
               this.$message({
-                message: this.editTransferStateTitle + "成功",
+                message: "操作成功",
                 type: "success",
               });
               this.getTableList();

+ 2 - 1
src/views/performance/batchMag.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:23:37
- * @LastEditTime: 2024-06-17 16:40:01
+ * @LastEditTime: 2024-06-18 16:08:24
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/batchMag.vue
@@ -120,6 +120,7 @@
               @click="deleted(scope.row)"
               type="text"
               size="small"
+              :disabled="scope.row.batchState == 1"
               >删除</el-button
             >
           </template>

+ 1 - 0
src/views/system/menuMag/index.vue

@@ -114,6 +114,7 @@
               @click="deleted(scope.row)"
               type="text"
               size="small"
+              :disabled="scope.row.permissionState == 1"
               >删除</el-button
             >
           </template>

+ 1 - 1
src/views/system/roleMag/index.vue

@@ -137,12 +137,12 @@
               size="small"
               >停用</el-button
             >
-
             <el-button
               style="color: #f00"
               @click="deleted(scope.row)"
               type="text"
               size="small"
+              :disabled="scope.row.roleAvailable == 1"
               >删除</el-button
             >
           </template>

+ 1 - 0
src/views/system/userMag/index.vue

@@ -121,6 +121,7 @@
               @click="deleted(scope.row)"
               type="text"
               size="small"
+              :disabled="scope.row.state == 1"
               >删除</el-button
             >
           </template>