提交

src/assets/js/http.js

@@ -85,8 +85,8 @@ if (process.env.NODE_ENV == 'development') {
     // 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.155:19111/' //彭洁本地
+    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/' //嘉兴王江泾公用码头
@@ -260,8 +260,7 @@ function logout() {
         name: '工作站',
         id: 1,
         url: '/projectV2/taskList',
-    menuList: [
+        menuList: [{
-      {
                 id: 100000,
                 menuName: '任务清单',
                 path: '/projectV2/taskList',

src/views/projectFront/laborManage/assessmentCentent.vue

@@ -80,6 +80,7 @@
               <template slot-scope="scope">
                 <div class="tableBtns">
                   <el-button
+                  v-permission="{key: 'pjzx_detail', menuPath: '/project/labor/assessmentCentent'}"
                     type="text"
                     class="operationText"
                     @click="detailInfoBtn(scope.row)"
@@ -225,6 +226,7 @@
               <template slot-scope="scope">
                 <div class="tableBtns">
                   <el-button
+                  v-permission="{key: 'pjzx_detail', menuPath: '/project/labor/assessmentCentent'}"
                     type="text"
                     class="operationText"
                     @click="detailInfoBtn(scope.row)"

src/views/projectFront/laborManage/penalize.vue

@@ -79,7 +79,8 @@
         </el-table-column>
         <el-table-column align="center" label="操作">
           <template slot-scope="scope">
-            <div class="tableBtns" style="margin-left: 35px;">
+            <!-- style="margin-left: 35px;" -->
+            <div class="tableBtns" >
               <div v-permission="{key: 'penalize_detail', menuPath: '/project/labor/penalize'}" class="operationText" @click="detailBtn(scope.row)">
                 <img
                   src="@/assets/images/xm_num.png"

src/views/projectFront/progressManagementAg/lcbManage.vue

@@ -51,7 +51,7 @@
               <p class="pageTitle">
                 承包商列表
               </p>
-              <vue-scroll style="height: calc(100% - 30px)" v-if="level1CompanyData.length > 0">
+              <vue-scroll v-if="level1CompanyData.length > 0">
                 <el-tree
                   :data="level1CompanyData"
                   :props="defaultProps"
@@ -136,7 +136,7 @@
                   >刷新</el-button
                 > -->
                 <el-button
-                v-permission="{key: 'jdsp_add', menuPath: '/project/progressManagementAg/lcbManage'}"
+                v-permission="{key: 'lcbManage_add', menuPath: '/project/progressManagementAg/lcbManage'}"
                   class="expintBtn"
                   size="medium"
                   type="primary"
@@ -201,7 +201,7 @@
                 <el-table-column width="300" label="操作" align="center">
                   <template slot-scope="scope">
                     <el-button
-                    v-permission="{key: 'jdsp_edit', menuPath: '/project/progressManagementAg/lcbManage'}"
+                    v-permission="{key: 'lcbManage_edit', menuPath: '/project/progressManagementAg/lcbManage'}"
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
@@ -210,7 +210,7 @@
                       编辑
                     </el-button>
                     <el-button
-                    v-permission="{key: 'jdsp_delete', menuPath: '/project/progressManagementAg/lcbManage'}"
+                    v-permission="{key: 'lcbManage_delete', menuPath: '/project/progressManagementAg/lcbManage'}"
                       size="mini"
                       type="text"
                       class="delete-btn"
@@ -1121,7 +1121,7 @@ export default {
     display: flex;
     flex-direction: column;
     .treeBox {
-      height: 87%;
+      flex: 1;
       background-color: rgba(216, 216, 216, 0.2);
       padding-top: 10px;
       margin-top: 20px;

src/views/projectFront/safeSame/criterionModule/qualityProblemBank.vue

@@ -45,7 +45,6 @@
                   >
                 </el-tooltip>
                 <el-button
-                v-permission="{key: 'criterion_open', menuPath: '/project/safeSame/criterion'}"
                   v-if="data.recordStatus == 1"
                   type="text"
                   size="mini"
@@ -54,9 +53,9 @@
                   {{ $t('message.quality.click')
                   }}{{ $t('message.quality.startUsing') }}
                 </el-button>
+                <!-- v-permission="{key: 'criterion_stop', menuPath: '/project/safeSame/criterion'}" -->
                 <el-button
-                v-permission="{key: 'criterion_stop', menuPath: '/project/safeSame/criterion'}"
+                v-if="data.recordStatus != 1"
-                  v-else
                   type="text"
                   size="mini"
                   @click.stop="() => singleEditState(node, data, 1)"

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -320,6 +320,7 @@
         <template slot-scope="scope">
           <div class="tableBtns" style="justify-content: center">
             <div
+            v-permission="{key: 'inspectionLedger_detail', menuPath: '/project/safeSame/inspectionLedger'}"
               @click="newShowDatadetails(scope.row, scope.$index)"
               class="operationText last"
             >