溧水app、机柜小程序修改

lss_vue/build/webpack.base.conf.js

@@ -13,11 +13,11 @@ module.exports = {
     //app: './src/main.js'
     app: ["babel-polyfill", "./src/main.js"]
   },
-  externals: {
-      'vue': 'Vue',
-      'vuex': 'Vuex',
-      'echarts': 'echarts'
-  },
+//   externals: {
+//       'vue': 'Vue',
+//       'vuex': 'Vuex',
+//       'echarts': 'echarts'
+//   },
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',

lss_vue/index.html

@@ -106,10 +106,10 @@
         <div id="app"></div>
 
         <!-- 引入Vue.js -->
-        <script src="https://cdn.staticfile.org/vue/2.4.3/vue.min.js"></script>
+        <!-- <script src="https://cdn.staticfile.org/vue/2.4.3/vue.min.js"></script> -->
         <!-- 引入vuex.js -->
-        <script src="https://cdn.staticfile.org/vuex/3.0.0/vuex.min.js"></script>
+        <!-- <script src="https://cdn.staticfile.org/vuex/3.0.0/vuex.min.js"></script> -->
         <!-- 引入echarts -->
-        <script src="https://cdn.staticfile.org/echarts/4.1.0/echarts.min.js"></script>
+        <!-- <script src="https://cdn.staticfile.org/echarts/4.1.0/echarts.min.js"></script> -->
     </body>
 </html>

lss_vue/src/main.js

@@ -1,4 +1,4 @@
-// import Vue from 'vue'
+import Vue from 'vue'
 import App from './App'
 
 import VueRouter from 'vue-router'
@@ -9,7 +9,7 @@ import Mint from 'mint-ui';
 import 'mint-ui/lib/style.css';
 
 import store from './vuex/store'
-// import Vuex from 'vuex'
+import Vuex from 'vuex'
 import routes from './routes'
 
 import http from './http'
@@ -18,7 +18,7 @@ Vue.prototype.http = http
 import port from './port'
 Vue.prototype.port = port
 
-// import echarts from 'echarts'
+import echarts from 'echarts'
 Vue.prototype.echarts = echarts
 
 import VueClipboard from 'vue-clipboard2'

lss_vue/src/views/assets/assets.vue

@@ -40,7 +40,7 @@
                     </div>
                     <div class="text item_name">{{item.name}}</div>
                     <div class="text item_int">{{item.modelNumber}}</div>
-                    <div class="text item_num">{{item.goodsNos.length}}{{item.unit}}</div>
+                    <div class="text item_num">{{item.goodsNosVO.length}}{{item.unit}}</div>
                 </li>
                 <div class="order" v-if="haveMore">
                     <span class="line"></span>
