溧水app、小程序代码————数据展示

lss_vue/config/index.js

@@ -1,5 +1,13 @@
 var path = require('path')
-
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 module.exports = {
   build: {
     env: require('./prod.env'),
@@ -20,7 +28,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
         '/api': {    
-            target: 'http://192.168.101.166:8091',  // 接口域名 开发
+            target: 'http://'+ ip +':8091',  // 接口域名 开发
             secure: true,  // 如果是https接口，需要配置这个参数
             changeOrigin: true,  //是否跨域
             pathRewrite: { // 如果接口本身没有api的路径，那么这里将发送到后端的请求重写为没有api的路径
@@ -28,7 +36,7 @@ module.exports = {
             }
         },
         '/ips': {    
-            target: 'http://192.168.101.166:8080',  // 接口域名 开发
+            target: 'http://'+ ip +':8095',  // 接口域名 开发
             secure: true,  // 如果是https接口，需要配置这个参数
             changeOrigin: true,  //是否跨域
             pathRewrite: { // 如果接口本身没有api的路径，那么这里将发送到后端的请求重写为没有api的路径

lss_vue/src/http.js

@@ -12,7 +12,7 @@ function handleResults (response) {
 }
 
 function handleUrl (url) {
-    if(url.indexOf('.do') > -1) {
+    if(url.indexOf('tdatasizeinfowarehouseunits') > -1) {
         url = LINK_URL + url;
     } else {
         url = BASE_URL + url;

lss_vue/src/port.js

@@ -60,5 +60,10 @@ export default {
         insList: '/institution/list',                           // 管理制度列表
         insDetail: '/institution/detail',                       // 管理制度详情
     },
-
+    showData: {
+        centralRepository: '/tdatasizeinfowarehouseunits/centralRepository',        // 中心库数据模块数据
+        dataExchange: '/tdatasizeinfowarehouseunits/dataExchange',                  // 数据交换模块数据
+        fiveMainStorehouses: '/tdatasizeinfowarehouseunits/fiveMainStorehouses',    // 五大库模块数据
+        cloudPlatform: '/tdatasizeinfowarehouseunits/cloudPlatform',                // 云平台模块数据
+    },
 }

lss_vue/src/views/Login.vue

@@ -2,7 +2,7 @@
     <div class="login_par">
         <div class="login_head">
             <div class="login_logo">
-                <img src="../assets/image/login_logo.png" style="width:80px;height:80px;"/>
+                <img src="../assets/image/login_logo_white.png" style="width:80px;height:80px;"/>
             </div>
             <mt-navbar v-model="selected">
                 <mt-tab-item id="login"><div class="login_tab">登录</div></mt-tab-item>
@@ -116,6 +116,7 @@
                                 for(var i in res.data.functions) {
                                     str += res.data.functions[i].code + ",";
                                 }
+                                this.$store.dispatch('getRole',res.data);
                                 sessionStorage.setItem('power',str)
                                 sessionStorage.setItem('assetsTab',-1)
                                 this.$router.push({ path: '/assets' });
@@ -136,6 +137,7 @@
                     }
                 }
             },
+
             getCode() {
                 if(this.ruleForm.regPhone == "") {
                     this.$toast({
@@ -163,6 +165,7 @@
                     },1000)
                 }
             },
+
             handleRegistered() {
                 if(this.ruleForm.regName == "") {
                     this.$toast({
@@ -246,7 +249,7 @@
                         });
                     })
                 }
-            }
+            },
         },
     }
 </script>
