宝霆问题修改前端

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/dashboard/index.vue

@@ -61,60 +61,9 @@
       </el-col>
     </el-row>
 
-    <!-- 中-echarts表 -->
-    <el-row class="rowCls">
-    	<el-col>
-    			<el-row>
-    				<el-col>
-    					<div class="blockTitle">
-    						<el-row>
-    							<!-- 企产线运行时间统计 -->
-			    				<el-col :xs="24" :sm="24" :lg="6">
-						      	<span class="titleSpan">设备地图</span>
-						      </el-col>
-						      <el-col :xs="24" :sm="24" :lg="20" align="center">
-								<!--
-							    <span>设备状态:</span>
-							    <el-select class="el-select" :lg="1" size="small" placeholder="请选择">
-								   <option>全部</option>
-								   <option>启用</option>
-								   <option>禁用</option>
-								</el-select>-->
-								<span>地区:</span>
-							    <el-select v-model="plc_pid" class="el-select" :lg="1" placeholder="请选择" size="small"  @change="((val)=>{areaChange(val, 1)})">
-									<el-option v-for="option in areaIds.plc_pid" :key="option.value" :label="option.label" :value="option.value" />
-								</el-select>
-								<el-select v-model="plc_cid" class="el-select" :lg="1" placeholder="请选择" size="small" @change="((val)=>{areaChange(val, 2)})">
-									<el-option v-for="option in areaIds.flt_cid" :key="option.value" :label="option.label" :value="option.value" />
-								</el-select>
-								<el-select v-model="queryParams.model.areaId" class="el-select" :lg="1" placeholder="请选择" size="small" @change="getResourceData()">
-									<el-option v-for="option in areaIds.flt_aid" :key="option.value" :label="option.label" :value="option.value" />
-								</el-select>
-								<span>关键词:</span>
-								<el-input type="text" v-model="queryParams.model.name"  :placeholder='$t("common.pleaseEnter")' style="width: 180px;" size="medium"  :lg="2" />								
-								<el-button type="primary" :lg="1"  style="margin-left: 10px;" round  @click="getResourceData">查询</el-button>
-							   </el-col>
-			    			</el-row>
-    					</div>
-    				</el-col>
-    			</el-row>
-    			<el-row>
-    				<el-col :xs="24" :sm="14" :lg="24">
-			      	<div class="chart-wrapper" style="position:relative;">
-			      		<!-- 地图区域 -->
-					   		<!--<el-image :src="resolveLogo(mapImg)" fit="contain" ></el-image>-->
-					   		<!-- 加载【百度地图】-可选择自动定位-组件 -->
-		  					<bmap-location :mapCenter="mapCenter" :markerList="locations" @markerClk="showDetail"></bmap-location>
-			        </div>
-							<!--<div v-for=" item in locations" :style="'position:absolute; top:'+ item.positionY +';left:'+ item.positionX +';z-index:999;'">
-								<el-image :src="resolveLogo(locImg)" :id="item.id" @click="showDetail(item)" ></el-image>
-							</div>-->
-			       </el-col>
-    			</el-row>
-    	</el-col>
-    </el-row>
-
+     
 
+<!-- 
 	<el-dialog title="位置详情" :visible.sync="dialogVisible">
 		<el-form :model="item">
 		    <el-form-item label="设备编号:" >
@@ -141,7 +90,7 @@
 			<el-button @click="dialogVisible = false">取 消</el-button>
 			<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
 		</div>
-	</el-dialog>
+	</el-dialog> -->
 
 
 	    <!-- 中-echarts表 -->

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/goods/goodsManage/Index.vue

@@ -167,14 +167,12 @@
 
           <i @click="flowOfProduction(row)" class="el-icon-s-tools table-operation" size="max"
              :title="$t('bt.operation.flowOfProduction')"
-             style="color: #2db7f5;" v-hasPermission="['parameter:add']"/>
+             style="color: #2db7f5;" />
           <i @click="edit(row)" class="el-icon-edit table-operation" :title="$t('common.edit')"
-             style="color: #2db7f5;" v-hasPermission="['parameter:update']"/>
+             style="color: #2db7f5;" />
           <i @click="singleDelete(row)" class="el-icon-delete table-operation" :title="$t('common.delete')"