@@ -556,6 +556,9 @@
         height: 0.23rem;
         line-height: 0.23rem;
         margin: 0.02rem  0 0 0;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
 
     .body > ul li .item_int {

lss_vue_wx/build/webpack.base.conf.js

@@ -13,12 +13,12 @@ module.exports = {
     //app: './src/main.js'
     app: ["babel-polyfill", "./src/main.js"]
   },
-  externals: {
-    'vue': 'Vue',
-    'vuex': 'Vuex',
-    'echarts': 'echarts',
-    'element-ui': 'ELEMENT'
-  },
+//   externals: {
+//     'vue': 'Vue',
+//     'vuex': 'Vuex',
+//     'echarts': 'echarts',
+//     'element-ui': 'ELEMENT'
+//   },
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',

lss_vue_wx/config/index.js

@@ -15,7 +15,7 @@ module.exports = {
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
     assetsPublicPath: './',
-    productionSourceMap: true,
+    productionSourceMap: false,
     productionGzip: false,
     productionGzipExtensions: ['js', 'css'],
     bundleAnalyzerReport: process.env.npm_config_report

lss_vue_wx/index.html

@@ -130,12 +130,12 @@
         <div id="app"></div>
 
         <!-- 引入Vue.js -->
-        <script src="https://cdn.staticfile.org/vue/2.4.3/vue.min.js"></script>
+        <!-- <script src="https://cdn.staticfile.org/vue/2.4.3/vue.min.js"></script> -->
         <!-- 引入vuex.js -->
-        <script src="https://cdn.staticfile.org/vuex/3.0.0/vuex.min.js"></script>
+        <!-- <script src="https://cdn.staticfile.org/vuex/3.0.0/vuex.min.js"></script> -->
         <!-- 引入echarts -->
-        <script src="https://cdn.staticfile.org/echarts/4.1.0/echarts.min.js"></script>
+        <!-- <script src="https://cdn.staticfile.org/echarts/4.1.0/echarts.min.js"></script> -->
         <!-- 引入组件库 -->
-        <script src="https://cdn.staticfile.org/element-ui/2.4.3/index.js"></script>
+        <!-- <script src="https://cdn.staticfile.org/element-ui/2.4.3/index.js"></script> -->
     </body>
 </html>

lss_vue_wx/src/main.js

@@ -1,18 +1,18 @@
-// import Vue from 'vue'
+import Vue from 'vue'
 import App from './App'
 
 import VueRouter from 'vue-router'
 
 import './assets/js/rem.js'
 
-// import ElementUI from 'element-ui'
+import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 
 import Mint from 'mint-ui';
 import 'mint-ui/lib/style.css';
 
 import store from './vuex/store'
-// import Vuex from 'vuex'
+import Vuex from 'vuex'
 import routes from './routes'
 
 import http from './http'
@@ -21,7 +21,7 @@ Vue.prototype.http = http
 import port from './port'
 Vue.prototype.port = port
 
-// import echarts from 'echarts'
+import echarts from 'echarts'
 Vue.prototype.echarts = echarts
 
 import VueClipboard from 'vue-clipboard2'

lss_vue_wx/src/port.js

@@ -20,6 +20,7 @@ export default {
         add: '/goods/add',                                      // 添加资产
         update: '/goods/update',                                // 更新资产
         upload: '/goods/uploadFile',                            // 上传图片
+        listExcel: '/goods/listExcel',                           // Excel导出
 
         detailNo: '/goods/goodsNoDetail',                       // 资产编号详情
         addNo: '/goods/goodsNoAdd',                              // 资产编号添加

lss_vue_wx/src/views/assets/assets.vue

@@ -39,7 +39,7 @@
                     </div>
                     <div class="text item_name">{{item.name}}</div>
                     <div class="text item_int">{{item.modelNumber}}</div>
-                    <div class="text item_num">{{item.goodsNos.length}}{{item.unit}}</div>
+                    <div class="text item_num">{{item.goodsNosVO.length}}{{item.unit}}</div>
                 </li>
                 <li v-if="tagId == -2" v-for="item in list" class="one_frame" v-on:click="jumpToFrame(item.id)">
                     <div class="frame_title">
@@ -52,13 +52,13 @@
                     <div class="frame_number">{{item.modelNumber}}</div>
                     <div class="frame_label">
                         <span><span>机架ID：</span>{{item.rackId}}</span>
-                        <span><span>温度：</span>{{item.temp}}</span>
-                        <span><span>湿度：</span>{{item.hum}}</span>
+                        <span><span>温度：</span>{{item.temp==null?'':item.temp+'℃'}}</span>
+                        <span><span>湿度：</span>{{item.hum==null?'':item.hum+'RH'}}</span>
                     </div>
                     <div class="frame_detail"> 查看详情 > </div>
                 </li>
                 <li v-if="tagId == -3" v-for="item in list" class="one_device">
-                    <mt-cell-swipe :id="'dev' + item.id" v-if="item.goodsNos[0].goodsId == null" title="" 
+                    <mt-cell-swipe :id="'dev' + item.id" v-if="item.goodsNosVO[0].isRack == 0" title="" 
                         :right="[{ content: '上架', style: { background: '#2680EB', color: '#fff' }, handler: () => chooseDevice(item.id) }]">
                         <div style="width: 100%;">
                             <div class="new_title">
@@ -359,7 +359,7 @@
                     if (action == 'confirm') {     //确认的回调
                         this.http.post(this.port.assets.upMold, {
                             'id': id,
-                            'goodsId': goodsId
+                            'frameId': goodsId
                         } , 
                         res => {
                             if (res.code == "ok") {
@@ -766,6 +766,9 @@
         height: 0.23rem;
         line-height: 0.23rem;
         margin: 0.02rem  0 0 0;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
 
     .body > ul li .item_int {

lss_vue_wx/src/views/assets/assetsDetailFrame.vue

@@ -17,8 +17,8 @@
                 <div class="frame_number">{{detail.modelNumber}}</div>
                 <div class="frame_label">
                     <span><span>机架ID：</span>{{detail.rack.rackIp}}</span>
-                    <span><span>温度：</span>{{detail.rack.temp}}</span>
-                    <span><span>湿度：</span>{{detail.rack.hum}}</span>
+                    <span><span>温度：</span>{{detail.rack.temp==null?'':detail.rack.temp+'℃'}}</span>
+                    <span><span>湿度：</span>{{detail.rack.hum==null?'':detail.rack.hum+'RH'}}</span>
                 </div>
             </div>
             <div class="detailBox">