@@ -267,6 +270,7 @@
 
     .login_head , .mint-navbar {
         background: #2680EB;
+        // background: rgba(38,128,235,0.8);
     }
 
     .login_tab {
@@ -357,4 +361,8 @@
     .login_par .mint-button--primary {
         background-color: #2680EB!important;
     }
+
+    .login_par .mint-navbar .mint-tab-item.is-selected {
+        color: rgba(38,128,235,0.8);
+    }
 </style>

lss_vue/src/views/assets/assets.vue

@@ -73,11 +73,14 @@
             // 资产列表
             getList() {
                 this.$indicator.open();
-                this.http.post(this.port.assets.list, {
+                var from = {
                     'keyName': this.keyWord,
-                    'tagId': this.tagId==-1?"":this.tagId,
                     'pageNum': 1
-                } , 
+                }
+                if(this.tagId != -1) {
+                    from.tagId = this.tagId
+                }
+                this.http.post(this.port.assets.list, from, 
                 res => {
                     this.$indicator.close();
                     if (res.code == "ok") {

lss_vue/src/views/assets/assetsDetail.vue

@@ -7,7 +7,7 @@
             <mt-button slot="right" v-if="power.indexOf('assets_operation')>-1" v-on:click.native="jumpTo(3)">操作记录</mt-button>
         </mt-header>
         <div class="detail_body">
-            <div class="detailBox userInfo" v-on:click="power.indexOf('update_assets') > -1 ?jumpTo(0):''">
+            <div class="detailBox userInfo" v-on:click="showBase()">
                 <div class="left">
                     <img v-if="detail.pic != null" :src="detail.pic">
                     <img v-else src="../../assets/image/noPic.png">
@@ -56,7 +56,6 @@
 
                         <mt-cell-swipe v-if="power.indexOf('handle_assets') > -1 && power.indexOf('update_assets') == -1" :right="[
                             { content: '处置', style: { background: 'rgba(38,162,255,0.9)', color: '#fff' }, handler: () => handle(item.id) },
-                            
                             ]" :class="item.username==null?'noName':''">
                             <div class="one_assDel_head">
                                 <span class="canJump"><span style="color:#DC143C;font-weight:600">{{item.isMaintain == 1?"[待维护] ":""}}</span>{{item.modelNo}}</span>
@@ -101,6 +100,45 @@
                 </div>
             </div>
         </div>
+
+        <mt-popup v-model="popupVisible" position="right" class="allocation">
+            <mt-header class="detail_head" fixed title="资产基本信息">
+                <router-link to="" slot="left">
+                    <mt-button icon="back" v-on:click="closeBase()"></mt-button>
+                </router-link>
+            </mt-header>
+            <div class="detail_body">
+                <div class="detailBox userInfo" v-on:click="power.indexOf('update_assets') > -1 ?jumpTo(0):''">
+                    <div class="left">
+                        <img v-if="detail.pic != null" :src="detail.pic">
+                        <img v-else src="../../assets/image/noPic.png">
+                    </div>
+                    <div class="right">
+                        <div>
+                            <span class="nameEdit">{{detail.name}}</span>
+                            <span v-if="power.indexOf('update_assets')>-1" class="arrowEdit"><img src="../../assets/image/edit.png"></span>
+                        </div>
+                        <div class="department">
+                            {{detail.modelNumber}}
+                        </div>
+                        <div>
+                            <span class="num">{{detail.goodsNosVO!=null?detail.goodsNosVO.length:0}}{{detail.unit}}</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="detailBox">
+                    <mt-cell title="所属分类" :value="detail.tagName"></mt-cell>
+                    <mt-cell title="数量" :value="detail.goodsNosVO!=null?detail.goodsNosVO.length:0"></mt-cell>
+                    <mt-cell title="单位" :value="detail.unit"></mt-cell>
+                    <mt-cell title="地址" :value="detail.address"></mt-cell>
+                </div>
+                <div class="detailBox">
+                    <mt-cell title="生产厂家" :value="detail.factory"></mt-cell>
+                    <mt-cell title="服务期限" :value="detail.serviceLife"></mt-cell>
+                    <mt-cell title="下次维护时间" :value="detail.nextIndate"></mt-cell>
+                </div>
+            </div>
+        </mt-popup>
     </div>
 </template>
 
@@ -118,6 +156,8 @@
                 scrList: [],
                 unuList: [],
                 state: -1,
+
+                popupVisible: false,
 			}
 		},
 		methods: {
@@ -312,7 +352,17 @@
 
             handle(id) {
                 this.$router.push("/assetsHandle/" + id );
-            }
+            },
+
+            // 展示基础资料
+            showBase() {
+                this.popupVisible = true;
+            },
+
+            closeBase() {
+                this.popupVisible = false;
+            },
+        
         },
         created() {
             this.getDetail();
@@ -373,6 +423,15 @@
         overflow: hidden;
         white-space: nowrap;
     }
+
+    span.nameEdit {
+        font-size: 0.16rem;
+        font-weight: 600;
+        margin: 0 0.15rem 0 0;
+        width: 80%;
+        overflow: hidden;
+        white-space: nowrap;
+    }
     
     span.num {
         font-size: 0.14rem;
@@ -398,6 +457,15 @@
         -o-transform: rotate(-90deg); /* Opera */
     }
 
+    span.arrowEdit {
+        float: right;
+    }
+
+    span.arrowEdit img {
+        width: 0.15rem;
+        margin-right: 0.05rem;
+    }
+
     .assDel {
         padding: 0.12rem 0.1rem;
     }
@@ -456,16 +524,11 @@
         text-overflow: ellipsis;
     }
 
-    .one_assDel_head > span:nth-child(1).canJump {
-        /* color: #26a2ff; */
-    }
-
     .one_assDel_head > span:nth-child(2){
         float: right;
     }
 
     .one_assDel_body span {
-        /* display:inline-block; */
         color: #aaa;
         vertical-align: middle;
     }
@@ -476,6 +539,18 @@
         height: 0.25rem;
         vertical-align: middle;
     }
