Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

package.json

@@ -93,7 +93,7 @@
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-react": "^1.0.6",
         "@wisdom-cesium/cesium": "^1.0.78",
-        "@wisdom-cesium/krpano": "^1.0.29-28",
+        "@wisdom-cesium/krpano": "^1.0.29-30",
         "@wisdom-map/amap": "1.1.0-beta.45",
         "@wisdom-map/arcgismap": "1.4.0-138",
         "@wisdom-map/basemap": "1.1.0-24",

src/pages/log/serviceLog/index.jsx

@@ -73,11 +73,6 @@ const ServiceLog = () => {
   const startYear = new Date(allTime[0]).getYear();
   const endYear = new Date(allTime[1]).getYear();
   if (minuteInterval <= 0) {
-    console.log(start);
-    console.log(end);
-    console.log(allTime[0]);
-    console.log(allTime[1]);
-    console.log(minuteInterval);
     notification.error({
       message: '时间设置有误',
       description: '起始时间应该早于结束时间',
@@ -469,7 +464,6 @@ const ServiceLog = () => {
     setEndTime(time);
   };
   const changeTime = time => {
-    console.log(time);
     setAllTime(time);
   };
   // 近1/6/12/24小时,同时设置对应的时间间隔

src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx

@@ -167,7 +167,7 @@ const Map = props => {
   const [firstList, setFirstList] = useState({});
   const [setttingsSave, setSetttingsSave] = useState({});
   const [name, setName] = useState('');
-  const [Schemename, setSchemename] = useState('');
+  const [Schemename, setSchemename] = useState({});
   const [radio, setRadio] = useState();
   const mapRef = useRef();
   const styleRef = useRef();
@@ -225,6 +225,7 @@ const Map = props => {
       let list = {};
       list.layers = dalist;
       console.log(list);
+      debugger;
       setFirstList({ ...list });
       setTimeout(() => {
         form.setFieldsValue({
@@ -281,7 +282,7 @@ const Map = props => {
         if (setttings.id) {
           setKeep(setttings);
           setName(setttings.id);
-          setSchemename(setttings.schemename);
+          setSchemename(setttings);
         } else {
           setName('');
         }
@@ -391,7 +392,7 @@ const Map = props => {
         if (setttings.id) {
           setKeep(setttings);
           setName(setttings.id);
-          setSchemename(setttings.schemename);
+          setSchemename(setttings);
         } else {
           setName('');
         }
@@ -436,6 +437,8 @@ const Map = props => {
 
     console.log(123);
     setMap(viewObject);
+    console.log(viewObject);
+    debugger;
     watchUtils.watch(viewObject, ['zoom'], newzoom => {
       // 鼠标滚动隐藏管网图
       viewObject.map.layers.find(layer => {
@@ -572,6 +575,7 @@ const Map = props => {
           let list = {};
           list.layers = dalist;
           console.log(list);
+          debugger;
           setFirstList({ ...list });
         });
         setArea('');
@@ -586,7 +590,7 @@ const Map = props => {
             item.layerType = 'PipenetLayer';
             setttings = item;
             console.log(item);
-            setSchemename(item.schemename);
+            setSchemename(item);
             setName(item.id);
             setKeep(item);
           } else {
@@ -1231,7 +1235,6 @@ const Map = props => {
         </div>
       </div>
       <div className={styles.mapBox}>
-        {console.log(firstList)}
         {canLoadMap && (
           <ArcGISSceneMap
             ref={mapRef}
@@ -1244,11 +1247,12 @@ const Map = props => {
         )}
         {radio == 'arcgis' ? (
           <PipenetStylesCenter
-            schemeName={Schemename}
+            schemeName={Schemename.schemename}
             mapServerName={name}
             view={map}
             savaCallback={onSave}
             ref={styleRef}
+            pipenetLayer={Schemename}
           />
         ) : (
           <></>

src/pages/platformCenter/hostmanager/IotConfig/IotConfig.jsx

@@ -115,19 +115,21 @@ const IotConfig = props => {
         setCurrentDataBase(res.data);
         // 数据库是否已添加
         setLoading(true);
-        CheckIsServiceAdd({ ip: res.data.ip })
+        CheckIsServiceAdd()
           .then(resdata1 => {
             setLoading(false);
             if (resdata1.code === 0) {
-              setShow3('inline-block');
-              setShow4('none');
-              getStatus(res.data.ip, res.data.dbName);
-            } else {
-              setDbStatus(resdata1.msg);
-              setBuStatus('添加');
-              setSwitchStatus(true);
-              setShow3('none');
-              setShow4('inline-block');
+              if (resdata1.data === true) {
+                setShow3('inline-block');
+                setShow4('none');
+                getStatus(res.data.ip, res.data.dbName);
+              } else {
+                setDbStatus(resdata1.msg);
+                setBuStatus('添加');
+                setSwitchStatus(true);
+                setShow3('none');
+                setShow4('inline-block');
+              }
             }
           })
           .catch(err => {
@@ -140,7 +142,7 @@ const IotConfig = props => {
 
   const getStatus = (x, y) => {
     // 查询是否禁用
-    GetServiceInfo({ ip: x })
+    GetServiceInfo()
       .then(resdata => {
         if (resdata.code === 0) {
           setDbStatus(resdata.data.statusText);
@@ -341,9 +343,7 @@ const IotConfig = props => {
     } else {
       // 数据库未添加
       setLoading(true);
-      AddDB({
-        ip: currentDataBase.ip,
-      }).then(res => {
+      AddDB().then(res => {
         setLoading(false);
         if (res.code === 0) {
           setShow3('inline-block');
@@ -403,9 +403,7 @@ const IotConfig = props => {
     if (checked) {
       setSwitchStatus(true);
       setLoading(true);
-      DepositServiceEnable({
-        ip: currentDataBase.ip,
-      }).then(res => {
+      DepositServiceEnable().then(res => {
         setLoading(false);
         getStatus(currentDataBase.ip, currentDataBase.dbName);
         if (res.code === 0) {
@@ -417,9 +415,7 @@ const IotConfig = props => {
       });
     } else {
       setLoading(true);
-      DepositServiceDisable({
-        ip: currentDataBase.ip,
-      }).then(res => {
+      DepositServiceDisable().then(res => {
         setLoading(false);
         if (res.code === 0) {
           setDbStatus('已禁用');