fix: BUG修改

src/assets/js/http.js

@@ -84,9 +84,9 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
-  axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
+  // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头

src/store/index.js

@@ -48,13 +48,13 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    UPLOADURL:'http://182.90.224.237:51234/upload/image/',
+    // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
-    FILEURL:'http://182.90.224.237:51234/image/',
+    // FILEURL:'http://182.90.224.237:51234/image/',
     // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
     // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
+    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
-    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
+    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
-    // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
+    WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
     // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
     // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程

src/views/projectFront/carManage/carManage.vue

@@ -141,19 +141,19 @@
             <!-- {{ $t('message.carManage.isBlackArr')[scope.row.isBlack] }} -->
             <!-- v-permission="{key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'}" -->
             {{ $t("message.carManage.isBlackArr")[scope.row.isBlack] }}
+            <!-- :disabled="
+                !editPermission
+                  ? true
+                  : [2, 3].includes(scope.row.carModuleType)
+                  ? true
+                  : false
+              " -->
             <el-switch
               v-model="scope.row.isBlack"
               active-color="#409EFF"
               :active-value="0"
               inactive-color="#000000"
               :inactive-value="1"
-              :disabled="
-                !editPermission
-                  ? true
-                  : [2, 3].includes(scope.row.carModuleType)
-                  ? true
-                  : false
-              "
               @change="(e) => blackSwich(e, scope.row)"
             >
             </el-switch>
@@ -768,7 +768,7 @@
                                   :placeholder="$t('message.deviceManage.placeholder')"></el-input>
                     </el-form-item> -->
           <!-- 是否黑名单 -->
-          <!-- <el-form-item :label="$t('message.carManage.isBlack')" prop="isBlack">
+          <el-form-item :label="$t('message.carManage.isBlack')" prop="isBlack">
             <el-radio-group v-model="addEditForm.isBlack">
               <el-radio
                 v-for="(i, index) in $t('message.carManage.isBlackArr')"
@@ -777,7 +777,7 @@
                 >{{ i }}
               </el-radio>
             </el-radio-group>
-          </el-form-item> -->
+          </el-form-item>
           <!-- 报警推送人 -->
           <el-form-item :label="$t('message.deviceManage.alarmPushWorkerId')">
             <el-select
@@ -1007,7 +1007,7 @@
                       >是否黑名单：</span
                     >
                     <span class="value">{{
-                      entityDetail.isBlack === 0 ? "是" : "否"
+                      entityDetail.isBlack === 1 ? "是" : "否"
                     }}</span>
                   </div>
                 </el-col>
@@ -1464,6 +1464,7 @@ export default {
       ],
       addEditForm: {
         // uDevId: [],
+        isBlack: 0
       },
       pagInfo: {
         pageNo: 1, //页数
@@ -1858,7 +1859,7 @@ export default {
         if (valid) {
           if (this.Popup.type === "add") {
             // 默认白名单
-            params.isBlack = 0;
+            // params.isBlack = 0;
             addCarInfoApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message);
@@ -1930,7 +1931,9 @@ export default {
       });
     },
     close() {
-      this.addEditForm = {};
+      this.addEditForm = {
+        isBlack: 0
+      };
       this.fileList = [];
       this.fileList2 = [];
       this.fileList3 = [];

src/views/projectFront/configManage/roleManage.vue

@@ -50,7 +50,7 @@
           <el-table-column prop="roleDesc" :label="$t('message.roleManage.miaoshu')" align="center"></el-table-column >
           <el-table-column :label="$t('message.alarmValueSet.operation')" align="center">
             <template slot-scope="scope">
-              <div class="tableBtns" style="margin-left: 120px !important">
+              <div class="operation-style">
                 <div v-permission="{key: 'roleManage_edit', menuPath: '/project/configManage/roleManage'}" @click="edit(scope.row)" class="operationText">
                   <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
                   <span>{{ $t("message.alarmValueSet.edit") }}</span>