+
+    /* 资产基础数据样式 */
+    .allocation {
+        width: 100%;
+        height: 100%;
+    }
+
+    .address_first .current{
+        background:#eee;
+        color: #6f83ff;
+        border-left: 2px solid #6f83ff;
+    }
 </style>
 <style>
     .detail_head .mint-header-title {

lss_vue/src/views/assets/assetsEdit.vue

@@ -28,7 +28,7 @@
             </div>
             <div class="detailBox">
                 <mt-field label="生产厂家" placeholder="请输入生产厂家" v-model="assetsForm.factory"></mt-field>
-                <mt-field label="服务期限" placeholder="请输入服务期限" v-model="assetsForm.serviceLife"></mt-field>
+                <mt-field label="服务期限" placeholder="请输入服务期限" type="number" v-model="assetsForm.serviceLife"></mt-field>
                 <mt-field label="下次维护日期" placeholder="请选择下次维护日期" type="date" v-model="assetsForm.nextIndate"></mt-field>
             </div>
             <div class="detailBox">

lss_vue/src/views/assets/assetsHandle.vue

@@ -110,11 +110,17 @@
 
             chooseType() {
                 var _this = this;
-                var dataShippingSpace = [
-                    {name: "未用"},
-                    {name: "在用"},
-                    {name: "报废"},
-                ];
+                var dataShippingSpace = [];
+                if(this.detail.state == 0) {
+                    dataShippingSpace = [
+                        {name: "在用"},
+                        {name: "报废"},
+                    ];
+                } else if(this.detail.state == 1) {
+                    dataShippingSpace = [
+                        {name: "未用"},
+                    ];
+                }
                 var pickerDiv = document.getElementById("state");
                 var vCardType = this.detail.state;
                 var pickerView = new PickerView({

lss_vue/src/views/assets/assetsRegister.vue

@@ -28,7 +28,7 @@
             </div>
             <div class="detailBox">
                 <mt-field label="生产厂家" placeholder="请输入生产厂家" v-model="assetsForm.factory"></mt-field>
-                <mt-field label="服务期限" placeholder="请输入服务期限" v-model="assetsForm.serviceLife"></mt-field>
+                <mt-field label="服务期限" placeholder="请输入服务期限" type="number" v-model="assetsForm.serviceLife"></mt-field>
                 <mt-field label="下次维护日期" placeholder="请选择下次维护日期" type="date" v-model="assetsForm.nextIndate"></mt-field>
             </div>
             <div class="detailBox">

lss_vue/src/views/my/myGrade.vue

@@ -144,7 +144,7 @@
                     this.$indicator.close();
                     if (res.code == "ok") {
                         this.detail = res.data;
-                        if(res.data.scoreId == null) {
+                        if(res.data.scoreId == null && this.date[0].name == this.chooseTime) {
                             var from = {
                                 "uid": this.id,
                                 "scoringYearMonth": this.chooseTime,
@@ -213,14 +213,25 @@
             },
 
             toNext() {
+                if(this.detail.scoreId == null){
+                    this.$toast({
+                        message: "当月未找到TA的建议",
+                        duration: 2000
+                    });
+                    return false;
+                }
                 $(".one_suggest_reply .showMoreBtn .btn_list").addClass("hide").slideUp();
                 this.popupVisible = true;
+                this.ideaList = [];
                 this.$indicator.open();
-                this.http.post(this.port.my.ideaScore, {
+                var form = {
                     'uid': this.id,
                     'time': this.chooseTime,
-                    'scoreId': this.detail.scoreId
-                } , 
+                }
+                if(this.date[0].name == this.chooseTime && this.detail.scoreId != null) {
+                    form.scoreId = this.detail.scoreId
+                }
+                this.http.post(this.port.my.ideaScore, form , 
                 res => {
                     this.$indicator.close();
                     if (res.code == "ok") {
@@ -241,37 +252,6 @@
             },
 
             toPrev() {
-                // var from = {};
-                // if(this.detail.scoreId != null) {
-                //     from = {
-                //         "scoreId": this.detail.scoreId,
-                //         "total": parseInt(this.personalScore) + (this.detail.ideaScoreSum == null?0:parseFloat(this.detail.ideaScoreSum)),
-                //     }
-                // } else {
-                //     from = {
-                //         "uid": this.id,
-                //         "total": parseInt(this.personalScore) + (this.detail.ideaScoreSum == null?0:parseFloat(this.detail.ideaScoreSum)),
-                //     }
-                // }
-                // this.http.post(this.port.my.addOrUpdate, from , 
-                // res => {
-                //     if (res.code == "ok") {
-                //         this.popupVisible = false;
-                //         this.getDetail();
-                //     } else {
-                //         this.$toast({
-                //             message: res.msg,
-                //             duration: 2000
-                //         });
-                //     }
-                // }, error => {
-                //     this.popupVisible = false;
-                //     this.$toast({
-                //         message: error,
-                //         duration: 2000
-                //     });
-                // })
-
                 this.popupVisible = false;
                 this.getDetail();
             },
@@ -417,7 +397,7 @@
                         return false;
                     } else {
                         var from = {};
-                        if(this.ideaComment != null) {
+                        if(this.ideaList[this.chooseSugNum].ideaComment != null) {
                             from = {
                                 "ideaId": this.ideaList[this.chooseSugNum].id,
                                 "score": this.sugScore,
@@ -476,7 +456,7 @@
 
             openSugPop(i) {
                 this.sugScore = this.ideaList[i].score == null? 0 : this.ideaList[i].score;
-                this.sugContent = this.ideaComment == null? '' : this.ideaComment.content;
+                this.sugContent = this.ideaList[i].ideaComment == null? '' : this.ideaList[i].ideaComment.content;
                 this.sugScorePop = true;
                 this.chooseSugNum = i;
             },

lss_vue/src/vuex/store.js

@@ -6,24 +6,49 @@ import * as getters from './getters'
 Vue.use(Vuex)
 
 // 应用初始状态
-const state = {
-    count: 10
-}
+// const state = {
+//     count: 10
+// }
 
-// 定义所需的 mutations
-const mutations = {
-    INCREMENT(state) {
-        state.count++
+// // 定义所需的 mutations
+// const mutations = {
+//     INCREMENT(state) {
+//         state.count++
+//     },
+//     DECREMENT(state) {
+//         state.count--
+//     },
+//     getRole(res) {
+//         console.log(res)
+//     }
+// }
+
+// // 创建 store 实例
+// export default new Vuex.Store({
+//     actions,
+//     getters,
+//     state,
+//     mutations
+// })
+
+const store = new Vuex.Store({
+    state: {
+        user: ''
+    },
+    getters: {
+        getName(state) {
+            return 'hello ' + state.name;
+        }
     },
-    DECREMENT(state) {
-        state.count--
+    mutations: {
+        mutationSetName(state, name) {
+            state.name = name;
+        }
+    },
+    actions: {
+        getRole(context, res) {
+            console.log(res)
+        }
     }
-}
-
-// 创建 store 实例
-export default new Vuex.Store({
-    actions,
-    getters,
-    state,
-    mutations
-})
+});
+export default store;

lss_vue_wx/config/index.js

@@ -1,5 +1,13 @@
 var path = require('path')
-
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 module.exports = {
   build: {
     env: require('./prod.env'),
@@ -20,7 +28,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
         '/api': {    
-            target: 'http://192.168.101.166:8091',  // 接口域名 开发
+            target: 'http://'+ ip +':8091',  // 接口域名 开发
             secure: true,  // 如果是https接口，需要配置这个参数
             changeOrigin: true,  //是否跨域
             pathRewrite: { // 如果接口本身没有api的路径，那么这里将发送到后端的请求重写为没有api的路径
@@ -28,7 +36,7 @@ module.exports = {
             }
         },
         '/ips': {    
-            target: 'http://192.168.101.166:8080',  // 接口域名 开发
+            target: 'http://'+ ip +':8095',  // 接口域名 开发
             secure: true,  // 如果是https接口，需要配置这个参数
             changeOrigin: true,  //是否跨域
             pathRewrite: { // 如果接口本身没有api的路径，那么这里将发送到后端的请求重写为没有api的路径

lss_vue_wx/index.html

@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-        <title>溧水</title>
+        <title>机柜</title>
         <link rel="shortcut icon" type="image/x-icon" href="./cloud.ico" /> 
         <style>
             .toolbar {

lss_vue_wx/src/http.js

@@ -12,7 +12,7 @@ function handleResults (response) {
 }
 
 function handleUrl (url) {
-    if(url.indexOf('.do') > -1) {
+    if(url.indexOf('tdatasizeinfowarehouseunits') > -1) {
         url = LINK_URL + url;
     } else {
         url = BASE_URL + url;

lss_vue_wx/src/views/assets/assets.vue

@@ -58,12 +58,12 @@
                     <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.goodsId == null" title="" 
+                    <mt-cell-swipe :id="'dev' + item.id" v-if="item.goodsNos[0].goodsId == null" title="" 
                         :right="[{ content: '上架', style: { background: '#2680EB', color: '#fff' }, handler: () => chooseDevice(item.id) }]">
                         <div style="width: 100%;">
                             <div class="new_title">
-                                <span>{{item.deviceName}}</span>
-                                <span>{{item.modelNo}}</span>
+                                <span>{{item.name}}</span>
+                                <span>{{item.modelNumber}}</span>
                                 <span>{{item.currentState==0?'禁止':'运行'}}</span>
                             </div>
                             <div class="new_label">
@@ -78,8 +78,8 @@
                         :right="[{ content: '下架', style: { background: 'red', color: '#fff' }, handler: () => handle(item.id) }]">
                         <div style="width: 100%;">
                             <div class="new_title">
-                                <span>{{item.deviceName}}</span>
-                                <span>{{item.modelNo}}</span>
+                                <span>{{item.name}}</span>
+                                <span>{{item.modelNumber}}</span>
                                 <span>{{item.currentState==0?'禁止':'运行'}}</span>
                             </div>
                             <div class="new_label">
@@ -123,6 +123,7 @@
 		methods: {
             // 资产列表
             getList() {
+                this.list = [];
                 this.$indicator.open();
                 var tagId = this.tagId==-1?"":this.tagId;
                 if(tagId == -2) {

lss_vue_wx/src/views/assets/assetsDetail.vue

@@ -7,7 +7,7 @@
             <mt-button slot="right" v-if="power.indexOf('assets_operation')>-1" v-on:click.native="jumpTo(3)">操作记录</mt-button>
         </mt-header>
         <div class="detail_body">
-            <div class="detailBox userInfo" v-on:click="power.indexOf('update_assets') > -1 ?jumpTo(0):''">
+            <div class="detailBox userInfo" v-on:click="showBase()">
                 <div class="left">
                     <img v-if="detail.pic != null" :src="detail.pic">
                     <img v-else src="../../assets/image/noPic.png">
@@ -56,7 +56,6 @@
 
                         <mt-cell-swipe v-if="power.indexOf('handle_assets') > -1 && power.indexOf('update_assets') == -1" :right="[
                             { content: '处置', style: { background: 'rgba(38,162,255,0.9)', color: '#fff' }, handler: () => handle(item.id) },
-                            
                             ]" :class="item.username==null?'noName':''">
                             <div class="one_assDel_head">
                                 <span class="canJump"><span style="color:#DC143C;font-weight:600">{{item.isMaintain == 1?"[待维护] ":""}}</span>{{item.modelNo}}</span>
@@ -101,6 +100,46 @@
                 </div>
             </div>
         </div>
+
+        
+        <mt-popup v-model="popupVisible" position="right" class="allocation">
+            <mt-header class="detail_head" fixed title="资产基本信息">
+                <router-link to="" slot="left">
+                    <mt-button icon="back" v-on:click="closeBase()"></mt-button>
+                </router-link>
+            </mt-header>
+            <div class="detail_body">
+                <div class="detailBox userInfo" v-on:click="power.indexOf('update_assets') > -1 ?jumpTo(0):''">
+                    <div class="left">
+                        <img v-if="detail.pic != null" :src="detail.pic">
+                        <img v-else src="../../assets/image/noPic.png">
+                    </div>
+                    <div class="right">
+                        <div>
+                            <span class="nameEdit">{{detail.name}}</span>
+                            <span v-if="power.indexOf('update_assets')>-1" class="arrowEdit"><img src="../../assets/image/edit.png"></span>
+                        </div>
+                        <div class="department">
+                            {{detail.modelNumber}}
+                        </div>
+                        <div>
+                            <span class="num">{{detail.goodsNosVO!=null?detail.goodsNosVO.length:0}}{{detail.unit}}</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="detailBox">
+                    <mt-cell title="所属分类" :value="detail.tagName"></mt-cell>
+                    <mt-cell title="数量" :value="detail.goodsNosVO!=null?detail.goodsNosVO.length:0"></mt-cell>
+                    <mt-cell title="单位" :value="detail.unit"></mt-cell>
+                    <mt-cell title="地址" :value="detail.address"></mt-cell>
+                </div>
+                <div class="detailBox">
+                    <mt-cell title="生产厂家" :value="detail.factory"></mt-cell>
+                    <mt-cell title="服务期限" :value="detail.serviceLife"></mt-cell>
+                    <mt-cell title="下次维护时间" :value="detail.nextIndate"></mt-cell>
+                </div>
+            </div>
+        </mt-popup>
     </div>
 </template>
 
@@ -118,6 +157,8 @@
                 scrList: [],
                 unuList: [],
                 state: -1,
+                
+                popupVisible: false,
 			}
 		},
 		methods: {
@@ -312,7 +353,16 @@
 
             handle(id) {
                 this.$router.push("/assetsHandle/" + id );
-            }
+            },
+
+            // 展示基础资料
+            showBase() {
+                this.popupVisible = true;
+            },
+
+            closeBase() {
+                this.popupVisible = false;
+            },
         },
         created() {
             this.getDetail();
@@ -374,6 +424,15 @@
         white-space: nowrap;
     }
     
+    span.nameEdit {
+        font-size: 0.16rem;
+        font-weight: 600;
+        margin: 0 0.15rem 0 0;
+        width: 80%;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+    
     span.num {
         font-size: 0.14rem;
         color: #26a2ff;
@@ -398,6 +457,15 @@
         -o-transform: rotate(-90deg); /* Opera */
     }
 
+    span.arrowEdit {
+        float: right;
+    }
+
+    span.arrowEdit img {
+        width: 0.15rem;
+        margin-right: 0.05rem;
+    }
+
     .assDel {
         padding: 0.12rem 0.1rem;
     }
@@ -470,6 +538,18 @@
         height: 0.25rem;
         vertical-align: middle;
     }
+
+    /* 资产基础数据样式 */
+    .allocation {
+        width: 100%;
+        height: 100%;
+    }
+
+    .address_first .current{
+        background:#eee;
+        color: #6f83ff;
+        border-left: 2px solid #6f83ff;
+    }
 </style>
 <style>
     .detail_head .mint-header-title {

lss_vue_wx/src/views/assets/assetsDetailFrame.vue

@@ -8,17 +8,17 @@
         <div class="detail_body">
             <div class="detailBox userInfo">
                 <div class="frame_title">
-                    <span>{{detail.name}}</span>
+                    <span>{{detail.rack.name}}</span>
                     <span>
-                        <mt-button v-if="detail.doorStatus==0" size="small" type="primary" v-on:click.native.stop="openDoor(1)">开门</mt-button>
+                        <mt-button v-if="detail.rack.doorStatus==0" size="small" type="primary" v-on:click.native.stop="openDoor(1)">开门</mt-button>
                         <span v-else style="color:red">已开门</span>
                     </span>
                 </div>
                 <div class="frame_number">{{detail.modelNumber}}</div>
                 <div class="frame_label">
-                    <span><span>机架ID：</span>{{detail.rackIp}}</span>
-                    <span><span>温度：</span>{{detail.temp}}</span>
-                    <span><span>湿度：</span>{{detail.hum}}</span>
+                    <span><span>机架ID：</span>{{detail.rack.rackIp}}</span>
+                    <span><span>温度：</span>{{detail.rack.temp}}</span>
+                    <span><span>湿度：</span>{{detail.rack.hum}}</span>
                 </div>
             </div>
             <div class="detailBox">
@@ -27,20 +27,23 @@
                     <!-- <img v-if="power.indexOf('update_assets')>-1" v-on:click="addNo()" src="../../assets/image/add.png"> -->
                 </div>
                 <div class="assDel_List">
-                    <div class="one_assDel isFrame" v-for="item in delList">
+                    <div v-if="delList.length == 0" style="padding: 0.3rem;text-align:center;color:#ccc;">
+                        暂无机柜设备
+                    </div>
+                    <div v-else class="one_assDel isFrame" v-for="item in delList">
                         <mt-cell-swipe title="" :right="[
                             { content: '下架', style: { background: 'red', color: '#fff' }, handler: () => handle(item.id) },
                         ]">
                             <div>
                                 <div class="new_title">
-                                    <span>{{item.deviceName}}</span>
-                                    <span>{{item.modelNo}}</span>
+                                    <span>{{item.name}}</span>
+                                    <span>{{item.modelNumber}}</span>
                                     <span>{{item.currentState==0?'禁止':'运行'}}</span>
                                 </div>
                                 <div class="new_label">
-                                    <span><span>标签ID：</span>{{item.labelId}}</span>
-                                    <span><span>模块ID：</span>{{item.modelId}}</span>
-                                    <span><span>U位号：</span>{{item.ubitNum}}</span>
+                                    <span><span>标签ID：</span>{{item.goodsNosVO[0].labelId}}</span>
+                                    <span><span>模块ID：</span>{{item.goodsNosVO[0].modelId}}</span>
+                                    <span><span>U位号：</span>{{item.goodsNosVO[0].ubitNum}}</span>
                                 </div>
                             </div>
                         </mt-cell-swipe>
@@ -72,7 +75,7 @@
                     this.$indicator.close();
                     if (res.code == "ok") {
                         this.detail = res.data;
-                        this.delList = res.data.goodsNosVO;
+                        this.delList = res.data.equipments==null?[]:res.data.equipments;
                     } else {
                         this.$toast({
                             message: res.msg,

lss_vue_wx/src/views/assets/assetsEdit.vue

@@ -28,7 +28,7 @@
             </div>
             <div class="detailBox">
                 <mt-field label="生产厂家" placeholder="请输入生产厂家" v-model="assetsForm.factory"></mt-field>
-                <mt-field label="服务期限" placeholder="请输入服务期限" v-model="assetsForm.serviceLife"></mt-field>
+                <mt-field label="服务期限" placeholder="请输入服务期限" type="number" v-model="assetsForm.serviceLife"></mt-field>
                 <mt-field label="下次维护日期" placeholder="请选择下次维护日期" type="date" v-model="assetsForm.nextIndate"></mt-field>
             </div>
             <div class="detailBox">

lss_vue_wx/src/views/assets/assetsHandle.vue

@@ -110,11 +110,17 @@
 
             chooseType() {
                 var _this = this;
-                var dataShippingSpace = [
-                    {name: "未用"},
-                    {name: "在用"},
-                    {name: "报废"},
-                ];
+                var dataShippingSpace = [];
+                if(this.detail.state == 0) {
+                    dataShippingSpace = [
+                        {name: "在用"},
+                        {name: "报废"},
+                    ];
+                } else if(this.detail.state == 1) {
+                    dataShippingSpace = [
+                        {name: "未用"},
+                    ];
+                }
                 var pickerDiv = document.getElementById("state");
                 var vCardType = this.detail.state;
                 var pickerView = new PickerView({

lss_vue_wx/src/views/assets/assetsRegister.vue

@@ -28,7 +28,7 @@
             </div>
             <div class="detailBox">
                 <mt-field label="生产厂家" placeholder="请输入生产厂家" v-model="assetsForm.factory"></mt-field>
-                <mt-field label="服务期限" placeholder="请输入服务期限" v-model="assetsForm.serviceLife"></mt-field>
+                <mt-field label="服务期限" placeholder="请输入服务期限" type="number" v-model="assetsForm.serviceLife"></mt-field>
                 <mt-field label="下次维护日期" placeholder="请选择下次维护日期" type="date" v-model="assetsForm.nextIndate"></mt-field>
             </div>
             <div class="detailBox">

lss_vue_wx/src/views/data/data.vue

@@ -342,7 +342,6 @@
                             for(var i in _this.department) {
                                 res.push({text: _this.department[i] , max:100});
                             }
-                            console.log(res)
                             return res;
                         })(),
                         radius: 80
@@ -393,7 +392,6 @@
                             for(var i in _this.department) {
                                 res.push({text: _this.department[i] , max:100});
                             }
-                            console.log(res)
                             return res;
                         })(),
                         radius: 80
@@ -502,7 +500,6 @@
                                 normal:{
                                     formatter: function(params){
                                         var str = '';
-                                        console.log(params)
                                         switch(params.name){
                                             case '交通局':str = '{a|}\n{nameStyle|交通局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
                                             case '公安局':str = '{b|}\n{nameStyle|公安局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;

lss_vue_wx/src/views/my/myGrade.vue

@@ -144,7 +144,7 @@
                     this.$indicator.close();
                     if (res.code == "ok") {
                         this.detail = res.data;
-                        if(res.data.scoreId == null) {
+                        if(res.data.scoreId == null && this.date[0].name == this.chooseTime) {
                             var from = {
                                 "uid": this.id,
                                 "scoringYearMonth": this.chooseTime,
@@ -213,14 +213,25 @@
             },
 
             toNext() {
+                if(this.detail.scoreId == null){
+                    this.$toast({
+                        message: "当月未找到TA的建议",
+                        duration: 2000
+                    });
+                    return false;
+                }
                 $(".one_suggest_reply .showMoreBtn .btn_list").addClass("hide").slideUp();
                 this.popupVisible = true;
+                this.ideaList = [];
                 this.$indicator.open();
-                this.http.post(this.port.my.ideaScore, {
+                var form = {
                     'uid': this.id,
                     'time': this.chooseTime,
-                    'scoreId': this.detail.scoreId
-                } , 
+                }
+                if(this.date[0].name == this.chooseTime && this.detail.scoreId != null) {
+                    form.scoreId = this.detail.scoreId
+                }
+                this.http.post(this.port.my.ideaScore, form , 
                 res => {
                     this.$indicator.close();
                     if (res.code == "ok") {
@@ -241,37 +252,6 @@
             },
 
             toPrev() {
-                // var from = {};
-                // if(this.detail.scoreId != null) {
-                //     from = {
-                //         "scoreId": this.detail.scoreId,
-                //         "total": parseInt(this.personalScore) + (this.detail.ideaScoreSum == null?0:parseFloat(this.detail.ideaScoreSum)),
-                //     }
-                // } else {
-                //     from = {
-                //         "uid": this.id,
-                //         "total": parseInt(this.personalScore) + (this.detail.ideaScoreSum == null?0:parseFloat(this.detail.ideaScoreSum)),
-                //     }
-                // }
-                // this.http.post(this.port.my.addOrUpdate, from , 
-                // res => {
-                //     if (res.code == "ok") {
-                //         this.popupVisible = false;
-                //         this.getDetail();
-                //     } else {
-                //         this.$toast({
-                //             message: res.msg,
-                //             duration: 2000
-                //         });
-                //     }
-                // }, error => {
-                //     this.popupVisible = false;
-                //     this.$toast({
-                //         message: error,
-                //         duration: 2000
-                //     });
-                // })
-
                 this.popupVisible = false;
                 this.getDetail();
             },
@@ -417,7 +397,7 @@
                         return false;
                     } else {
                         var from = {};
-                        if(this.ideaComment != null) {
+                        if(this.ideaList[this.chooseSugNum].ideaComment != null) {
                             from = {
                                 "ideaId": this.ideaList[this.chooseSugNum].id,
                                 "score": this.sugScore,
@@ -476,7 +456,7 @@
 
             openSugPop(i) {
                 this.sugScore = this.ideaList[i].score == null? 0 : this.ideaList[i].score;
-                this.sugContent = this.ideaComment == null? '' : this.ideaComment.content;
+                this.sugContent = this.ideaList[i].ideaComment == null? '' : this.ideaList[i].ideaComment.content;
                 this.sugScorePop = true;
                 this.chooseSugNum = i;
             },
@@ -865,7 +845,6 @@
         border: 1px solid #ddd;
         border-radius: 5px;
         padding: 0.08rem;
-        min-height: 0.25rem;
     }
 
     .input textarea {

lss_vue_wx/src/views/task/task.vue

@@ -73,11 +73,11 @@
                             <span>{{item.publisherName}}&nbsp;&nbsp;{{item.indate}}</span>
                         </div>
                         <div class="allUsers">
-                            <a>
+                            <a v-if="item.recipientId!=null">
                                 <img v-if="item.recipientHedaPic==null" src="../../assets/image/userHead.jpg">
                                 <img v-else :src="item.recipientHedaPic">
                             </a>
-                            <a v-for="(head,num) in item.participantsVOS">
+                            <a v-for="(head,num) in item.participantsVOS" v-if="head.userId != item.recipientId">
                                 <img v-if="head.headPic==null" src="../../assets/image/userHead.jpg">
                                 <img v-else :src="head.headPic">
                             </a>
@@ -176,7 +176,7 @@
                         'tagId': this.form.type==-1?"":this.form.type,
                         'state': this.form.status==-1?"":this.form.status,
                         'startTime': this.form.start,
-                        'endTime': this.from.end,
+                        'endTime': this.form.end,
                         'type': this.selected=='tab1'?0:1
                     } , 
                     res => {
@@ -418,6 +418,7 @@
         -webkit-transition-duration: 0.4s;
         /* background: #fff; */
         background: #efefef;
+        overflow: auto;
     }
 
     ._sorting-address .filter_title {
@@ -459,7 +460,7 @@
     .fixed-top::after{
         content: "";
         width: 100%;
-        height: 100%;
+        /* height: 100%; */
         display: block;
         /* background:rgba(0,0,0,0.2); */
         background: #efefef;
@@ -564,7 +565,7 @@
         color: #999;
     }
 
-    .body > ul li .allUsers img:not(:first-child) {
+    .body > ul li .allUsers a:not(:first-child) {
         margin-left: -0.07rem;
     }