添加睡眠描述修改功能

src/assets/language/en.json

@@ -306,6 +306,7 @@
     "pleaseConfirmAgainWhetherToOperate": "Please confirm again whether to operate",
     "IllThinkAboutItAgain": "I'll think about it again",
     "restartSucceeded": "Restart succeeded",
+    "deleteDeviceSucceed": "Delete device successfully",
     "sleepSuccessfully": "Sleep successfully",
     "open": "open",
     "close": "close",
@@ -419,6 +420,7 @@
       "batchPricePlace":"Please enter the batch price",
       "modifySubmit":"Modification submission"
     },
+    "deleteDevice":"Delete Device",
     "noPosition":"No positioning",
     "equipLocation":"Equipment location",
     "position":"position",

src/assets/language/zh.json

@@ -306,6 +306,7 @@
     "pleaseConfirmAgainWhetherToOperate": "请再次确认是否进行操作",
     "IllThinkAboutItAgain": "我再想想",
     "restartSucceeded": "重启成功",
+    "deleteDeviceSucceed": "删除设备成功",
     "sleepSuccessfully": "睡眠成功",
     "open": "开启",
     "close": "关闭",
@@ -422,6 +423,7 @@
       "batchPricePlace":"请输入批量价格",
       "modifySubmit":"修改提交"
     },
+	"deleteDevice":"删除设备",
     "noPosition":"暂无定位",
     "equipLocation":"设备位置",
     "position":"定位",

src/service/device/index.js

@@ -115,3 +115,7 @@ export function Api_getDiscCodeStatus(params) {
 export function changeSleepDesc(params) {
   return axios.get(`/SZWL-SERVER/tEquipmentDesc/updateSleepDesc`, {params})
 }
+// 删除设备
+export function delOneDevice(params) {
+  return axios.post(`http://127.0.0.1:49011/tEquipmentDeleted/delOneDevice`, {params})
+}

src/service/forgetPassword.js

@@ -9,8 +9,3 @@ export function sentForgetCode(params) {
 export function checkForgetCode(params) {
   return axios.post(`/SZWL-SERVER/tMessageCode/checkForgetCode?ifForeign=${params.ifForeign}&phoneOrEmail=${params.phoneOrEmail}&code=${params.code}`, params);
 }
-
-// 修改密码
-export function updatePassword(params) {
-  return axios.post(`/SZWL-SERVER/tAdmin/updatePassword?username=${params.username}&password=${params.password}`, params);
-}

src/views/device/deviceOper.vue

@@ -132,6 +132,18 @@
         </div>
         <div class="operText">{{ $t("device.modifyPrice") }}</div>
       </div>
+
+	  <!-- 删除设备 -->           <!--  这个deleteDevice 得完善一下 现在没取到接口要的id  -->
+	  <div v-if="user.type < 2" class="operItem" @click="deleteDevice()">
+	    <div class="operIcon">
+	      <img
+	        class="operImg"
+	        src="../../assets/device/operIcon/deletedevice.png"
+	      />
+	    </div>
+	    <div class="operText">{{ $t("device.deleteDevice") }}</div>
+	  </div>
+    
     </div>
   </van-dialog>
   <van-dialog
@@ -156,6 +168,8 @@
     </div>
   </van-dialog>
 </template>
+
+
 <script>
 import { onMounted, ref } from "vue";
 import {
@@ -163,6 +177,7 @@ import {
   sleepEquipment,
   openDoor,
   deviceTuoji,
+  delOneDevice,
 } from "../../service/device";
 import { Toast } from "vant";
 import { useRouter } from "vue-router";
@@ -256,6 +271,11 @@ export default {
       operType.value = 5;
       operCheckShow.value = true;
     };
+    // 删除设备
+    const deleteDevice = () => {
+      operType.value = 6;
+      operCheckShow.value = true;
+    };
     // 取消操作
     const operCheckClear = () => {
       operCheckShow.value = false;
@@ -334,6 +354,19 @@ export default {
           Toast.fail(data.message);
         }
       }
+      // 删除设备
+      if (operType.value === 6) {
+        const { data } = await delOneDevice({
+          equipmentId: device.value.id,
+          adminId: user.id,
+        });
+        if (data.code) {
+          Toast.success(t("device.deleteDeviceSucceed"));
+          operCheckShow.value = false;
+        } else {
+          Toast.fail(data.message);
+        }
+      }
       // 关闭弹窗
       show.value = false;
       // 触发操作完成回调
@@ -344,6 +377,7 @@ export default {
     };
 
     return {
+      user,
       device,
       show,
       operCheckShow,
@@ -364,6 +398,7 @@ export default {
       isRole,
       modifyPriceClk,
       sleepTitle,
+      deleteDevice,
     };
   },
   components: {},

src/views/home/index.vue

@@ -241,16 +241,16 @@ export default {
       if (data.code && data.data) {
         salesVolume.value = 0;
         salesNumber.value = 0;
-		orderNumber.value = 0;
+		    orderNumber.value = 0;
         data.data.series[0].data.forEach((item) => {
           salesNumber.value = parseInt(salesNumber.value + item);
         });
         data.data.series[1].data.forEach((item) => {
           salesVolume.value = parseInt(salesVolume.value + item);
         });
-		data.data.series[2].data.forEach((item) => {
-		  orderNumber.value = parseInt(orderNumber.value + item);
-		});
+		    data.data.series[2].data.forEach((item) => {
+		      orderNumber.value = parseInt(orderNumber.value + item);
+		    });
         // 解决eacharts与v-if的渲染问题
         await nextTick();
         if (chartBox.value) {

vue.config.js

@@ -6,7 +6,8 @@ module.exports = {
 		open: true,
     proxy: {
       '/': { //前端任何含/api的URL请求都会被反向代理。如http://localhost:8000/xxx/api/source/xxx的请求会变成服务器的反向代理请求
-        target: 'http://112.74.63.148:49011', //原来请求的服务器IP地址会换成此地址，如以上地址会变成http://localhost:5000/xxx/api/source/xxx
+        target: 'http://127.0.0.1:49011', //原来请求的服务器IP地址会换成此地址，如以上地址会变成http://localhost:5000/xxx/api/source/xxx
+        // target: 'http://112.74.63.148:49011', //原来请求的服务器IP地址会换成此地址，如以上地址会变成http://localhost:5000/xxx/api/source/xxx
         changeOrigin: true, // 是否跨域
         pathRewrite: {
           // '.+?/api': '/api'