-             style="color: #f50;" v-hasPermission="['parameter:delete']"/>
-          <el-link class="no-perm" v-has-no-permission="['parameter:update', 'parameter:add', 'parameter:delete']">
-            {{ $t("tips.noPermission") }}
-          </el-link>
+             style="color: #f50;" />
+           
         </template>
       </el-table-column>
     </el-table>

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/goods/goodsManage/process.vue

@@ -34,11 +34,8 @@
         <el-table-column
           :label="$t('table.operation')" column-key="operation" align="center" class-name="small-padding fixed-width"
           width="300px">
-          <template slot-scope="{ row }">
-            <i @click="addFormula(row)" class="el-icon-s-tools"
-               :title="$t('bt.operation.configuration')"
-               style="color: #2db7f5;"/>
-
+          <template slot-scope="{ row }"> 
+          <a class="rowBtn"  @click="addFormula(row)" >配置工艺</a>
             <el-switch
               v-model="row.isProCfg"
               active-color="#13ce66"
@@ -331,4 +328,13 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.rowBtn {
+  margin: 0 5px;
+  color: #1890ff;
+}
+
+.rowBtn:hover {
+  opacity: 0.7;
+}
+</style>

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/Index.vue

@@ -193,30 +193,27 @@
         </template>
       </el-table-column>
       <el-table-column
-        :label="$t('table.operation')" align="center" column-key="operation" class-name="small-padding fixed-width"
-        width="200px">
-        <template slot-scope="{ row }" v-hasPermission="['productionResource:view']">
-          <i @click="editProductMgr(row)" class="el-icon-view table-operation"
-             :title="$t('productionResource.productMgr')"
-             style="color: #2db7f5;"/>
-          <i @click="editMaterialMgr(row)" class="el-icon-s-tools table-operation"
+        :label="$t('table.operation')" align="center" column-key="operation"  width="200px">
+        <template slot-scope="{ row }"  v-hasPermission="['productionResource:view']">  
+           <a class="rowBtn"  @click="editProductMgr(row)" >{{ $t("productionResource.productMgr") }}</a>
+           <a class="rowBtn"  @click="editMaterialMgr(row)" >{{ $t("productionResource.materialMgr") }}</a>
+           <a class="rowBtn"  @click="advertisingMgr(row)" >{{ $t("productionResource.adMgr") }}</a>
+           <a class="rowBtn"  @click="editOrderMgr(row)" >{{ $t("productionResource.orderMgr") }}</a>
+          <!-- <i @click="editProductMgr(row)" class="table-operation" :title="$t('productionResource.productMgr')"
+             style="color: #2db7f5;"> {{ $t("productionResource.productMgr") }}</i>
+          <i @click="editMaterialMgr(row)" class="table-operation"
              :title="$t('productionResource.materialMgr')"
-             style="color: #2db7f5;"/>
-          <i @click="advertisingMgr(row)" class="el-icon-video-camera table-operation"
+             style="color: #2db7f5;">{{ $t("productionResource.materialMgr") }}</i>
+          <i @click="advertisingMgr(row)" class="table-operation"
              :title="$t('productionResource.adMgr')"
-             style="color: #2db7f5;"/>
+             style="color: #2db7f5;">{{ $t("productionResource.adMgr") }}</i>
           <i @click="advertisingMgr(row)" class="el-descriptions" :title="测试"></i>
-<!--          <i @click="opsMgr(row)" class="el-icon-video-camera table-operation"-->
-<!--             :title="$t('productionResource.opsMgr')"-->
-<!--             style="color: #2db7f5;"/>-->
-<!--          <i @click="servicemanMgr(row)" class="el-icon-video-camera table-operation"-->
-<!--             :title="$t('productionResource.servicemanMgr')"-->
-<!--             style="color: #2db7f5;"/>-->
+       style="color: #2db7f5;"/>-->
 
 
-          <i @click="editOrderMgr(row)" class="el-icon-shopping-cart-1 table-operation"
+          <!-- <i @click="editOrderMgr(row)" class="table-operation"
              :title="$t('productionResource.orderMgr')"
-             style="color: #2db7f5;"/>
+             style="color: #2db7f5;">{{ $t("productionResource.orderMgr") }}</i>  -->
         </template>
       </el-table-column>
     </el-table>
@@ -711,4 +708,14 @@ export default {
 .shuaxinBtn:hover {
   opacity: 0.7;
 }
+ 
+.rowBtn {
+  margin: 0 5px;
+  color: #1890ff;
+}
+
+.rowBtn:hover {
+  opacity: 0.7;
+}
+ 
 </style>