Merge remote-tracking branch 'origin/master' into master

imcs-tenant-admin/src/views/zuihou/internetCenter/productResourceDetail/Index.vue

@@ -3,7 +3,7 @@
   	<!-- 模型信息 -->
   	<el-row class="filter-container infosBg">
     	<el-col>
-    		<h1>{{queryObj.name}}<el-tag type="danger" class="tagsCls">离线</el-tag></h1>
+    		<h1>{{queryObj.name}}<el-tag type="success" class="tagsCls">在线</el-tag></h1>
     		<span>模型名称：{{queryObj.name}}</span>
     		<span style="margin-left: 20px;">模型编号：{{queryObj.code}}</span>
     	</el-col>

imcs-tenant-admin/src/views/zuihou/internetCenter/productResourceDetail/components/baseInfo/index.vue

@@ -27,9 +27,11 @@
 			<tr>
 				<td class="tdTitle">当前状态：</td>
 				<td>
+				    <!--
 					<el-tag :type="baseObj.inlineStatus=='1' ? '' : 'danger'">
 			          	{{ baseObj.inlineStatus=='1' ? '在线' : '离线' }}
-			        </el-tag>
+			        </el-tag> -->
+					<el-tag>在线</el-tag>
 				</td>
 				<td class="tdTitle">生产资源秘钥：</td><td>678708-034</td>
 				<td class="tdTitle">最后上线时间：</td><td>2020/08/06 14:21:23.627</td>

imcs-tenant-admin/src/views/zuihou/internetCenter/productionResourcesMgr/Index.vue

@@ -90,19 +90,19 @@
 		    	<el-row :gutter="20" class="tongjiRow">
 		    		<el-col :span="4" class="tongjiBg">
 		    			<p>全部</p>
-		    			<p>23</p>
+		    			<p>28</p>
 		    		</el-col>
 		    		<el-col :span="4" class="tongjiBg">
 		    			<p><span class="statusSpan zaixianStatus"></span>在线</p>
-		    			<p>2</p>
+		    			<p>21</p>
 		    		</el-col>
 		    		<el-col :span="4" class="tongjiBg">
 		    			<p><span class="statusSpan lixianStatus"></span>离线</p>
-		    			<p>13</p>
+		    			<p>5</p>
 		    		</el-col>
 		    		<el-col :span="4" class="tongjiBg">
 		    			<p><span class="statusSpan weijihuoStatus"></span>未激活</p>
-		    			<p>8</p>
+		    			<p>2</p>
 		    		</el-col>
 		    		<el-col :span="8" class="tongjiBg">
 		    			<p style="text-align: left;"><a class="shuaxinBtn" href="javascript:;" @click="fetch">刷新</a></p>
@@ -153,6 +153,16 @@
 		      <el-table-column prop="lineDesc" label="所属产线" :show-overflow-tooltip="true" align="center" width="100px"></el-table-column>
 		      <el-table-column prop="type.data" label="类型" align="center" width="120px"></el-table-column>
 		      <el-table-column prop="moduleDesc" label="模型名称" :show-overflow-tooltip="true" align="center" width="100px"></el-table-column>
+			  
+			  <el-table-column prop="capitalNo" label="资产编号" align="center" width="120px"></el-table-column>
+			  <el-table-column prop="capitalName" label="资产名称" align="center" width="120px"></el-table-column>
+			  <el-table-column prop="capitalType" label="资产类别" align="center" width="120px"></el-table-column>
+			  <el-table-column prop="modeSpecification" label="型号规格" align="center" width="120px"></el-table-column>
+			  <el-table-column prop="capitalPrice" label="资产原值" align="center" width="120px"></el-table-column>
+			  <el-table-column prop="productionDate" label="出厂日期" align="center" width="120px"></el-table-column>
+			  <el-table-column prop="productionNo" label="出厂编号" align="center" width="120px"></el-table-column>
+			  <el-table-column prop="manufacturer" label="制造厂家" align="center" width="120px"></el-table-column>
+			  
 		      <el-table-column prop="status" label="启用状态" align="center" width="90px">
 		        <template slot-scope="{ row }">
 		          <el-tag :type="row.status=='1' ? '' : 'danger'">
@@ -570,7 +580,7 @@ export default {
       // 查询参数
       console.log("查询参数: ", this.queryParams)
       productionResourcesMgrApi.page(this.queryParams).then(response => {
-        const res = response.data
+        const res = response.data		
         if (res.isSuccess) {
         	// 赋值
           this.tableData = res.data

imcs-tenant-admin/src/views/zuihou/internetCenter/productionResourcesMgr/components/Edit.vue

@@ -41,6 +41,39 @@
       <el-form-item label="IP：" prop="ip">
       	<el-input v-model="tenant.ip" style="width: 93%;"/>
       </el-form-item>
+	  
+	  <el-form-item label="资产编号：" prop="capitalNo">
+      	<el-input v-model="tenant.capitalNo" style="width: 93%;"/>
+      </el-form-item>
+	  <el-form-item label="资产名称：" prop="capitalName">
+      	<el-input v-model="tenant.capitalName" style="width: 93%;"/>
+      </el-form-item>
+	   <el-form-item label="资产类别：" prop="capitalType">
+      	<el-input v-model="tenant.capitalType" style="width: 93%;"/>
+      </el-form-item>
+	  <el-form-item label="型号规格：" prop="modeSpecification">
+      	<el-input v-model="tenant.modeSpecification" style="width: 93%;"/>
+      </el-form-item>
+	  <el-form-item label="资产原值：" prop="capitalPrice">
+      	<el-input v-model="tenant.capitalPrice" style="width: 93%;"/>
+      </el-form-item>
+	  <el-form-item label="出厂日期：" prop="productionDate">
+	    <el-date-picker
+			      v-model="tenant.productionDate"
+			      type="date"
+			      value-format="yyyy-MM-dd"
+			      :placeholder='$t("common.pleaseSelect")'
+			      style="width: 93%;"
+			    >
+		</el-date-picker>
+      </el-form-item>
+	  <el-form-item label="出厂编号：" prop="productionNo">
+      	<el-input v-model="tenant.productionNo" style="width: 93%;"/>
+      </el-form-item>
+	  <el-form-item label="制造厂家：" prop="manufacturer">
+      	<el-input v-model="tenant.manufacturer" style="width: 93%;"/>
+      </el-form-item>
+	  
       <el-form-item label="端口号：" prop="port">
       	<el-input v-model="tenant.port" style="width: 93%;"/>
       </el-form-item>
@@ -216,6 +249,14 @@ export default {
         port: '',
         status: '1',
         remark: '',
+		capitalNo: '',
+		capitalName: '',
+		capitalType: '',
+		modeSpecification: '',
+		capitalPrice: '',
+		productionDate: '',
+		productionNo: '',
+		manufacturer: '',
         category: {
           key: ""
         },