1

src/views/modules/eam/eam_device_list.vue

@@ -612,7 +612,7 @@
           label="设备分类">
         </el-table-column>
         <el-table-column
-          prop="familyName"
+          prop="familyDesc"
           header-align="center"
           align="left"
           min-width="30"

src/views/modules/sys/menu.vue

@@ -75,9 +75,9 @@
         <template slot-scope="scope">
           <a v-if="isAuth('sys:menu:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.menuId)">{{buttons.edit||'修改'}}</a>
           <a v-if="isAuth('sys:menu:delete')" type="text" size="small" @click="deleteHandle(scope.row.menuId)">{{buttons.delete||'删除'}}</a>
-          <a  type="text" size="small" @click="addOrUpdateLanguage(scope.row.menuId)">{{buttons.language||'语言'}}</a>
-          <a v-if="isAuth('sys:oss:all') && scope.row.type === 1 " type="text" size="small" @click="helpFileList(scope.row.menuId)">
-            {{buttons.helpFile || '帮助文档'}}</a>
+<!--          <a  type="text" size="small" @click="addOrUpdateLanguage(scope.row.menuId)">{{buttons.language||'语言'}}</a>-->
+<!--          <a v-if="isAuth('sys:oss:all') && scope.row.type === 1 " type="text" size="small" @click="helpFileList(scope.row.menuId)">-->
+<!--            {{buttons.helpFile || '帮助文档'}}</a>-->
         </template>
       </el-table-column>
     </el-table>

src/views/modules/sys/role.vue

@@ -43,7 +43,7 @@
         <template slot-scope="scope">
           <a v-if="isAuth('sys:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.roleId)">{{buttons.edit||'修改'}}</a>
           <a v-if="isAuth('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.roleId)">{{buttons.delete|| '删除'}}</a>
-          <a type="text" size="small" @click="showAuthCustomerReportModal(scope.row)">{{buttons.reportRole || '报表赋权'}}</a>
+<!--          <a type="text" size="small" @click="showAuthCustomerReportModal(scope.row)">{{buttons.reportRole || '报表赋权'}}</a>-->
         </template>
       </el-table-column>
     </el-table>

src/views/modules/sys/user-add-or-update.vue

@@ -37,12 +37,12 @@
             <span slot="label" style="" @click="getBaseList(93)"><a herf="#">{{buttons.site||'工厂'}}</a></span>
             <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>
           </el-form-item>
-          <el-form-item :label="buttons.language||'语言'" prop="languageDefault">
-            <el-select filterable v-model="dataForm.languageDefault" clearable style="width: 150px;">
-              <el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "
-                         :key="index"></el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item :label="buttons.language||'语言'" prop="languageDefault">-->
+<!--            <el-select filterable v-model="dataForm.languageDefault" clearable style="width: 150px;">-->
+<!--              <el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "-->
+<!--                         :key="index"></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
         </el-form>
         <el-form>
           <el-form-item label="角色" size="mini" prop="roleIdList">

src/views/modules/sys/user.vue

@@ -9,14 +9,14 @@
         <el-button v-if="isAuth('sys:user:save')" type="primary" @click="addOrUpdateHandle()">
           {{ buttons.add || '新增' }}
         </el-button>
-        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"
-                   @click="specialAuthorize()"
-        >{{ buttons.specialCompetencies || '特殊权限' }}
-        </el-button>
-        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"
-                   @click="siteAuthorize()"
-        > {{ buttons.factoryAuthorization || '工厂授权' }}
-        </el-button>
+<!--        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"-->
+<!--                   @click="specialAuthorize()"-->
+<!--        >{{ buttons.specialCompetencies || '特殊权限' }}-->
+<!--        </el-button>-->
+<!--        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"-->
+<!--                   @click="siteAuthorize()"-->
+<!--        > {{ buttons.factoryAuthorization || '工厂授权' }}-->
+<!--        </el-button>-->
       </el-form-item>
     </el-form>
     <el-table
@@ -77,7 +77,7 @@
         width="150"
         :label="buttons.cz||'操作'">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="generateData(scope.row)">{{ buttons.auth || '审核' }}</a>
+<!--          <a type="text" size="small" @click="generateData(scope.row)">{{ buttons.auth || '审核' }}</a>-->
           <a v-if="isAuth('sys:user:update')" type="text" size="small"
              @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>
           <a v-if="isAuth('sys:user:delete')" type="text" size="small"

static/config/index-prod.js

@@ -5,7 +5,7 @@
   window.SITE_CONFIG = {};
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.2:9096';
+  window.SITE_CONFIG['baseUrl'] = 'http://172.26.68.17:9002';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名