Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

components/page/inputTime.vue

@@ -22,7 +22,7 @@
     <div class="fg1">
       <InputNumber v-model="second" :formatter="value => `${value}`" :min="0" :max="60" />
     </div>
-    <span>秒</span>
+    <span>秒钟</span>
   </div>
 </template>
 <script>

pages/technology/details/detail.vue

@@ -5,7 +5,8 @@
       <Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
       <Filed :span="12" :name="l('equipType')">{{entity.equipType}}</Filed>
       <Filed :span="12" :name="l('resourceType')">
-        <state code="Process.routing_detail.resource_type" :value="entity.resourceType" type="text"></state>
+        <!-- <state code="Process.routing_detail.resource_type" :value="entity.resourceType" type="text"></state> -->
+        {{entity.resourceCode}}
       </Filed>
       <Filed :span="12" :name="l('isImportant')">
         <state code="Process.state" :value="entity.isImportant" type="text"></state>