修改

cloud-model/src/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true

target/classes/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true

ys_int/config/index.js

@@ -20,7 +20,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
         '/api': {    
-            target: 'http://192.168.101.6:8099',  // 接口域名 开发
+            target: 'http://192.168.101.166:8099',  // 接口域名 开发
             secure: true,  // 如果是https接口，需要配置这个参数
             changeOrigin: true,  //是否跨域
             pathRewrite: { // 如果接口本身没有api的路径，那么这里将发送到后端的请求重写为没有api的路径
@@ -28,7 +28,7 @@ module.exports = {
             }
         },
         '/ips': {    
-            target: 'http://192.168.101.6:8080',  // 接口域名 开发
+            target: 'http://192.168.101.166:8080',  // 接口域名 开发
             secure: true,  // 如果是https接口，需要配置这个参数
             changeOrigin: true,  //是否跨域
             pathRewrite: { // 如果接口本身没有api的路径，那么这里将发送到后端的请求重写为没有api的路径

ys_int/src/i18n/lang/en.js

@@ -148,7 +148,8 @@ const lang = {
 		manager: "Project Manager",
 		inputManager: "Please select project manager",
 		indate: "Creat Time",
-		addPro: "Add Project",
+        addPro: "Add Project",
+        invalid: "Invalid",
 		// 项目详情
 		detail: "Basic Project Information",
 		projectNo: "Project No",

ys_int/src/i18n/lang/zh.js

@@ -148,7 +148,8 @@ const lang = {
 		manager: "项目经理",
 		inputManager: "请选择项目经理",
 		indate: "创建时间",
-		addPro: "新增项目",
+        addPro: "新增项目",
+        invalid: "失效",
 		// 项目详情
 		detail: "项目基本信息",
 		projectNo: "项目编号",

ys_int/src/views/detection/maintenance.vue

@@ -52,9 +52,11 @@
                 <el-col :span="11" :offset="2">
                     <div style="padding:0 20px">
                         <b style="font-size:20px;text-align:center;margin-bottom:20px;">{{$t('runTest.openCycleChart')}}</b>
-                        <el-date-picker v-model="openCycle" style="float:right;width:210px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
+                        <!-- <el-date-picker v-model="openCycle" style="float:right;width:210px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
                         @change='changeOpen(2)' size="mini" :clearable="false" type="daterange" 
-                        :start-placeholder="$t('el.datepicker.startDate')" :end-placeholder="$t('el.datepicker.endDate')"></el-date-picker>
+                        :start-placeholder="$t('el.datepicker.startDate')" :end-placeholder="$t('el.datepicker.endDate')"></el-date-picker> -->
+                        <el-date-picker v-model="openCycle" style="float:right;width:125px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
+                        @change='changeOpen(2)' size="mini" :clearable="false" type="date" :placeholder="$t('el.datepicker.selectDate')"></el-date-picker>
                     </div>
                     <div id="myChart2" :style="{ height: '300px'}"></div>
                 </el-col>
@@ -224,7 +226,8 @@
                 },
                 imageUrl: "",
                 openNum: util.formatDate.format(new Date(), 'yyyy-MM-dd'),
-                openCycle: [util.formatDate.format(new Date(), 'yyyy-MM-dd') , util.formatDate.format(new Date(), 'yyyy-MM-dd')],
+                // openCycle: [util.formatDate.format(new Date(), 'yyyy-MM-dd') , util.formatDate.format(new Date(), 'yyyy-MM-dd')],
+                openCycle: util.formatDate.format(new Date(), 'yyyy-MM-dd'),
                 allDetail: {
                     overflow: 'auto',
                     padding: '0px 5px',
@@ -574,12 +577,12 @@
                             tooltip: {
                                 trigger: 'axis'
                             },
-                            grid: {
-                                left: '3%',
-                                right: '4%',
-                                bottom: '3%',
-                                containLabel: true
-                            },
+                            // grid: {
+                            //     left: '3%',
+                            //     right: '4%',
+                            //     bottom: '3%',
+                            //     containLabel: true
+                            // },
                             xAxis: {
                                 type: 'category',
                                 boundaryGap: false,
@@ -589,6 +592,23 @@
                                 name: this.$t('runTest.sec') + '（s）',
                                 type: 'value'
                             },
+                            dataZoom: [{
+                                type: 'inside',
+                                start: 0,
+                                end: 10
+                            }, {
+                                start: 0,
+                                end: 10,
+                                handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+                                handleSize: '80%',
+                                handleStyle: {
+                                    color: '#fff',
+                                    shadowBlur: 3,
+                                    shadowColor: 'rgba(0, 0, 0, 0.6)',
+                                    shadowOffsetX: 2,
+                                    shadowOffsetY: 2
+                                }
+                            }],
                             series: [{
                                 name: this.$t('runTest.maxOpenCycle'),
                                 type: 'line',

ys_int/src/views/map/map.vue

@@ -12,91 +12,91 @@
 			}
 		},
 		methods: {
-            getMap() {
-                var _this = this
-                this.http.post( this.port.map.mapList, {},
-                res => {
-                    if (res.code == "ok") {
-                        var list = res.data;
-
-                        if(list != null && list.length > 0){
-                            var map = new AMap.Map('container', {
-                                resizeEnable: true,   
-                                zoom: 5
-                            });
-                            map.clearMap();  
-                            var markers = [] , 
-                                infoWindow , 
-                                data = list;
-
-                            var marker;
-                            for(var i in data){
-                                var jfong=[ data[i].ylng , data[i].xlat];
-                                marker = new AMap.Marker({
-                                    position: jfong,
-                                    zIndex: 101,
-                                    map:map
-                                });	
-                                marker.setMap(map);	
-                                marker.msg = data[i];
-                                marker.on('click', function(data){
-                                    var str = "<div class='window'>" +
-                                        "<div class='info-top'><div>"+ data.target.msg.companyName +"</div><i class='el-icon-close' @click='closeInfoWindow()'></i></div>" +
-                                        "<div class='info-middle'>";
-                                        for(var i in data.target.msg.list){
-                                            str += "<div class='info-item'><a @click='jumpToMold("+ data.target.msg.list[i].id +")'>" + data.target.msg.list[i].modelName + "（" + data.target.msg.list[i].modelNo + "）</a>"
-                                                if(data.target.msg.list[i].state=='0'){
-                                                    str += "<span class='info-state'><span class='info-ball' style='background:#999999;'></span>" + _this.$t('base.static') + "</span>"
-                                                } else {
-                                                    str += "<span class='info-state'><span class='info-ball' style='background:#00CD66;'></span>" + _this.$t('base.run') + "</span>"
-                                                }
-                                            str += "</div>"
-                                        }
-                                        str += "</div>" +
-                                    "</div>"
-
-                                    var MyComponent = Vue.extend({
-                                        template: str ,
-                                        methods:{
-                                            closeInfoWindow:function() {
-                                                map.clearInfoWindow();
-                                            },
-                                            jumpToMold:function(id) {
-                                                _this.$router.push("/moldList/" + id + "/0");
-                                            }
-                                        }
-                                    });
-                                    var component= new MyComponent().$mount();
-                                    infoWindow.setContent(component.$el);
-                                    infoWindow.open(map, data.lnglat);
-                                });
-                            }
-
-                            infoWindow = new AMap.InfoWindow({
-                                isCustom:	true,
-                                draggable: true,  //是否可拖动
-                                showShadow: true,
-                                autoMove: true,
-                                offset: new AMap.Pixel(0, -31),
-                                content:""
-                            });
-
-                            marker.setMap(map);
-                        }
-                    } else {
-                        this.$message({
-                            message: res.msg,
-                            type: "error"
-                        });
-                    }
-                },
-                error => {
-                    this.$message({
-                        message: error,
-                        type: "error"
-                    });
-                });
-            },
+            // getMap() {
+            //     var _this = this
+            //     this.http.post( this.port.map.mapList, {},
+            //     res => {
+            //         if (res.code == "ok") {
+            //             var list = res.data;
+
+            //             if(list != null && list.length > 0){
+            //                 var map = new AMap.Map('container', {
+            //                     resizeEnable: true,   
+            //                     zoom: 5
+            //                 });
+            //                 map.clearMap();  
+            //                 var markers = [] , 
+            //                     infoWindow , 
+            //                     data = list;
+
+            //                 var marker;
+            //                 for(var i in data){
+            //                     var jfong=[ data[i].ylng , data[i].xlat];
+            //                     marker = new AMap.Marker({
+            //                         position: jfong,
+            //                         zIndex: 101,
+            //                         map:map
+            //                     });	
+            //                     marker.setMap(map);	
+            //                     marker.msg = data[i];
+            //                     marker.on('click', function(data){
+            //                         var str = "<div class='window'>" +
+            //                             "<div class='info-top'><div>"+ data.target.msg.companyName +"</div><i class='el-icon-close' @click='closeInfoWindow()'></i></div>" +
+            //                             "<div class='info-middle'>";
+            //                             for(var i in data.target.msg.list){
+            //                                 str += "<div class='info-item'><a @click='jumpToMold("+ data.target.msg.list[i].id +")'>" + data.target.msg.list[i].modelName + "（" + data.target.msg.list[i].modelNo + "）</a>"
+            //                                     if(data.target.msg.list[i].state=='0'){
+            //                                         str += "<span class='info-state'><span class='info-ball' style='background:#999999;'></span>" + _this.$t('base.static') + "</span>"
+            //                                     } else {
+            //                                         str += "<span class='info-state'><span class='info-ball' style='background:#00CD66;'></span>" + _this.$t('base.run') + "</span>"
+            //                                     }
+            //                                 str += "</div>"
+            //                             }
+            //                             str += "</div>" +
+            //                         "</div>"
+
+            //                         var MyComponent = Vue.extend({
+            //                             template: str ,
+            //                             methods:{
+            //                                 closeInfoWindow:function() {
+            //                                     map.clearInfoWindow();
+            //                                 },
+            //                                 jumpToMold:function(id) {
+            //                                     _this.$router.push("/moldList/" + id + "/0");
+            //                                 }
+            //                             }
+            //                         });
+            //                         var component= new MyComponent().$mount();
+            //                         infoWindow.setContent(component.$el);
+            //                         infoWindow.open(map, data.lnglat);
+            //                     });
+            //                 }
+
+            //                 infoWindow = new AMap.InfoWindow({
+            //                     isCustom:	true,
+            //                     draggable: true,  //是否可拖动
+            //                     showShadow: true,
+            //                     autoMove: true,
+            //                     offset: new AMap.Pixel(0, -31),
+            //                     content:""
+            //                 });
+
+            //                 marker.setMap(map);
+            //             }
+            //         } else {
+            //             this.$message({
+            //                 message: res.msg,
+            //                 type: "error"
+            //             });
+            //         }
+            //     },
+            //     error => {
+            //         this.$message({
+            //             message: error,
+            //             type: "error"
+            //         });
+            //     });
+            // },
         },
         mounted() {
             //this.getMap();
@@ -153,7 +153,8 @@
                         pointStyle: {
                             width: 6,
                             height: 6,
-                            fillStyle:'rgba(0, 236, 252, 0.9)'
+                            // fillStyle:'rgba(0, 236, 252, 0.9)'
+                            fillStyle:'rgba(255, 0, 0, 1)'
                         },
                         //鼠标hover时的title信息
                         hoverTitleStyle: {
@@ -293,6 +294,10 @@
                     },
                 });
 
+                map.on('click', function(item) {
+                    console.log(item);
+                });
+
                 window.distCluster = distCluster;
 
                 map.on('zoomend', function() {

ys_int/src/views/project/project.vue

@@ -32,13 +32,11 @@
 			</el-table-column>
 			<el-table-column prop="indate" :label="$t('project.indate')" width="200" align="center" sortable>
 			</el-table-column>
-			<!-- <el-table-column label="操作" width="250" align="center">
+			<el-table-column :label="$t('base.operate')" width="150" align="center" v-if="user.parentId == 1 && user.subordinateType == 0">
 				<template slot-scope="scope">
-                    <el-button size="small" type="primary" @click="toDetail(scope.row.id)">详情</el-button>
-					<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-					<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
+					<el-button type="danger" size="small" @click="invalid(scope.row.id)">{{$t('project.invalid')}}</el-button>
 				</template>
-			</el-table-column> -->
+			</el-table-column>
 		</el-table>
 
 		<!--工具条-->
@@ -258,6 +256,10 @@
                 this.$router.push('/project/' + row.id);
             },
 
+            invalid(id) {
+
+            },
+
             //选择公司切换人员
             companyChange() {
                 var param = {} ,